diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e4faaa49784e2999ede556e3ba13da2b4bb1eb4..7fdb7621b5fe0b97bb816834a8cc980f5f500c0f 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 3333f46fa5b4702795f554b393671565408ae823..56df2b9f2f62864bb19cf735c3a484dad7308174 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 806d5808f97dfb02deb922d1e4d581c6c7f55ed2..74ffe5a8b1666ebc22c7bdb6c7bf4a3d23b3161b 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 e2bbb45451f96c2920952a0452a0d856affe4b4f..98ca742e88e14822288801720b3ef0080f59a9b5 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 ac8a170e416f4d8308e2d1f67019d1836cb4e442..e9c44c9478b736ab0e59d0866370164b27c79700 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 a2c8630ca9240c2e35ec90b7ab7e986d7fbdfce1..148c98d299add7b35a7785f1e9b04572fc5ff00b 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 6c770d9fe863c5833100a3d73e0d6c9784f44a8d..ab5ca9bfb69f942dc97a64b9419618049f2242a3 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 326d920a67353acf2a803c0a1f2e5a2f53a0d6f6..db7a390f4f89bba19a9e0aa71404adbc76cad4b6 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 6f59e10c7be0dc7e90499e2a95ceccf17942a026..ea32ab099a6919b2c870e05f3399c4da97b650d3 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 4684d4e72b25c65f704b16b85bd22171b324bd02..d5f454312c4ea66948d34ce52e9b5eeb4d469aa8 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 86981da860ed582d1e8f764f910c551f257d690d..8c5979431f9195c9dd3be1a4744a41b831de03b5 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 ea13bd339c1aca1e93d6f50d30cbf5c95c068b35..a9e4a51d77802419e6b238d3a9ef60158507d306 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 2e6588ce9634b6c54e4de437bf8aeafda14fb553..2e1b8177af85a097ca0532efa79c33e0746b21ff 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 91639b5bc2bd1a9f8bcc118dac35f0b74dedf942..959f3a67bf5e33ca8669f3dc723c1bbf9c339601 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 6a077e57491da4f6de2d6bb137915f83d0c7e9e8..17af3aea72d117417ec0851db83dadfb4ad63b6c 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 04a4686f6244579131f5d85d6be1a89c8809f107..a0ac44b15b3ea9ea5a2ab34c60a4bd9cff732777 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 0cf6f2ca2680c2b5f15ad01789a15c859e6fea21..c7edbc4d4dd11b66a031c40a309a36cf5489fc93 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 6bd52ceec49547de6749754290a7826f1985f694..0e7eff25420d97fa8ef55c249230fd8d1bdd8a1f 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 654c48c5421ff1ab3d15a5862d2156bca9daae6a..31df117ca9ee50754cdfafb9ff8063cb28706e6a 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 ab32414aa22ca3c0f7aa4315e5563b4035b73b13..fbdbe7b1c61b19fc9a7192a4e6e6e64e844c1266 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 fecb75cd129bb6b50f91463871e8e00a5211d1fe..035ee1e6b5244e95211f10faf55c0dbe8964e236 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 17cd9868df948dc08c6f6a3833446d40163689aa..0ba22e2cf3b33b5aa514c607de9e35d5aab74bf2 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 aeb3f3e5c0429e46d01287f020ee8ba0227732f9..1afcb72a5eb006109cdcd682a9f960a8e1bd633a 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 2fc0291e61433385d0b4e6e0fc959cb2ce99dd8b..56e8aa436a04e983cd99a54d100c3f4e970e06bf 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 9915e420566df6bdf120761c6371dfef13a863d8..312da30da7817f60bd0a25137290461787eb4f00 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 944b514a357df81fd4144c724423b6f42f3479bd..b8cfe71ca8c38be0823e203d8840bb1037c0f284 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 f7c35b3c2767d9d83381d784b8d541c9604e555b..374121f8d61960e2c6fd103b91186bf21150b245 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 8a894a67140bc5fff64a4555b616dc9bbbae578d..2a8121a831b83f315bdeb787611a4acd4024d48d 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 15d1194128fa15c70093885f0447756e9ea24585..b1340c871bc868f25f73411b42ca6165dcacdc92 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 c108ba7b820c9aa4c24ec72f4c106dad176d8260..3b7bd1f645af5eec97d58718c7529581691d2922 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 1dd140dce84022f2c68ee2335756028acba132ef..41928917067695ca43f7cffa60fc4c6418234e6c 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 f76d4c46cf0194d00c626c26c1d8cbcf37ee387b..b032a35408801374e40862cc302d97046c40c348 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 283b74f70e3a0e683df7f55782d548f72bfe1b76..84814e32a6c21c572dfd38a5d84e6bb883e312b6 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 63d5af6f0a401957bc9c6a1cbc0dd258687dd6ee..411301fe34f4c7f77cf4a6ed23f555fc621a3eed 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 521a44c82221f634db5b065708ac251cfa7e50e3..be5d81588cb467c117e1e1eadd9eea5cbc16721b 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 6ac391b8ad931ea44ee0eb3aec7913053bfe8d83..b4964bcd5e459927f35e464ce6d653710dcc5706 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 f3ccfccc661283b7249ca6cff6c7d5a8afe1b785..437c9aafcfb403508fad3085dfa3685b71dceca5 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 35b053d467a5f1444e0be9fbb6ca7ffdf2355a8f..06810bc52b07ef698f9a3973fcb4f3d1bd45a909 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 3c2b482ff19997214871e6b4b51ae427c4279349..9b023abe401763f760598864579bdcd85d854daa 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 f5352982ca68afe5f2ceac6928d784890d4e30e7..5ad960570ef401650aa95638bccd7f77ee2aeba0 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 cdde86a715eb677d99bc903c711d6f877e84dfd2..115d6c77f78ee2eb3b017d484da1a72375bc541a 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 61512683ec234b2e2fa665d58c025f487cde1384..d3008382cb3c86b2fdbc759982f1134b5aa75cfb 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 529383f5f887874c855ccb7f267de771e323a1c6..44d84fd2963c1e97395be5fdbee01e79bf1c2c4d 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 1f65c7279b4909b8076270a38a8a69e2846b5b86..4336d8facd19584162a7b303f5aaac8d31d3bc41 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 66f851440f619b0fd489dd41430ecc0b3603fee8..a32867d75f440507868171c5e81112a61b3e145d 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 d4b8a15b0a1e7b081197acf37e793f110a6caf78..a65e2d2b14987ab6ad5954b59e726fb1a66bdf4a 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 bdc63214178a276d6fefde467d7fcead48b10233..48d20dd05d1585342be17069803e42d1be5e4d73 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 d2a1a1538eeeb54a60cd62d7621e1ca228709b6f..c37fb6a334b2b4eb5dfbfc8f2c95b9c8a870a428 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 dfbfe296b5de8eec341cf965e61866dc2c9e3390..f5d5d4d31750e6b9f88f93e4f8dfe9dbce27ad38 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 5bd7addd2eea5b6e2e146624eeb4262f305f2f9e..a4708c12a366e1f979cce9ae98cebcb09298bead 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 e7264d1fc13a77aa1a0a0ce148b3320eab8591df..4ea2aa580da1f9f4c41e41fbd60748c442b5d0b3 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 c70fd4a23b0ea54f514f90c9c155191004ba237c..4a8777ec85f94a030146874f5d11ad30e7be50fd 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 7b5d8b318f90bcde68dc8e95a27471d313f44e25..f867243ca3777f7cbd3d08238199d31fdffdd502 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 aaba466a1e4a892c4c859b879d79482c795a0569..5f6dd8bd9f61be17fd0f8c5b0b8d6ced15c97dd9 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 66972d5950090d374a4f3c30d5901e5638653bfa..bc6a9e5df944dfa843656858c211a8ad715b3ad8 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 ade103d4884713f5a0f98a3af9da74a855e18b53..9318a83b9772a7cfc781db75b068523dd4d6da0d 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 09116a7a9b867e55576d2f138fecc5c59b1ef770..a31eec2f6f83193b56c068fb1d2ad1ccfd394f5d 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 68decc2fad019b425ac51668f343a12667e96ace..76e3ca68024b76b217b73eeff293841b1459e526 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;