From 48b01709975915cd4fbc508f287082b60311c907 Mon Sep 17 00:00:00 2001
From: Otto Visser <O.W.Visser@tudelft.nl>
Date: Wed, 17 Feb 2021 11:44:47 +0100
Subject: [PATCH] Lots of small changes; the result of bughunting & Intellij
inspection
---
.gitlab-ci.yml | 1 +
CONTRIBUTING.md | 2 +-
README.md | 2 +-
.../nl/tudelft/submit/DevDatabaseLoader.java | 1 -
.../submit/controller/EditionController.java | 8 +++----
.../submit/controller/GradeController.java | 2 +-
.../submit/controller/PersonController.java | 2 +-
.../controller/StudentGroupController.java | 8 -------
.../controller/SubmissionController.java | 9 --------
.../submit/controller/VersionController.java | 1 -
.../nl/tudelft/submit/enums/GradableType.java | 2 +-
.../submit/enums/ScriptGradePolicy.java | 2 +-
.../submit/external/MultipartUtility.java | 22 +++++++++----------
.../java/nl/tudelft/submit/model/Version.java | 1 -
.../submit/repository/FeedbackRepository.java | 2 ++
.../repository/SubmitGroupRepository.java | 2 ++
.../repository/UserSettingsRepository.java | 2 ++
.../submit/repository/VersionRepository.java | 2 ++
.../repository/script/ScriptRepository.java | 4 +++-
.../submit/security/AuthorizationService.java | 2 +-
.../submit/service/EditionService.java | 6 +----
.../tudelft/submit/service/EmailService.java | 2 +-
.../tudelft/submit/service/FileService.java | 4 ++--
.../tudelft/submit/service/GradeService.java | 1 -
.../submit/service/ModuleDivisionService.java | 10 ++++-----
.../tudelft/submit/service/ModuleService.java | 5 ++---
.../tudelft/submit/service/PersonService.java | 2 +-
.../submit/service/StudentGroupService.java | 9 ++------
.../submit/service/SubmissionService.java | 4 ++--
.../submit/service/UserSettingsService.java | 2 +-
.../templates/assignment/import_grades.html | 4 ++--
.../resources/templates/person/import.html | 4 ++--
.../controller/AssignmentControllerTest.java | 7 ------
.../controller/EditionControllerTest.java | 1 -
.../controller/ModuleControllerTest.java | 4 ----
.../NotificationControllerTest.java | 1 -
.../controller/PersonControllerTest.java | 10 +++------
.../submit/controller/RoleControllerTest.java | 1 -
.../StudentGroupControllerTest.java | 3 ---
.../controller/SubmissionControllerTest.java | 7 ------
.../controller/VersionControllerTest.java | 2 --
.../nl/tudelft/submit/csv/CSVServiceTest.java | 1 -
.../script/ScriptRepositoryTest.java | 2 --
.../script/ScriptTrainRepositoryTest.java | 2 --
.../script/ScriptWagonRepositoryTest.java | 2 --
.../submit/service/AssignmentServiceTest.java | 7 +-----
.../submit/service/CohortServiceTest.java | 6 ++---
.../submit/service/EditionServiceTest.java | 1 -
.../submit/service/ExportServiceTest.java | 1 -
.../submit/service/FeedbackServiceTest.java | 2 --
.../ModuleDivisionServiceSelfMockTest.java | 1 -
.../service/ModuleDivisionServiceTest.java | 1 -
.../submit/service/ModuleServiceTest.java | 5 -----
.../submit/service/PersonServiceTest.java | 4 ++--
.../submit/service/ScriptServiceTest.java | 1 -
.../service/StudentGroupServiceTest.java | 5 -----
.../service/SubmitGroupServiceTest.java | 2 --
.../service/grading/ModuleGradingTest.java | 1 -
58 files changed, 64 insertions(+), 146 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e4faaa4..7fdb7621 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -340,6 +340,7 @@ deploy:
- chmod 644 ~/.ssh/known_hosts
script:
- scp submit.jar deploy@submit.tudelft.nl:/var/www/submit/
+ - ssh deploy@submit.tudelft.nl sudo /bin/systemctl restart submit
environment:
name: production
url: https://submit.tudelft.nl
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3333f46f..56df2b9f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ This contributing guide has the following objectives:
3. [The Submit Database](#the-submit-database)
4. [The Front-End](#the-front-end)
4. [Working on Submit](#working-on-submit)
-5. [Submitting Your Changes](#submitting-you-changes)
+5. [Submitting Your Changes](#submitting-your-changes)
## Getting Access ##
diff --git a/README.md b/README.md
index 806d5808..74ffe5a8 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A successor to [CPM](https://cpm.ewi.tudelft.nl) (Complete Project Monitoring),
The standard flow of this application can be seen as:
1. A teacher creates an assignment for a course edition.
2. A student forms a group for working on the assignment.
-3. The group submits an submission to the assignment.
+3. The group submits a submission to the assignment.
4. The group receives feedback for the submission (from a teacher or an automated script).
5. The group submits a new submission.
6. The group receives a grade for this assignment.
diff --git a/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java b/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java
index e2bbb454..98ca742e 100644
--- a/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java
+++ b/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java
@@ -29,7 +29,6 @@ import nl.tudelft.labracore.api.DbLoaderControllerApi;
import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.model.*;
import nl.tudelft.submit.repository.*;
-import nl.tudelft.submit.repository.FeedbackRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
diff --git a/src/main/java/nl/tudelft/submit/controller/EditionController.java b/src/main/java/nl/tudelft/submit/controller/EditionController.java
index ac8a170e..e9c44c94 100644
--- a/src/main/java/nl/tudelft/submit/controller/EditionController.java
+++ b/src/main/java/nl/tudelft/submit/controller/EditionController.java
@@ -439,10 +439,10 @@ public class EditionController {
/**
* Gets a CSV file which contains the grades for every student in this edition.
*
- * @param id the id of the edition
- * @param options the options for the export
- * @return The resource of the export file
- * @throws Exception is thrown if any error occurs along the way
+ * @param id the id of the edition
+ * @param options the options for the export
+ * @return The resource of the export file
+ * @throws IOException is thrown if any error occurs along the way
*/
@GetMapping("{id}/export/grades")
@PreAuthorize("@authorizationService.canExportEditionGrades(#id)")
diff --git a/src/main/java/nl/tudelft/submit/controller/GradeController.java b/src/main/java/nl/tudelft/submit/controller/GradeController.java
index a2c8630c..148c98d2 100644
--- a/src/main/java/nl/tudelft/submit/controller/GradeController.java
+++ b/src/main/java/nl/tudelft/submit/controller/GradeController.java
@@ -90,7 +90,7 @@ public class GradeController {
return "redirect:/assignment/{assignmentId}/submissions";
}
- public class TestCalculatedScore extends CalculatedScore {
+ public static class TestCalculatedScore extends CalculatedScore {
public TestCalculatedScore(Id id, @NotNull Double score, @NotNull GradeScheme type) {
super(id, score, type);
}
diff --git a/src/main/java/nl/tudelft/submit/controller/PersonController.java b/src/main/java/nl/tudelft/submit/controller/PersonController.java
index 6c770d9f..ab5ca9bf 100644
--- a/src/main/java/nl/tudelft/submit/controller/PersonController.java
+++ b/src/main/java/nl/tudelft/submit/controller/PersonController.java
@@ -209,7 +209,7 @@ public class PersonController {
@GetMapping("/find/number")
@PreAuthorize("@authorizationService.isAdmin()")
public String searchByNumber(@RequestParam Integer number, Model model) {
- List<PersonSummaryDTO> results = personService.searchyByNumber(number);
+ List<PersonSummaryDTO> results = personService.searchByNumber(number);
model.addAttribute("results", results);
diff --git a/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java b/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java
index 326d920a..db7a390f 100644
--- a/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java
+++ b/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java
@@ -19,19 +19,12 @@ package nl.tudelft.submit.controller;
import java.time.LocalDateTime;
import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.transaction.Transactional;
import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.api.dto.GroupGenerateDTO;
-import nl.tudelft.labracore.api.dto.PersonIdDTO;
-import nl.tudelft.labracore.api.dto.StudentGroupIdDTO;
-import nl.tudelft.labracore.api.dto.SubmissionCreateDTO;
import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
import nl.tudelft.labracore.lib.security.user.Person;
import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
@@ -255,7 +248,6 @@ public class StudentGroupController {
* Adds or updates the instructor note on an instance of this entity.
*
* @param person the authenticated person
- * @param page where should the method redirect
* @param note the note create DTO
* @return the page to redirect to
*/
diff --git a/src/main/java/nl/tudelft/submit/controller/SubmissionController.java b/src/main/java/nl/tudelft/submit/controller/SubmissionController.java
index 6f59e10c..ea32ab09 100644
--- a/src/main/java/nl/tudelft/submit/controller/SubmissionController.java
+++ b/src/main/java/nl/tudelft/submit/controller/SubmissionController.java
@@ -26,8 +26,6 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.api.dto.PersonIdDTO;
-import nl.tudelft.labracore.api.dto.SubmissionCreateDTO;
import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
import nl.tudelft.labracore.lib.security.user.Person;
import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
@@ -37,13 +35,6 @@ import nl.tudelft.submit.exception.DisallowedUploadException;
import nl.tudelft.submit.model.Signature;
import nl.tudelft.submit.security.AuthorizationService;
import nl.tudelft.submit.service.*;
-import nl.tudelft.submit.service.AssignmentService;
-import nl.tudelft.submit.service.FileService;
-import nl.tudelft.submit.service.ModuleService;
-import nl.tudelft.submit.service.NoteService;
-import nl.tudelft.submit.service.ScriptService;
-import nl.tudelft.submit.service.StudentGroupService;
-import nl.tudelft.submit.service.SubmissionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/nl/tudelft/submit/controller/VersionController.java b/src/main/java/nl/tudelft/submit/controller/VersionController.java
index 4684d4e7..d5f45431 100644
--- a/src/main/java/nl/tudelft/submit/controller/VersionController.java
+++ b/src/main/java/nl/tudelft/submit/controller/VersionController.java
@@ -20,7 +20,6 @@ package nl.tudelft.submit.controller;
import javax.transaction.Transactional;
import javax.validation.Valid;
-import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.dto.create.VersionCreateDTO;
import nl.tudelft.submit.dto.patch.VersionPatchDTO;
import nl.tudelft.submit.service.AssignmentService;
diff --git a/src/main/java/nl/tudelft/submit/enums/GradableType.java b/src/main/java/nl/tudelft/submit/enums/GradableType.java
index 86981da8..8c597943 100644
--- a/src/main/java/nl/tudelft/submit/enums/GradableType.java
+++ b/src/main/java/nl/tudelft/submit/enums/GradableType.java
@@ -20,6 +20,6 @@ package nl.tudelft.submit.enums;
public enum GradableType {
MODULE,
- EDITION;
+ EDITION
}
diff --git a/src/main/java/nl/tudelft/submit/enums/ScriptGradePolicy.java b/src/main/java/nl/tudelft/submit/enums/ScriptGradePolicy.java
index ea13bd33..a9e4a51d 100644
--- a/src/main/java/nl/tudelft/submit/enums/ScriptGradePolicy.java
+++ b/src/main/java/nl/tudelft/submit/enums/ScriptGradePolicy.java
@@ -19,6 +19,6 @@ package nl.tudelft.submit.enums;
public enum ScriptGradePolicy {
- REJECT_SCRIPT_GRADES, ACCEPT_SCRIPT_GRADES, EXPORT_SCRIPT_GRADES;
+ REJECT_SCRIPT_GRADES, ACCEPT_SCRIPT_GRADES, EXPORT_SCRIPT_GRADES
}
diff --git a/src/main/java/nl/tudelft/submit/external/MultipartUtility.java b/src/main/java/nl/tudelft/submit/external/MultipartUtility.java
index 2e6588ce..2e1b8177 100644
--- a/src/main/java/nl/tudelft/submit/external/MultipartUtility.java
+++ b/src/main/java/nl/tudelft/submit/external/MultipartUtility.java
@@ -74,10 +74,10 @@ public class MultipartUtility {
* @param value field value
*/
public void addFormField(String name, String value) {
- writer.append("--" + boundary).append(LINE_FEED);
- writer.append("Content-Disposition: form-data; name=\"" + name + "\"")
+ writer.append("--").append(boundary).append(LINE_FEED);
+ writer.append("Content-Disposition: form-data; name=\"").append(name).append("\"")
.append(LINE_FEED);
- writer.append("Content-Type: text/plain; charset=" + charset).append(
+ writer.append("Content-Type: text/plain; charset=").append(charset).append(
LINE_FEED);
writer.append(LINE_FEED);
writer.append(value).append(LINE_FEED);
@@ -94,10 +94,10 @@ public class MultipartUtility {
public void addFilePart(String fieldName, File uploadFile)
throws IOException {
String fileName = uploadFile.getName();
- writer.append("--" + boundary).append(LINE_FEED);
- writer.append("Content-Disposition: form-data; name=\"" + fieldName + "\"; filename=\"" + fileName
- + "\"").append(LINE_FEED);
- writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(fileName))
+ writer.append("--").append(boundary).append(LINE_FEED);
+ writer.append("Content-Disposition: form-data; name=\"").append(fieldName).append("\"; filename=\"")
+ .append(fileName).append("\"").append(LINE_FEED);
+ writer.append("Content-Type: ").append(URLConnection.guessContentTypeFromName(fileName))
.append(LINE_FEED);
writer.append("Content-Transfer-Encoding: binary").append(LINE_FEED);
writer.append(LINE_FEED);
@@ -105,7 +105,7 @@ public class MultipartUtility {
FileInputStream inputStream = new FileInputStream(uploadFile);
byte[] buffer = new byte[4096];
- int bytesRead = -1;
+ int bytesRead;
while ((bytesRead = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, bytesRead);
}
@@ -123,7 +123,7 @@ public class MultipartUtility {
* @param value - value of the header field
*/
public void addHeaderField(String name, String value) {
- writer.append(name + ": " + value).append(LINE_FEED);
+ writer.append(name).append(": ").append(value).append(LINE_FEED);
writer.flush();
}
@@ -138,7 +138,7 @@ public class MultipartUtility {
List<String> response = new ArrayList<String>();
writer.append(LINE_FEED).flush();
- writer.append("--" + boundary + "--").append(LINE_FEED);
+ writer.append("--").append(boundary).append("--").append(LINE_FEED);
writer.close();
// checks server's status code first
@@ -146,7 +146,7 @@ public class MultipartUtility {
if (status == HttpURLConnection.HTTP_OK) {
BufferedReader reader = new BufferedReader(new InputStreamReader(
httpConn.getInputStream()));
- String line = null;
+ String line;
while ((line = reader.readLine()) != null) {
response.add(line);
}
diff --git a/src/main/java/nl/tudelft/submit/model/Version.java b/src/main/java/nl/tudelft/submit/model/Version.java
index 91639b5b..959f3a67 100644
--- a/src/main/java/nl/tudelft/submit/model/Version.java
+++ b/src/main/java/nl/tudelft/submit/model/Version.java
@@ -30,7 +30,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.dto.helper.VersionDescription;
import nl.tudelft.submit.model.script.ScriptTrain;
diff --git a/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java b/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java
index 6a077e57..17af3aea 100644
--- a/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java
@@ -24,7 +24,9 @@ import nl.tudelft.submit.model.Feedback;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.stereotype.Repository;
+@Repository
public interface FeedbackRepository extends JpaRepository<Feedback, Long> {
/**
diff --git a/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java b/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java
index 04a4686f..a0ac44b1 100644
--- a/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java
@@ -24,7 +24,9 @@ import nl.tudelft.submit.model.Version;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.stereotype.Repository;
+@Repository
public interface SubmitGroupRepository extends JpaRepository<SubmitGroup, Long> {
/**
diff --git a/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java b/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java
index 0cf6f2ca..c7edbc4d 100644
--- a/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java
@@ -24,7 +24,9 @@ import nl.tudelft.submit.model.UserSettings;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.stereotype.Repository;
+@Repository
public interface UserSettingsRepository extends JpaRepository<UserSettings, Long> {
/**
diff --git a/src/main/java/nl/tudelft/submit/repository/VersionRepository.java b/src/main/java/nl/tudelft/submit/repository/VersionRepository.java
index 6bd52cee..0e7eff25 100644
--- a/src/main/java/nl/tudelft/submit/repository/VersionRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/VersionRepository.java
@@ -25,7 +25,9 @@ import nl.tudelft.submit.model.Version;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.stereotype.Repository;
+@Repository
public interface VersionRepository extends JpaRepository<Version, Long> {
/**
diff --git a/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java b/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java
index 654c48c5..31df117c 100644
--- a/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java
@@ -21,6 +21,7 @@ import java.util.Optional;
import nl.tudelft.submit.model.script.Script;
+import org.jetbrains.annotations.NotNull;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -37,6 +38,7 @@ public interface ScriptRepository extends CrudRepository<Script, Long> {
.orElseThrow(() -> new ResourceNotFoundException("ScriptId was not found: " + id));
}
- Optional<Script> findById(Long id);
+ @NotNull
+ Optional<Script> findById(@NotNull Long id);
}
diff --git a/src/main/java/nl/tudelft/submit/security/AuthorizationService.java b/src/main/java/nl/tudelft/submit/security/AuthorizationService.java
index ab32414a..fbdbe7b1 100644
--- a/src/main/java/nl/tudelft/submit/security/AuthorizationService.java
+++ b/src/main/java/nl/tudelft/submit/security/AuthorizationService.java
@@ -807,7 +807,7 @@ public class AuthorizationService {
}
/**
- * Checks whether the authenticated user can import grades for an assignemnt.
+ * Checks whether the authenticated user can import grades for an assignment.
*
* @param assignmentId The id of the assignment
* @return True iff the user can import grades for the assignment
diff --git a/src/main/java/nl/tudelft/submit/service/EditionService.java b/src/main/java/nl/tudelft/submit/service/EditionService.java
index fecb75cd..035ee1e6 100644
--- a/src/main/java/nl/tudelft/submit/service/EditionService.java
+++ b/src/main/java/nl/tudelft/submit/service/EditionService.java
@@ -20,10 +20,6 @@ package nl.tudelft.submit.service;
import java.io.IOException;
import java.io.Reader;
import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
import java.util.stream.Collectors;
import nl.tudelft.labracore.api.EditionControllerApi;
@@ -374,7 +370,7 @@ public class EditionService {
.filter(role -> to.contains(role.getType()))
.map(role -> role.getEdition().getId()).collect(Collectors.toSet());
- return Sets.intersection(userSet, personSet).stream().collect(Collectors.toList());
+ return new ArrayList<>(Sets.intersection(userSet, personSet));
}
/**
diff --git a/src/main/java/nl/tudelft/submit/service/EmailService.java b/src/main/java/nl/tudelft/submit/service/EmailService.java
index 17cd9868..0ba22e2c 100644
--- a/src/main/java/nl/tudelft/submit/service/EmailService.java
+++ b/src/main/java/nl/tudelft/submit/service/EmailService.java
@@ -96,7 +96,7 @@ public class EmailService {
/**
* Sends an email to a list of recipients.
*
- * @param recipients The recipients
+ * @param people The recipients
* @param messageCreate The message to send
* @return A future when all emails are sent
*/
diff --git a/src/main/java/nl/tudelft/submit/service/FileService.java b/src/main/java/nl/tudelft/submit/service/FileService.java
index aeb3f3e5..1afcb72a 100644
--- a/src/main/java/nl/tudelft/submit/service/FileService.java
+++ b/src/main/java/nl/tudelft/submit/service/FileService.java
@@ -55,7 +55,7 @@ public class FileService {
StringBuilder path = new StringBuilder();
for (int i = 0; i < NUM_0F_LEVELS; i++) {
- path.append(code.substring(i * SIZE_OF_BLOCKS, (i + 1) * SIZE_OF_BLOCKS));
+ path.append(code, i * SIZE_OF_BLOCKS, (i + 1) * SIZE_OF_BLOCKS);
path.append("/");
}
@@ -198,7 +198,7 @@ public class FileService {
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
long bytesRead = 0;
byte[] bytesIn = new byte[1024];
- int read = 0;
+ int read;
while ((read = bis.read(bytesIn)) != -1) {
zos.write(bytesIn, 0, read);
bytesRead += read;
diff --git a/src/main/java/nl/tudelft/submit/service/GradeService.java b/src/main/java/nl/tudelft/submit/service/GradeService.java
index 2fc0291e..56e8aa43 100644
--- a/src/main/java/nl/tudelft/submit/service/GradeService.java
+++ b/src/main/java/nl/tudelft/submit/service/GradeService.java
@@ -505,7 +505,6 @@ public class GradeService {
*
* @param entityId The id of the entity
* @param type The type of the entity
- * @param type The type of the entity
*/
public <E extends Serializable> void updateGrades(E entityId, GradableType type) {
Object id = entityId;
diff --git a/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java b/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java
index 9915e420..312da30d 100644
--- a/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java
+++ b/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java
@@ -84,7 +84,7 @@ public class ModuleDivisionService {
/**
* Creates module divisions for a specific module based on another module.
*
- * @param from The id of the module that contains divisions to be coppied.
+ * @param from The id of the module that contains divisions to be copied.
* @param to The id of the module in which new divisions will be created.
*/
public void importDivisionsFromModule(Long from, Long to) {
@@ -209,15 +209,15 @@ public class ModuleDivisionService {
*/
public void generateDivisions(Long id, DivisionsGenerateType type, DivisionsGenerateOrder order,
int number) {
- // sort students into prefered order
+ // sort students into preferred order
List<PersonSummaryDTO> students = editionService
.getStudents(moduleService.getModuleById(id).getEdition().getId())
.stream().map(RolePersonDetailsDTO::getPerson).collect(Collectors.toList());
order.arrange(students);
- // distribute students evently (by that order) into number of divisions
- int count = 0;
+ // distribute students evenly (by that order) into number of divisions
+ int count;
switch (type) {
case DIVISION_CAPACITY: {
// Math.ceil( students size / number of divisions ) but avoiding floats
@@ -231,7 +231,7 @@ public class ModuleDivisionService {
int size = students.size() / count;
int extra = students.size() % count;
- List<String> usernames[] = new List[count];
+ List<String>[] usernames = new List[count];
for (int i = 0; i < count; i++)
usernames[i] = new ArrayList();
diff --git a/src/main/java/nl/tudelft/submit/service/ModuleService.java b/src/main/java/nl/tudelft/submit/service/ModuleService.java
index 944b514a..b8cfe71c 100644
--- a/src/main/java/nl/tudelft/submit/service/ModuleService.java
+++ b/src/main/java/nl/tudelft/submit/service/ModuleService.java
@@ -68,9 +68,8 @@ public class ModuleService {
/**
* Returns a submit module view with details about grading and assignments.
*
- * @param id The id of the module
- * @param isStudent Whether to display to a student
- * @return The detailed module view
+ * @param id The id of the module
+ * @return The detailed module view
*/
public SubmitModuleViewDTO getDetailedModuleView(Long id) {
GradingFormulaViewDTO gradingFormula = gradeService.getModuleFormula(new ModuleIdDTO().id(id))
diff --git a/src/main/java/nl/tudelft/submit/service/PersonService.java b/src/main/java/nl/tudelft/submit/service/PersonService.java
index f7c35b3c..374121f8 100644
--- a/src/main/java/nl/tudelft/submit/service/PersonService.java
+++ b/src/main/java/nl/tudelft/submit/service/PersonService.java
@@ -145,7 +145,7 @@ public class PersonService {
* @param number The partial number to find.
* @return The list of people with numbers that contain the given part.
*/
- public List<PersonSummaryDTO> searchyByNumber(Integer number) {
+ public List<PersonSummaryDTO> searchByNumber(Integer number) {
return personApi.searchPeopleByNumberContaining(number).collectList().block();
}
diff --git a/src/main/java/nl/tudelft/submit/service/StudentGroupService.java b/src/main/java/nl/tudelft/submit/service/StudentGroupService.java
index 8a894a67..2a8121a8 100644
--- a/src/main/java/nl/tudelft/submit/service/StudentGroupService.java
+++ b/src/main/java/nl/tudelft/submit/service/StudentGroupService.java
@@ -21,10 +21,6 @@ import static nl.tudelft.submit.enums.SwitchAction.JOIN;
import static nl.tudelft.submit.enums.SwitchAction.LEAVE;
import java.util.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
import javax.transaction.Transactional;
@@ -84,9 +80,8 @@ public class StudentGroupService {
/**
* Returns a detailed overview of a group including the instructor note if the requester is staff.
*
- * @param id the id of the group
- * @param isStaff true if the person requesting this is a staff member in this course edition
- * @return a detailed overview
+ * @param id the id of the group
+ * @return a detailed overview
*/
@Transactional
public SubmitGroupDetailsDTO getSubmitGroupDetails(Long id) {
diff --git a/src/main/java/nl/tudelft/submit/service/SubmissionService.java b/src/main/java/nl/tudelft/submit/service/SubmissionService.java
index 15d11941..b1340c87 100644
--- a/src/main/java/nl/tudelft/submit/service/SubmissionService.java
+++ b/src/main/java/nl/tudelft/submit/service/SubmissionService.java
@@ -213,12 +213,12 @@ public class SubmissionService {
List<Long> submissionsToDownload = new ArrayList<>();
for (AssignmentSummaryDTO assignmentDto : submissions.keySet()) {
- List<Long> submissionsOfAssignemnt = submissions
+ List<Long> submissionsOfAssignment = submissions
.get(assignmentDto)
.stream()
.map(SubmissionDetailsDTO::getId).collect(Collectors.toList());
if (configDto.getSubmissionChoice().equals(SubmissionDownloadPreference.ALL)) {
- submissionsToDownload.addAll(submissionsOfAssignemnt);
+ submissionsToDownload.addAll(submissionsOfAssignment);
} else {
// TODO: may be simplified if submissions are ordered based on submission time
Optional<SubmissionDetailsDTO> submission = getLatestSubmissionOfAssignmentForGroup(groupId,
diff --git a/src/main/java/nl/tudelft/submit/service/UserSettingsService.java b/src/main/java/nl/tudelft/submit/service/UserSettingsService.java
index c108ba7b..3b7bd1f6 100644
--- a/src/main/java/nl/tudelft/submit/service/UserSettingsService.java
+++ b/src/main/java/nl/tudelft/submit/service/UserSettingsService.java
@@ -64,7 +64,7 @@ public class UserSettingsService {
}
/**
- * Patches a person's settins.
+ * Patches a person's settings.
*
* @param personId The id of the person
* @param patch The patch to apply
diff --git a/src/main/resources/templates/assignment/import_grades.html b/src/main/resources/templates/assignment/import_grades.html
index 1dd140dc..41928917 100644
--- a/src/main/resources/templates/assignment/import_grades.html
+++ b/src/main/resources/templates/assignment/import_grades.html
@@ -43,12 +43,12 @@
let idOption = document.createElement("option");
idOption.value = i.toString();
idOption.text = headers[i];
- if (i == 0) idOption.selected = true;
+ if (i === 0) idOption.selected = true;
idColumn.appendChild(idOption);
let gradeOption = document.createElement("option");
gradeOption.value = i.toString();
gradeOption.text = headers[i];
- if (i == 1) gradeOption.selected = true;
+ if (i === 1) gradeOption.selected = true;
gradeColumn.appendChild(gradeOption);
}
};
diff --git a/src/main/resources/templates/person/import.html b/src/main/resources/templates/person/import.html
index f76d4c46..b032a354 100644
--- a/src/main/resources/templates/person/import.html
+++ b/src/main/resources/templates/person/import.html
@@ -41,12 +41,12 @@
let idOption = document.createElement("option");
idOption.value = i.toString();
idOption.text = headers[i];
- if (i == 0) idOption.selected = true;
+ if (i === 0) idOption.selected = true;
idColumn.appendChild(idOption);
let roleOption = document.createElement("option");
roleOption.value = i.toString();
roleOption.text = headers[i];
- if (i == 1) roleOption.selected = true;
+ if (i === 1) roleOption.selected = true;
roleColumn.appendChild(roleOption);
}
};
diff --git a/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java b/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java
index 283b74f7..84814e32 100644
--- a/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java
@@ -18,19 +18,12 @@
package nl.tudelft.submit.controller;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import java.util.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.labracore.lib.api.GradeScheme;
diff --git a/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java b/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java
index 63d5af6f..411301fe 100644
--- a/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java
@@ -17,7 +17,6 @@
*/
package nl.tudelft.submit.controller;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
diff --git a/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java b/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java
index 521a44c8..be5d8158 100644
--- a/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java
@@ -27,10 +27,6 @@ import java.util.List;
import java.util.Optional;
import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.api.dto.EditionIdDTO;
-import nl.tudelft.labracore.api.dto.ModuleCreateDTO;
-import nl.tudelft.labracore.api.dto.ModuleDetailsDTO;
-import nl.tudelft.labracore.api.dto.ModulePatchDTO;
import nl.tudelft.labracore.lib.api.GradeScheme;
import nl.tudelft.submit.TestSubmitApplication;
import nl.tudelft.submit.dto.create.DivisionsCreateTypeDTO;
diff --git a/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java b/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java
index 6ac391b8..b4964bcd 100644
--- a/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java
@@ -19,7 +19,6 @@ package nl.tudelft.submit.controller;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.verify;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
diff --git a/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java b/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java
index f3ccfccc..437c9aaf 100644
--- a/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java
@@ -17,11 +17,7 @@
*/
package nl.tudelft.submit.controller;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.verify;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -276,14 +272,14 @@ class PersonControllerTest {
.andExpect(status().isForbidden());
verifyIsAdmin();
- verify(personService, never()).searchyByNumber(anyInt());
+ verify(personService, never()).searchByNumber(anyInt());
}
@Test
@WithUserDetails("username")
void searchByNumberAllowsIfIsAdmin() throws Exception {
mockIsAdmin(true);
- when(personService.searchyByNumber(any(Integer.class))).thenReturn(List.of(PERSON_SUMMARY));
+ when(personService.searchByNumber(any(Integer.class))).thenReturn(List.of(PERSON_SUMMARY));
mockMvc.perform(get("/person/find/number")
.param("number", mapper.writeValueAsString(NUMBER)))
@@ -291,7 +287,7 @@ class PersonControllerTest {
.andExpect(model().attribute("results", List.of(PERSON_SUMMARY)));
verifyIsAdmin();
- verify(personService).searchyByNumber(NUMBER);
+ verify(personService).searchByNumber(NUMBER);
}
@Test
diff --git a/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java b/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java
index 35b053d4..06810bc5 100644
--- a/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java
@@ -17,7 +17,6 @@
*/
package nl.tudelft.submit.controller;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
diff --git a/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java b/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java
index 3c2b482f..9b023abe 100644
--- a/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java
@@ -18,7 +18,6 @@
package nl.tudelft.submit.controller;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -29,8 +28,6 @@ import java.util.*;
import javax.transaction.Transactional;
import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.api.dto.GroupGenerateDTO;
-import nl.tudelft.labracore.api.dto.StudentGroupPatchDTO;
import nl.tudelft.submit.TestSubmitApplication;
import nl.tudelft.submit.dto.create.note.GroupNoteCreateDTO;
import nl.tudelft.submit.dto.id.GroupId;
diff --git a/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java b/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java
index f5352982..5ad96057 100644
--- a/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java
@@ -18,7 +18,6 @@
package nl.tudelft.submit.controller;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -40,12 +39,6 @@ import nl.tudelft.submit.dto.id.SubmissionId;
import nl.tudelft.submit.model.UserSettings;
import nl.tudelft.submit.security.AuthorizationService;
import nl.tudelft.submit.service.*;
-import nl.tudelft.submit.service.AssignmentService;
-import nl.tudelft.submit.service.FileService;
-import nl.tudelft.submit.service.NoteService;
-import nl.tudelft.submit.service.ScriptService;
-import nl.tudelft.submit.service.StudentGroupService;
-import nl.tudelft.submit.service.SubmissionService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java b/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java
index cdde86a7..115d6c77 100644
--- a/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java
@@ -17,8 +17,6 @@
*/
package nl.tudelft.submit.controller;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
diff --git a/src/test/java/nl/tudelft/submit/csv/CSVServiceTest.java b/src/test/java/nl/tudelft/submit/csv/CSVServiceTest.java
index 61512683..d3008382 100644
--- a/src/test/java/nl/tudelft/submit/csv/CSVServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/csv/CSVServiceTest.java
@@ -18,7 +18,6 @@
package nl.tudelft.submit.csv;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
import java.io.File;
import java.net.MalformedURLException;
diff --git a/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java
index 529383f5..44d84fd2 100644
--- a/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java
@@ -18,11 +18,9 @@
package nl.tudelft.submit.repository.script;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.TestSubmitApplication;
import nl.tudelft.submit.dto.create.script.ScriptCreateDTO;
import nl.tudelft.submit.dto.id.ScriptWagonIdDTO;
diff --git a/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java
index 1f65c727..4336d8fa 100644
--- a/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java
@@ -18,11 +18,9 @@
package nl.tudelft.submit.repository.script;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.TestSubmitApplication;
import nl.tudelft.submit.dto.create.script.ScriptTrainCreateDTO;
import nl.tudelft.submit.dto.id.VersionIdDTO;
diff --git a/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java
index 66f85144..a32867d7 100644
--- a/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java
@@ -18,11 +18,9 @@
package nl.tudelft.submit.repository.script;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.TestSubmitApplication;
import nl.tudelft.submit.dto.create.script.ScriptWagonCreateDTO;
import nl.tudelft.submit.dto.id.ScriptTrainIdDTO;
diff --git a/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java b/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java
index d4b8a15b..a65e2d2b 100644
--- a/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java
@@ -20,12 +20,7 @@ package nl.tudelft.submit.service;
import static java.time.LocalDateTime.now;
import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.StringReader;
@@ -275,7 +270,7 @@ class AssignmentServiceTest {
List<SubmitSubmissionViewDTO> result = assignmentService.getAllSubmissions(ASSIGNMENT_ID);
- SubmitSubmissionViewDTO s1 = result.stream().filter(s -> s.getId() == SUBMISSION_ID).findFirst()
+ SubmitSubmissionViewDTO s1 = result.stream().filter(s -> s.getId().equals(SUBMISSION_ID)).findFirst()
.get();
SubmitSubmissionViewDTO s2 = result.stream().filter(s -> s.getId() == SUBMISSION_ID + 1).findFirst()
.get();
diff --git a/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java b/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java
index bdc63214..48d20dd0 100644
--- a/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java
@@ -17,9 +17,7 @@
*/
package nl.tudelft.submit.service;
-import static nl.tudelft.labracore.api.dto.RolePersonLayer1DTO.TypeEnum.*;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.List;
@@ -29,6 +27,7 @@ import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.TestSubmitApplication;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockitoAnnotations;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -51,12 +50,13 @@ public class CohortServiceTest {
MockitoAnnotations.initMocks(this);
}
+ @Test
public void getAllCohorts() {
CohortSummaryDTO cohort = new CohortSummaryDTO().id(COHORT_ID);
when(cohortApi.getAllCohorts()).thenReturn(Flux.just(cohort));
- assertThat(cohortService).isEqualTo(List.of(cohort));
+ assertThat(cohortService.getAllCohorts()).isEqualTo(List.of(cohort));
}
}
diff --git a/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java b/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java
index d2a1a153..c37fb6a3 100644
--- a/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java
@@ -19,7 +19,6 @@ package nl.tudelft.submit.service;
import static nl.tudelft.labracore.api.dto.RolePersonDetailsDTO.TypeEnum.*;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.IOException;
diff --git a/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java b/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java
index dfbfe296..f5d5d4d3 100644
--- a/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java
@@ -18,7 +18,6 @@
package nl.tudelft.submit.service;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import java.time.LocalDateTime;
diff --git a/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java b/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java
index 5bd7addd..a4708c12 100644
--- a/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java
@@ -18,10 +18,8 @@
package nl.tudelft.submit.service;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
import java.time.LocalDateTime;
-import java.util.*;
import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.TestSubmitApplication;
diff --git a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java
index e7264d1f..4ea2aa58 100644
--- a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java
@@ -17,7 +17,6 @@
*/
package nl.tudelft.submit.service;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import java.util.List;
diff --git a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java
index c70fd4a2..4a8777ec 100644
--- a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java
@@ -18,7 +18,6 @@
package nl.tudelft.submit.service;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import java.util.ArrayList;
diff --git a/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java b/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java
index 7b5d8b31..f867243c 100644
--- a/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java
@@ -18,8 +18,6 @@
package nl.tudelft.submit.service;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import java.util.*;
@@ -28,9 +26,6 @@ import javax.transaction.Transactional;
import nl.tudelft.labracore.api.ModuleControllerApi;
import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.api.dto.ModuleCreateDTO;
-import nl.tudelft.labracore.api.dto.ModuleDetailsDTO;
-import nl.tudelft.labracore.api.dto.ModulePatchDTO;
import nl.tudelft.labracore.lib.api.GradeScheme;
import nl.tudelft.submit.TestSubmitApplication;
import nl.tudelft.submit.cache.AssignmentCacheManager;
diff --git a/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java b/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java
index aaba466a..5f6dd8bd 100644
--- a/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java
@@ -164,8 +164,8 @@ class PersonServiceTest {
void testSearchByNumber() {
when(personApi.searchPeopleByNumberContaining(NUMBER)).thenReturn(Flux.just(PERSON_SUMMARY));
- assertThat(personService.searchyByNumber(NUMBER)).size().isEqualTo(1);
- assertThat(personService.searchyByNumber(NUMBER)).isEqualTo(List.of(PERSON_SUMMARY));
+ assertThat(personService.searchByNumber(NUMBER)).size().isEqualTo(1);
+ assertThat(personService.searchByNumber(NUMBER)).isEqualTo(List.of(PERSON_SUMMARY));
}
@Test
diff --git a/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java b/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java
index 66972d59..bc6a9e5d 100644
--- a/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java
@@ -25,7 +25,6 @@ import java.util.Optional;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.submit.TestSubmitApplication;
import nl.tudelft.submit.dto.create.script.ScriptCreateDTO;
import nl.tudelft.submit.dto.create.script.ScriptTrainCreateDTO;
diff --git a/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java b/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java
index ade103d4..9318a83b 100644
--- a/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java
@@ -25,11 +25,6 @@ import static org.mockito.Mockito.when;
import java.time.LocalDateTime;
import java.util.*;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
import javax.transaction.Transactional;
diff --git a/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java b/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java
index 09116a7a..a31eec2f 100644
--- a/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java
@@ -18,8 +18,6 @@
package nl.tudelft.submit.service;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import java.util.Optional;
diff --git a/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java b/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java
index 68decc2f..76e3ca68 100644
--- a/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java
+++ b/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java
@@ -20,7 +20,6 @@ package nl.tudelft.submit.service.grading;
import static java.time.LocalDateTime.now;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.Collections;
--
GitLab