Reformat with 120 line length

core/src/main/java/se/su/dsv/scipro/CoreConfig.java

@@ -212,9 +212,7 @@ public class CoreConfig {
     }
 
     @Bean
-    public GradingHistory gradingHistory(
+    public GradingHistory gradingHistory(GradingHistoryEventRepository gradingHistoryEventRepository) {
-        GradingHistoryEventRepository gradingHistoryEventRepository
-    ) {
         return new GradingHistory(gradingHistoryEventRepository);
     }
 
@@ -324,32 +322,22 @@ public class CoreConfig {
     }
 
     @Bean
-    public ApplicationPeriodProjectTypeServiceImpl applicationPeriodProjectTypeService(
+    public ApplicationPeriodProjectTypeServiceImpl applicationPeriodProjectTypeService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ApplicationPeriodProjectTypeServiceImpl(em);
     }
 
     @Bean
-    public ApplicationPeriodServiceImpl applicationPeriodService(
+    public ApplicationPeriodServiceImpl applicationPeriodService(Provider<EntityManager> em, Clock clock) {
-        Provider<EntityManager> em,
-        Clock clock
-    ) {
         return new ApplicationPeriodServiceImpl(em, clock);
     }
 
     @Bean
-    public AuthenticationServiceImpl authenticationService(
+    public AuthenticationServiceImpl authenticationService(Set<AuthenticationProvider> authenticationProviders) {
-        Set<AuthenticationProvider> authenticationProviders
-    ) {
         return new AuthenticationServiceImpl(authenticationProviders);
     }
 
     @Bean
-    public LocalAuthentication localAuthentication(
+    public LocalAuthentication localAuthentication(UserService userService, PasswordService passwordService) {
-        UserService userService,
-        PasswordService passwordService
-    ) {
         return new LocalAuthentication(userService, passwordService);
     }
 
@@ -430,12 +418,7 @@ public class CoreConfig {
         FileReferenceRepository fileReferenceRepository,
         FileDescriptionRepo fileDescriptionRepository
     ) {
-        return new FileServiceImpl(
+        return new FileServiceImpl(em, fileReferenceRepository, fileDescriptionRepository, fileStore);
-            em,
-            fileReferenceRepository,
-            fileDescriptionRepository,
-            fileStore
-        );
     }
 
     @Bean
@@ -446,16 +429,12 @@ public class CoreConfig {
     }
 
     @Bean
-    public FinalSeminarOppositionServiceImpl finalSeminarOppositionService(
+    public FinalSeminarOppositionServiceImpl finalSeminarOppositionService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new FinalSeminarOppositionServiceImpl(em);
     }
 
     @Bean
-    public FinalSeminarRespondentServiceImpl finalSeminarRespondentService(
+    public FinalSeminarRespondentServiceImpl finalSeminarRespondentService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new FinalSeminarRespondentServiceImpl(em);
     }
 
@@ -545,16 +524,12 @@ public class CoreConfig {
     }
 
     @Bean
-    public GeneralSystemSettingsServiceImpl generalSystemSettingsService(
+    public GeneralSystemSettingsServiceImpl generalSystemSettingsService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new GeneralSystemSettingsServiceImpl(em);
     }
 
     @Bean
-    public GradeCalculatorServiceImpl gradeCalculatorService(
+    public GradeCalculatorServiceImpl gradeCalculatorService(GradingReportService gradingReportService) {
-        GradingReportService gradingReportService
-    ) {
         return new GradeCalculatorServiceImpl(gradingReportService);
     }
 
@@ -649,9 +624,7 @@ public class CoreConfig {
     }
 
     @Bean
-    public MilestonePhaseTemplateServiceImpl milestonePhaseTemplateService(
+    public MilestonePhaseTemplateServiceImpl milestonePhaseTemplateService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new MilestonePhaseTemplateServiceImpl(em);
     }
 
@@ -754,18 +727,11 @@ public class CoreConfig {
         PlagiarismRequestRepository plagiarismRequestRepository,
         UrkundSubmissionRepository urkundSubmissionRepository
     ) {
-        return new PlagiarismControlImpl(
+        return new PlagiarismControlImpl(plagiarismRequestRepository, urkundSubmissionRepository, fileService);
-            plagiarismRequestRepository,
-            urkundSubmissionRepository,
-            fileService
-        );
     }
 
     @Bean
-    public PreliminaryMatchServiceImpl preliminaryMatchService(
+    public PreliminaryMatchServiceImpl preliminaryMatchService(Provider<EntityManager> em, IdeaService ideaService) {
-        Provider<EntityManager> em,
-        IdeaService ideaService
-    ) {
         return new PreliminaryMatchServiceImpl(em, ideaService);
     }
 
@@ -783,9 +749,7 @@ public class CoreConfig {
     }
 
     @Bean
-    public ProjectFinalSeminarStatisticsServiceImpl projectFinalSeminarStatisticsService(
+    public ProjectFinalSeminarStatisticsServiceImpl projectFinalSeminarStatisticsService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ProjectFinalSeminarStatisticsServiceImpl(em);
     }
 
@@ -812,9 +776,7 @@ public class CoreConfig {
     }
 
     @Bean
-    public ProjectPeopleStatisticsServiceImpl projectPeopleStatisticsService(
+    public ProjectPeopleStatisticsServiceImpl projectPeopleStatisticsService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ProjectPeopleStatisticsServiceImpl(em);
     }
 
@@ -850,16 +812,12 @@ public class CoreConfig {
     }
 
     @Bean
-    public ReceiverConfigurationServiceImpl receiverConfigurationService(
+    public ReceiverConfigurationServiceImpl receiverConfigurationService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ReceiverConfigurationServiceImpl(em);
     }
 
     @Bean
-    public ReviewerDeadlineFollowupServiceImpl reviewerDeadlineFollowupService(
+    public ReviewerDeadlineFollowupServiceImpl reviewerDeadlineFollowupService(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ReviewerDeadlineFollowupServiceImpl(em);
     }
 
@@ -981,10 +939,7 @@ public class CoreConfig {
     }
 
     @Bean
-    public UrkundApiImpl urkundApi(
+    public UrkundApiImpl urkundApi(UrkundSettingsRepository urkundSettingsRepository, FileService fileService) {
-        UrkundSettingsRepository urkundSettingsRepository,
-        FileService fileService
-    ) {
         return new UrkundApiImpl(urkundSettingsRepository, fileService);
     }
 
@@ -1072,11 +1027,7 @@ public class CoreConfig {
         ActivityFinalSeminarRepository activityFinalSeminarRepository,
         EventBus eventBus
     ) {
-        return new FinalSeminarActivityHandler(
+        return new FinalSeminarActivityHandler(activityPlanFacade, activityFinalSeminarRepository, eventBus);
-            activityPlanFacade,
-            activityFinalSeminarRepository,
-            eventBus
-        );
     }
 
     @Bean
@@ -1085,11 +1036,7 @@ public class CoreConfig {
         ProjectForumService projectForumService,
         ActivityThreadRepository activityThreadRepository
     ) {
-        return new PostActivityUploadToForum(
+        return new PostActivityUploadToForum(projectForumService, activityThreadRepository, eventBus);
-            projectForumService,
-            activityThreadRepository,
-            eventBus
-        );
     }
 
     @Bean
@@ -1140,10 +1087,7 @@ public class CoreConfig {
     }
 
     @Bean
-    public ProjectStartNotifier projectStartNotifier(
+    public ProjectStartNotifier projectStartNotifier(EventBus eventBus, NotificationController notificationController) {
-        EventBus eventBus,
-        NotificationController notificationController
-    ) {
         return new ProjectStartNotifier(eventBus, notificationController);
     }
 
@@ -1165,9 +1109,7 @@ public class CoreConfig {
     }
 
     @Bean
-    public CommentThreadServiceImpl commentThreadService(
+    public CommentThreadServiceImpl commentThreadService(CommentThreadRepo commentThreadRepository) {
-        CommentThreadRepo commentThreadRepository
-    ) {
         return new CommentThreadServiceImpl(commentThreadRepository);
     }
 

core/src/main/java/se/su/dsv/scipro/DataInitializer.java

@@ -104,13 +104,9 @@ public class DataInitializer implements Lifecycle {
 
     private void createApplicationPeriodIfNotDone() {
         ApplicationPeriod applicationPeriod = new ApplicationPeriod("HT 2014");
-        applicationPeriod.setStartDate(
+        applicationPeriod.setStartDate(LocalDate.now().minusDays(APPLICATION_PERIOD_START_MINUS_DAYS));
-            LocalDate.now().minusDays(APPLICATION_PERIOD_START_MINUS_DAYS)
-        );
         applicationPeriod.setEndDate(LocalDate.now().plusDays(APPLICATION_PERIOD_END_PLUS_DAYS));
-        applicationPeriod.setCourseStartDate(
+        applicationPeriod.setCourseStartDate(LocalDate.now().plusDays(APPLICATION_PERIOD_COURSE_START_PLUS_DAYS));
-            LocalDate.now().plusDays(APPLICATION_PERIOD_COURSE_START_PLUS_DAYS)
-        );
         applicationPeriod.setCourseStartTime(LocalTime.of(8, 0));
         applicationPeriod = save(applicationPeriod);
         applicationPeriod.setProjectTypes(new HashSet<>(Collections.singletonList(bachelorClass)));
@@ -153,13 +149,7 @@ public class DataInitializer implements Lifecycle {
         createProject(PROJECT_2, eve_employee, sid_student, simon_student, eric_employee);
     }
 
-    private void createProject(
+    private void createProject(String title, User headSupervisor, User student1, User student2, User reviewer) {
-        String title,
-        User headSupervisor,
-        User student1,
-        User student2,
-        User reviewer
-    ) {
         Project project = Project.builder()
             .title(title)
             .projectType(bachelorClass)
@@ -205,13 +195,7 @@ public class DataInitializer implements Lifecycle {
     }
 
     private User createUser(String firstName, String lastName) {
-        User user = save(
+        User user = save(User.builder().firstName(firstName).lastName(lastName).emailAddress(firstName + MAIL).build());
-            User.builder()
-                .firstName(firstName)
-                .lastName(lastName)
-                .emailAddress(firstName + MAIL)
-                .build()
-        );
         addUserName(user);
         user = addPassword(user);
         return user;
@@ -296,9 +280,7 @@ public class DataInitializer implements Lifecycle {
         gradingCriterionPointTemplates.add(
             new GradingCriterionPointTemplate.Builder()
                 .point(1)
-                .description(
+                .description("För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem.")
-                    "För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem."
-                )
                 .descriptionEn(
                     "Requirement for 1 point: that the thesis introduces the subject and problem of the thesis."
                 )
@@ -323,12 +305,7 @@ public class DataInitializer implements Lifecycle {
                 )
                 .build()
         );
-        gradingReportTemplate.addProjectCriterion(
+        gradingReportTemplate.addProjectCriterion("U3 Problem", "U3 Problem", 1, gradingCriterionPointTemplates);
-            "U3 Problem",
-            "U3 Problem",
-            1,
-            gradingCriterionPointTemplates
-        );
 
         gradingCriterionPointTemplates = initPointTemplates();
         gradingCriterionPointTemplates.add(
@@ -473,12 +450,7 @@ public class DataInitializer implements Lifecycle {
                 )
                 .build()
         );
-        gradingReportTemplate.addProjectCriterion(
+        gradingReportTemplate.addProjectCriterion("U8 Resultat", "U8 Result", 1, gradingCriterionPointTemplates);
-            "U8 Resultat",
-            "U8 Result",
-            1,
-            gradingCriterionPointTemplates
-        );
 
         gradingCriterionPointTemplates = initPointTemplates();
         gradingCriterionPointTemplates.add(
@@ -692,12 +664,7 @@ public class DataInitializer implements Lifecycle {
                 .build()
         );
         gradingReportTemplate
-            .addIndividualCriterion(
+            .addIndividualCriterion("Ö4 Deadlines", "Ö4 Deadlines", 0, gradingCriterionPointTemplates)
-                "Ö4 Deadlines",
-                "Ö4 Deadlines",
-                0,
-                gradingCriterionPointTemplates
-            )
             .setFx(false);
 
         gradingCriterionPointTemplates = initPointTemplates();
@@ -775,9 +742,7 @@ public class DataInitializer implements Lifecycle {
         gradingCriterionPointTemplates.add(
             new GradingCriterionPointTemplate.Builder()
                 .point(1)
-                .description(
+                .description("För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem.")
-                    "För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem."
-                )
                 .descriptionEn(
                     "Requirement for 1 point: that the thesis introduces the subject and problem of the thesis."
                 )
@@ -802,12 +767,7 @@ public class DataInitializer implements Lifecycle {
                 )
                 .build()
         );
-        gradingReportTemplateMaster.addProjectCriterion(
+        gradingReportTemplateMaster.addProjectCriterion("U3 Problem", "U3 Problem", 1, gradingCriterionPointTemplates);
-            "U3 Problem",
-            "U3 Problem",
-            1,
-            gradingCriterionPointTemplates
-        );
 
         gradingCriterionPointTemplates = initPointTemplates();
         gradingCriterionPointTemplates.add(
@@ -947,9 +907,7 @@ public class DataInitializer implements Lifecycle {
         gradingCriterionPointTemplates.add(
             new GradingCriterionPointTemplate.Builder()
                 .point(3)
-                .description(
+                .description("För 3 poäng krävs dessutom: att det finns ett betydande djup i dataanalysen.")
-                    "För 3 poäng krävs dessutom: att det finns ett betydande djup i dataanalysen."
-                )
                 .descriptionEn(
                     "For 3 points the following is also required: that there is a meaningful depth to the data analysis."
                 )
@@ -996,12 +954,7 @@ public class DataInitializer implements Lifecycle {
                 )
                 .build()
         );
-        gradingReportTemplateMaster.addProjectCriterion(
+        gradingReportTemplateMaster.addProjectCriterion("U8 Resultat", "U8 Result", 2, gradingCriterionPointTemplates);
-            "U8 Resultat",
-            "U8 Result",
-            2,
-            gradingCriterionPointTemplates
-        );
 
         gradingCriterionPointTemplates = initPointTemplates();
         gradingCriterionPointTemplates.add(
@@ -1224,12 +1177,7 @@ public class DataInitializer implements Lifecycle {
                 .build()
         );
         gradingReportTemplateMaster
-            .addIndividualCriterion(
+            .addIndividualCriterion("Ö4 Deadlines", "Ö4 Deadlines", 0, gradingCriterionPointTemplates)
-                "Ö4 Deadlines",
-                "Ö4 Deadlines",
-                0,
-                gradingCriterionPointTemplates
-            )
             .setFx(false);
 
         gradingCriterionPointTemplates = initPointTemplates();
@@ -1307,9 +1255,7 @@ public class DataInitializer implements Lifecycle {
         gradingCriterionPointTemplates.add(
             new GradingCriterionPointTemplate.Builder()
                 .point(1)
-                .description(
+                .description("För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem.")
-                    "För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem."
-                )
                 .descriptionEn(
                     "Requirement for 1 point: that the thesis introduces the subject and problem of the thesis."
                 )
@@ -1712,12 +1658,7 @@ public class DataInitializer implements Lifecycle {
                 .build()
         );
         gradingReportTemplateMagister
-            .addIndividualCriterion(
+            .addIndividualCriterion("Ö4 Deadlines", "Ö4 Deadlines", 0, gradingCriterionPointTemplates)
-                "Ö4 Deadlines",
-                "Ö4 Deadlines",
-                0,
-                gradingCriterionPointTemplates
-            )
             .setFx(false);
 
         gradingCriterionPointTemplates = initPointTemplates();
@@ -1768,28 +1709,18 @@ public class DataInitializer implements Lifecycle {
 
     private List<GradingCriterionPointTemplate> initPointTemplates() {
         List<GradingCriterionPointTemplate> gradingCriterionPointTemplates = new ArrayList<>();
-        gradingCriterionPointTemplates.add(
+        gradingCriterionPointTemplates.add(new GradingCriterionPointTemplate.Builder().point(0).build());
-            new GradingCriterionPointTemplate.Builder().point(0).build()
-        );
         return gradingCriterionPointTemplates;
     }
 
     private void createDefaultProjectTypesIfNotDone() {
-        bachelorClass = new ProjectType(
+        bachelorClass = new ProjectType(ProjectType.BACHELOR, "Bachelor", "Bachelor degree thesis project");
-            ProjectType.BACHELOR,
-            "Bachelor",
-            "Bachelor degree thesis project"
-        );
         bachelorClass = save(bachelorClass);
 
         masterClass = new ProjectType(ProjectType.MASTER, "Master", "Master degree thesis project");
         save(masterClass);
 
-        magisterClass = new ProjectType(
+        magisterClass = new ProjectType(ProjectType.MAGISTER, "Magister", "One-year-Master degree thesis project");
-            ProjectType.MAGISTER,
-            "Magister",
-            "One-year-Master degree thesis project"
-        );
         save(magisterClass);
 
         final ProjectType phdClass = new ProjectType(DegreeType.NONE, "PhD", "PhD project");
@@ -1955,11 +1886,7 @@ public class DataInitializer implements Lifecycle {
         MilestonePhaseTemplate milestonePhaseTemplate,
         String code
     ) {
-        MilestoneActivityTemplate milestoneActivityTemplate = new MilestoneActivityTemplate(
+        MilestoneActivityTemplate milestoneActivityTemplate = new MilestoneActivityTemplate(type, title, description);
-            type,
-            title,
-            description
-        );
         milestoneActivityTemplate.addProjectType(bachelorClass);
         milestoneActivityTemplate.addProjectType(masterClass);
         milestoneActivityTemplate.addProjectType(magisterClass);
@@ -1969,10 +1896,7 @@ public class DataInitializer implements Lifecycle {
     }
 
     private MilestonePhaseTemplate createMileStonePhase(String title, String description) {
-        MilestonePhaseTemplate milestonePhaseTemplate1 = new MilestonePhaseTemplate(
+        MilestonePhaseTemplate milestonePhaseTemplate1 = new MilestonePhaseTemplate(title, description);
-            title,
-            description
-        );
         return save(milestonePhaseTemplate1);
     }
 

core/src/main/java/se/su/dsv/scipro/RepositoryConfiguration.java

@@ -55,9 +55,7 @@ import se.su.dsv.scipro.system.UserRepoImpl;
 public class RepositoryConfiguration {
 
     @Bean
-    public GradingHistoryEventRepositoryImpl gradingHistoryEventRepository(
+    public GradingHistoryEventRepositoryImpl gradingHistoryEventRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new GradingHistoryEventRepositoryImpl(em);
     }
 
@@ -67,9 +65,7 @@ public class RepositoryConfiguration {
     }
 
     @Bean
-    public ActivityFinalSeminarRepositoryImpl activityFinalSeminarRepository(
+    public ActivityFinalSeminarRepositoryImpl activityFinalSeminarRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ActivityFinalSeminarRepositoryImpl(em);
     }
 
@@ -151,9 +147,7 @@ public class RepositoryConfiguration {
     }
 
     @Bean
-    public ForumPostReadStateRepositoryImpl forumPostReadStateRepository(
+    public ForumPostReadStateRepositoryImpl forumPostReadStateRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ForumPostReadStateRepositoryImpl(em);
     }
 
@@ -178,16 +172,12 @@ public class RepositoryConfiguration {
     }
 
     @Bean
-    public MilestoneActivityTemplateRepositoryImpl milestoneActivityTemplateRepository(
+    public MilestoneActivityTemplateRepositoryImpl milestoneActivityTemplateRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new MilestoneActivityTemplateRepositoryImpl(em);
     }
 
     @Bean
-    public NationalSubjectCategoryRepositoryImpl nationalSubjectCategoryRepository(
+    public NationalSubjectCategoryRepositoryImpl nationalSubjectCategoryRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new NationalSubjectCategoryRepositoryImpl(em);
     }
 
@@ -227,9 +217,7 @@ public class RepositoryConfiguration {
     }
 
     @Bean
-    public PublicationMetadataRepositoryImpl publicationMetadataRepository(
+    public PublicationMetadataRepositoryImpl publicationMetadataRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new PublicationMetadataRepositoryImpl(em);
     }
 
@@ -239,9 +227,7 @@ public class RepositoryConfiguration {
     }
 
     @Bean
-    public ReviewerDeadlineSettingsRepositoryImpl reviewerDeadlineSettingsRepository(
+    public ReviewerDeadlineSettingsRepositoryImpl reviewerDeadlineSettingsRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new ReviewerDeadlineSettingsRepositoryImpl(em);
     }
 
@@ -296,9 +282,7 @@ public class RepositoryConfiguration {
     }
 
     @Bean
-    public SupervisorGradingReportRepositoryImpl supervisorGradingReportRepository(
+    public SupervisorGradingReportRepositoryImpl supervisorGradingReportRepository(Provider<EntityManager> em) {
-        Provider<EntityManager> em
-    ) {
         return new SupervisorGradingReportRepositoryImpl(em);
     }
 }

core/src/main/java/se/su/dsv/scipro/activityplan/ActivityFileUploadedEvent.java

@@ -7,10 +7,7 @@ public class ActivityFileUploadedEvent {
     private final Activity activity;
     private final FileDescription fileDescription;
 
-    public ActivityFileUploadedEvent(
+    public ActivityFileUploadedEvent(final Activity activity, final FileDescription fileDescription) {
-        final Activity activity,
-        final FileDescription fileDescription
-    ) {
         this.activity = activity;
         this.fileDescription = fileDescription;
     }

core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlan.java

@@ -105,12 +105,7 @@ public class ActivityPlan extends DomainObject {
 
     @Override
     public int hashCode() {
-        return Objects.hash(
+        return Objects.hash(this.getId(), this.getActivities(), this.getProject(), this.getStartDate());
-            this.getId(),
-            this.getActivities(),
-            this.getProject(),
-            this.getStartDate()
-        );
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacade.java

@@ -20,12 +20,7 @@ public interface ActivityPlanFacade {
 
     void addActivitiesFromTemplate(Project project, ActivityPlanTemplate template, Date startDate);
 
-    ActivityPlanTemplate createTemplateFromSchedule(
+    ActivityPlanTemplate createTemplateFromSchedule(ActivityPlan schedule, User user, String name, String description);
-        ActivityPlan schedule,
-        User user,
-        String name,
-        String description
-    );
 
     void deleteActivity(Activity event);
 
@@ -33,12 +28,7 @@ public interface ActivityPlanFacade {
 
     //moving from activityservice
     List<Activity> findEventsByProject(final Project project, Pageable pageable);
-    List<Activity> findEventsByProject(
+    List<Activity> findEventsByProject(final Project project, final Date from, final Date to, Pageable pageable);
-        final Project project,
-        final Date from,
-        final Date to,
-        Pageable pageable
-    );
     long countEventsByProject(final Project project, final Date from, final Date to);
     Checklist createChecklist(Project project, ChecklistTemplate template);
 

core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java

@@ -192,19 +192,13 @@ public class ActivityPlanFacadeImpl implements ActivityPlanFacade {
         ActivityPlanTemplate template,
         final Date startDate
     ) {
-        ActivityPlanTemplate reloadedTemplate = activityPlanTemplateService.findOne(
+        ActivityPlanTemplate reloadedTemplate = activityPlanTemplateService.findOne(template.getId()); //Reload lazily linked entities
-            template.getId()
-        ); //Reload lazily linked entities
         int accumulatedOffset = 0;
         for (final ActivityTemplate eventTemplate : reloadedTemplate.getActivityTemplates()) {
             accumulatedOffset += eventTemplate.getDaysOffset();
             final Date dateForEvent = daysService.workDaysAfter(startDate, accumulatedOffset);
-            final String title = eventTemplate.getTitle() != null
+            final String title = eventTemplate.getTitle() != null ? eventTemplate.getTitle() : "no title";
-                ? eventTemplate.getTitle()
+            final String desc = eventTemplate.getDescription() != null ? eventTemplate.getDescription() : "";
-                : "no title";
-            final String desc = eventTemplate.getDescription() != null
-                ? eventTemplate.getDescription()
-                : "";
             final ChecklistTemplate checklistTemplate = eventTemplate.getChecklistTemplate();
             final Action action = eventTemplate.getAction();
             if (checklistTemplate != null) {
@@ -245,15 +239,10 @@ public class ActivityPlanFacadeImpl implements ActivityPlanFacade {
 
         Date previousActivityDate = null;
         // Fucking Hibernate that replaces the original TreeSet with an unsorted implementation because it can.
-        SortedSet<Activity> activities = new TreeSet<>(
+        SortedSet<Activity> activities = new TreeSet<>(new Activity.ByDateComparator().thenComparing(Activity::getId));
-            new Activity.ByDateComparator().thenComparing(Activity::getId)
-        );
         activities.addAll(schedule.getActivities());
         for (final Activity activity : activities) {
-            final ActivityTemplate activityTemplate = createTemplateFromActivity(
+            final ActivityTemplate activityTemplate = createTemplateFromActivity(previousActivityDate, activity);
-                previousActivityDate,
-                activity
-            );
             template.addActivity(activityTemplate);
             previousActivityDate = activity.getDate();
         }
@@ -268,17 +257,13 @@ public class ActivityPlanFacadeImpl implements ActivityPlanFacade {
         eventTemplate.setDescription(event.getDescription());
         eventTemplate.setAction(event.getAction());
         if (event.getChecklist() != null) {
-            eventTemplate.setChecklistTemplate(
+            eventTemplate.setChecklistTemplate(checklistTemplateService.findByName(event.getChecklist().getName()));
-                checklistTemplateService.findByName(event.getChecklist().getName())
-            );
         }
         return eventTemplate;
     }
 
     private int daysBetween(Date previousEventDate, Date currentEventDate) {
-        return previousEventDate == null
+        return previousEventDate == null ? 0 : daysService.workDaysBetween(previousEventDate, currentEventDate);
-            ? 0
-            : daysService.workDaysBetween(previousEventDate, currentEventDate);
     }
 
     @Override
@@ -307,21 +292,12 @@ public class ActivityPlanFacadeImpl implements ActivityPlanFacade {
     }
 
     @Override
-    public List<Activity> findEventsByProject(
+    public List<Activity> findEventsByProject(Project project, Date from, Date to, Pageable pageable) {
-        Project project,
-        Date from,
-        Date to,
-        Pageable pageable
-    ) {
         final Date dateFrom = from != null ? from : new Date(0);
         final Date dateTo = to != null ? to : FAR_IN_THE_FUTURE;
         QActivity event = QActivity.activity;
         return activityService.findAll(
-            allOf(
+            allOf(event.activityPlan.project.eq(project), event.date.after(dateFrom), event.date.before(dateTo)),
-                event.activityPlan.project.eq(project),
-                event.date.after(dateFrom),
-                event.date.before(dateTo)
-            ),
             pageable
         );
     }
@@ -332,11 +308,7 @@ public class ActivityPlanFacadeImpl implements ActivityPlanFacade {
         final Date dateTo = to != null ? to : FAR_IN_THE_FUTURE;
         QActivity event = QActivity.activity;
         return activityService.count(
-            allOf(
+            allOf(event.activityPlan.project.eq(project), event.date.after(dateFrom), event.date.before(dateTo))
-                event.activityPlan.project.eq(project),
-                event.date.after(dateFrom),
-                event.date.before(dateTo)
-            )
         );
     }
 
@@ -361,10 +333,7 @@ public class ActivityPlanFacadeImpl implements ActivityPlanFacade {
             .build();
         checklist.setCategories(categories);
         for (String question : template.getQuestions()) {
-            ChecklistQuestion clQuestion = new ChecklistQuestion(
+            ChecklistQuestion clQuestion = new ChecklistQuestion(question, checklist.getNumberOfQuestions());
-                question,
-                checklist.getNumberOfQuestions()
-            );
             clQuestion = checklistQuestionRepo.save(clQuestion);
             checklist.addQuestion(clQuestion);
         }

core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java

@@ -5,9 +5,7 @@ import jakarta.inject.Provider;
 import jakarta.persistence.EntityManager;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 
-public class ActivityPlanServiceImpl
+public class ActivityPlanServiceImpl extends AbstractServiceImpl<ActivityPlan, Long> implements ActivityPlanService {
-    extends AbstractServiceImpl<ActivityPlan, Long>
-    implements ActivityPlanService {
 
     @Inject
     public ActivityPlanServiceImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java

@@ -50,16 +50,8 @@ public class ActivityPlanTemplateServiceImpl
     private static Predicate filterString(String filterString) {
         return QActivityPlanTemplate.activityPlanTemplate.title
             .containsIgnoreCase(filterString)
-            .or(
+            .or(QActivityPlanTemplate.activityPlanTemplate.creator.firstName.containsIgnoreCase(filterString))
-                QActivityPlanTemplate.activityPlanTemplate.creator.firstName.containsIgnoreCase(
+            .or(QActivityPlanTemplate.activityPlanTemplate.creator.lastName.containsIgnoreCase(filterString));
-                    filterString
-                )
-            )
-            .or(
-                QActivityPlanTemplate.activityPlanTemplate.creator.lastName.containsIgnoreCase(
-                    filterString
-                )
-            );
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java

@@ -5,9 +5,7 @@ import jakarta.inject.Provider;
 import jakarta.persistence.EntityManager;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 
-public class ActivityServiceImpl
+public class ActivityServiceImpl extends AbstractServiceImpl<Activity, Long> implements ActivityService {
-    extends AbstractServiceImpl<Activity, Long>
-    implements ActivityService {
 
     @Inject
     public ActivityServiceImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/checklist/Checklist.java

@@ -56,10 +56,7 @@ public class Checklist extends DomainObject {
     @JoinTable(
         name = "checklist_checklist_question",
         joinColumns = @JoinColumn(name = "checklist_id", referencedColumnName = "id"),
-        inverseJoinColumns = @JoinColumn(
+        inverseJoinColumns = @JoinColumn(name = "checklist_question_id", referencedColumnName = "id")
-            name = "checklist_question_id",
-            referencedColumnName = "id"
-        )
     )
     private List<ChecklistQuestion> questions = new ArrayList<>();
 
@@ -67,18 +64,12 @@ public class Checklist extends DomainObject {
     @JoinTable(
         name = "checklist_checklist_category",
         joinColumns = @JoinColumn(name = "checklist_id", referencedColumnName = "id"),
-        inverseJoinColumns = @JoinColumn(
+        inverseJoinColumns = @JoinColumn(name = "checklist_category_id", referencedColumnName = "id")
-            name = "checklist_category_id",
-            referencedColumnName = "id"
-        )
     )
     private List<se.su.dsv.scipro.checklist.ChecklistCategory> categories = new ArrayList<>();
 
     @ElementCollection(fetch = FetchType.EAGER)
-    @CollectionTable(
+    @CollectionTable(name = "checklist_user_last_open_date", joinColumns = @JoinColumn(name = "checklist_id"))
-        name = "checklist_user_last_open_date",
-        joinColumns = @JoinColumn(name = "checklist_id")
-    )
     @Column(name = "last_open_date")
     @SuppressWarnings("JpaDataSourceORMInspection") // false warning from IntelliJ for the @MapKeyJoinColumn
     @MapKeyJoinColumn(name = "user_id")

core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategory.java

@@ -47,13 +47,7 @@ public class ChecklistCategory extends DomainObject {
 
     @Override
     public String toString() {
-        return (
+        return ("ChecklistCategory(id=" + this.getId() + ", categoryName=" + this.getCategoryName() + ")");
-            "ChecklistCategory(id=" +
-            this.getId() +
-            ", categoryName=" +
-            this.getCategoryName() +
-            ")"
-        );
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java

@@ -5,9 +5,7 @@ import jakarta.inject.Provider;
 import jakarta.persistence.EntityManager;
 import se.su.dsv.scipro.system.GenericRepo;
 
-public class ChecklistCategoryRepoImpl
+public class ChecklistCategoryRepoImpl extends GenericRepo<ChecklistCategory, Long> implements ChecklistCategoryRepo {
-    extends GenericRepo<ChecklistCategory, Long>
-    implements ChecklistCategoryRepo {
 
     @Inject
     public ChecklistCategoryRepoImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java

@@ -5,9 +5,7 @@ import jakarta.inject.Provider;
 import jakarta.persistence.EntityManager;
 import se.su.dsv.scipro.system.GenericRepo;
 
-public class ChecklistQuestionRepoImpl
+public class ChecklistQuestionRepoImpl extends GenericRepo<ChecklistQuestion, Long> implements ChecklistQuestionRepo {
-    extends GenericRepo<ChecklistQuestion, Long>
-    implements ChecklistQuestionRepo {
 
     @Inject
     public ChecklistQuestionRepoImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java

@@ -11,9 +11,7 @@ import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.User;
 
-public class ChecklistServiceImpl
+public class ChecklistServiceImpl extends AbstractServiceImpl<Checklist, Long> implements ChecklistService {
-    extends AbstractServiceImpl<Checklist, Long>
-    implements ChecklistService {
 
     @Inject
     public ChecklistServiceImpl(Provider<EntityManager> em) {
@@ -27,10 +25,7 @@ public class ChecklistServiceImpl
             .join(QActivityPlan.activityPlan.activities, QActivity.activity)
             .join(QActivity.activity.checklist.questions, QChecklistQuestion.checklistQuestion)
             .join(QChecklistQuestion.checklistQuestion.answers, QChecklistAnswer.checklistAnswer)
-            .where(
+            .where(QActivityPlan.activityPlan.project.eq(project), QChecklistAnswer.checklistAnswer.answer.eq(answer))
-                QActivityPlan.activityPlan.project.eq(project),
-                QChecklistAnswer.checklistAnswer.answer.eq(answer)
-            )
             .fetchFirst();
     }
 

core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplate.java

@@ -46,10 +46,7 @@ public class ChecklistTemplate extends DomainObject {
     private int templateNumber = DEFAULT_TEMPLATE_NUMBER;
 
     @ElementCollection
-    @CollectionTable(
+    @CollectionTable(name = "checklist_template_question", joinColumns = @JoinColumn(name = "checklist_template_id"))
-        name = "checklist_template_question",
-        joinColumns = @JoinColumn(name = "checklist_template_id")
-    )
     @Column(name = "question")
     private List<String> questions = new ArrayList<>(1);
 
@@ -61,10 +58,7 @@ public class ChecklistTemplate extends DomainObject {
     @JoinTable(
         name = "checklist_template_checklist_category",
         joinColumns = @JoinColumn(name = "checklist_template_id", referencedColumnName = "id"),
-        inverseJoinColumns = @JoinColumn(
+        inverseJoinColumns = @JoinColumn(name = "checklist_category_id", referencedColumnName = "id")
-            name = "checklist_category_id",
-            referencedColumnName = "id"
-        )
     )
     private List<ChecklistCategory> categories = new ArrayList<>();
 

core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateService.java

@@ -6,8 +6,7 @@ import se.su.dsv.scipro.system.FilteredService;
 import se.su.dsv.scipro.system.GenericService;
 
 public interface ChecklistTemplateService
-    extends
+    extends GenericService<ChecklistTemplate, Long>, FilteredService<ChecklistTemplate, Long, String> {
-        GenericService<ChecklistTemplate, Long>, FilteredService<ChecklistTemplate, Long, String> {
     void upChecklistTemplate(ChecklistTemplate checklistTemplate);
     void downChecklistTemplate(ChecklistTemplate checklistTemplate);
     void safeDeleteChecklistTemplate(ChecklistTemplate checklistTemplate);

core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java

@@ -26,27 +26,20 @@ public class ChecklistTemplateServiceImpl
     @Override
     public List<ChecklistTemplate> findAll(String filterString, Pageable pageable) {
         String filter = filterString == null ? "" : filterString;
-        return findAll(
+        return findAll(filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter)), pageable);
-            filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter)),
-            pageable
-        );
     }
 
     @Override
     public long count(String filterString) {
         String filter = filterString == null ? "" : filterString;
-        return count(
+        return count(filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter)));
-            filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter))
-        );
     }
 
     @Transactional
     @Override
     public void upChecklistTemplate(ChecklistTemplate checklistTemplate) {
         if (findByTemplateNumber(checklistTemplate.getTemplateNumber() + 1) != null) {
-            ChecklistTemplate downChecklistTemplate = findByTemplateNumber(
+            ChecklistTemplate downChecklistTemplate = findByTemplateNumber(checklistTemplate.getTemplateNumber() + 1);
-                checklistTemplate.getTemplateNumber() + 1
-            );
             downChecklistTemplate.setTemplateNumber(checklistTemplate.getTemplateNumber());
             checklistTemplate.setTemplateNumber(checklistTemplate.getTemplateNumber() + 1);
             save(downChecklistTemplate);
@@ -62,9 +55,7 @@ public class ChecklistTemplateServiceImpl
     @Override
     public void downChecklistTemplate(ChecklistTemplate checklistTemplate) {
         if (findByTemplateNumber(checklistTemplate.getTemplateNumber() - 1) != null) {
-            ChecklistTemplate upChecklistTemplate = findByTemplateNumber(
+            ChecklistTemplate upChecklistTemplate = findByTemplateNumber(checklistTemplate.getTemplateNumber() - 1);
-                checklistTemplate.getTemplateNumber() - 1
-            );
             upChecklistTemplate.setTemplateNumber(checklistTemplate.getTemplateNumber());
             checklistTemplate.setTemplateNumber(checklistTemplate.getTemplateNumber() - 1);
             save(upChecklistTemplate);
@@ -76,9 +67,7 @@ public class ChecklistTemplateServiceImpl
     @Override
     public void safeDeleteChecklistTemplate(ChecklistTemplate checklistTemplate) {
         for (ChecklistTemplate clt : findAll(
-            QChecklistTemplate.checklistTemplate.templateNumber.gt(
+            QChecklistTemplate.checklistTemplate.templateNumber.gt(checklistTemplate.getTemplateNumber())
-                checklistTemplate.getTemplateNumber()
-            )
         )) {
             clt.setTemplateNumber(clt.getTemplateNumber() - 1);
         }
@@ -89,9 +78,7 @@ public class ChecklistTemplateServiceImpl
     public List<ChecklistTemplate> findPeerRequestChecklists(final Project project) {
         return findAll(
             allOf(
-                QChecklistTemplate.checklistTemplate.projectTypes
+                QChecklistTemplate.checklistTemplate.projectTypes.any().eq(project.getProjectType()),
-                    .any()
-                    .eq(project.getProjectType()),
                 QChecklistTemplate.checklistTemplate.categories.any().categoryName.eq(PEER)
             )
         );
@@ -99,9 +86,7 @@ public class ChecklistTemplateServiceImpl
 
     @Override
     public List<ChecklistTemplate> findByProject(Project project) {
-        return findAll(
+        return findAll(QChecklistTemplate.checklistTemplate.projectTypes.any().eq(project.getProjectType()));
-            QChecklistTemplate.checklistTemplate.projectTypes.any().eq(project.getProjectType())
-        );
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java

@@ -73,11 +73,7 @@ public interface DaisyAPI {
 
     PublishingConsent getPublishingConsent(int projectId, int personId);
 
-    boolean setPublishingConsent(
+    boolean setPublishingConsent(int projectId, int personId, PublishingConsentLevel publishingConsentLevel);
-        int projectId,
-        int personId,
-        PublishingConsentLevel publishingConsentLevel
-    );
 
     List<ResearchSubject> getNationalResearchSubjects(int organisationId);
 }

core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java

@@ -48,8 +48,7 @@ public class DaisyAPIImpl implements DaisyAPI {
         @Named("daisy.api.password") final String password
     ) {
         this.baseUrl = baseUrl;
-        this.client = ClientBuilder.newClient()
+        this.client = ClientBuilder.newClient().register(HttpAuthenticationFeature.basic(user, password));
-            .register(HttpAuthenticationFeature.basic(user, password));
         this.objectFactory = new ObjectFactory();
     }
 
@@ -122,9 +121,7 @@ public class DaisyAPIImpl implements DaisyAPI {
             .path(String.valueOf(id))
             .request(MediaType.APPLICATION_XML_TYPE)
             .get(Response.class);
-        return response.getStatus() == 200
+        return response.getStatus() == 200 ? Optional.of(response.readEntity(Person.class)) : Optional.empty();
-            ? Optional.of(response.readEntity(Person.class))
-            : Optional.empty();
     }
 
     @Override
@@ -134,9 +131,7 @@ public class DaisyAPIImpl implements DaisyAPI {
             .path(userName)
             .request(MediaType.APPLICATION_XML_TYPE)
             .get(Response.class);
-        return response.getStatus() == 200
+        return response.getStatus() == 200 ? Optional.of(response.readEntity(Person.class)) : Optional.empty();
-            ? Optional.of(response.readEntity(Person.class))
-            : Optional.empty();
     }
 
     @Override
@@ -174,10 +169,7 @@ public class DaisyAPIImpl implements DaisyAPI {
 
     @Override
     public Response deleteProject(Integer projectId) {
-        return thesis()
+        return thesis().path(String.valueOf(projectId)).request(MediaType.APPLICATION_XML_TYPE).delete();
-            .path(String.valueOf(projectId))
-            .request(MediaType.APPLICATION_XML_TYPE)
-            .delete();
     }
 
     @Override
@@ -187,10 +179,7 @@ public class DaisyAPIImpl implements DaisyAPI {
 
     @Override
     public Program getProgram(Integer id) {
-        return program()
+        return program().path(String.valueOf(id)).request(MediaType.APPLICATION_XML_TYPE).get(Program.class);
-            .path(String.valueOf(id))
-            .request(MediaType.APPLICATION_XML_TYPE)
-            .get(Program.class);
     }
 
     @Override
@@ -199,9 +188,7 @@ public class DaisyAPIImpl implements DaisyAPI {
             .path(String.valueOf(projectIdentifier))
             .request(MediaType.APPLICATION_XML_TYPE)
             .get(Response.class);
-        return response.getStatus() == 200
+        return response.getStatus() == 200 ? Optional.of(response.readEntity(Thesis.class)) : Optional.empty();
-            ? Optional.of(response.readEntity(Thesis.class))
-            : Optional.empty();
     }
 
     @Override
@@ -217,9 +204,7 @@ public class DaisyAPIImpl implements DaisyAPI {
             .path(String.valueOf(authorId))
             .request(MediaType.APPLICATION_XML_TYPE)
             .get();
-        return response.getStatus() == 200
+        return response.getStatus() == 200 ? Optional.ofNullable(response.readEntity(String.class)) : Optional.empty();
-            ? Optional.ofNullable(response.readEntity(String.class))
-            : Optional.empty();
     }
 
     @Override
@@ -231,11 +216,7 @@ public class DaisyAPIImpl implements DaisyAPI {
     }
 
     @Override
-    public PhotoResult getPhoto(
+    public PhotoResult getPhoto(final Integer personId, final int requesterId, final boolean alwaysShow) {
-        final Integer personId,
-        final int requesterId,
-        final boolean alwaysShow
-    ) {
         final Response response;
         try {
             response = person()
@@ -292,11 +273,7 @@ public class DaisyAPIImpl implements DaisyAPI {
     }
 
     @Override
-    public boolean sendPublicationFile(
+    public boolean sendPublicationFile(final long projectId, final String filename, final InputStream data) {
-        final long projectId,
-        final String filename,
-        final InputStream data
-    ) {
         final String asciiOnlyFilename = asciify(filename);
         final Response response = thesis()
             .path(Long.toString(projectId))
@@ -328,10 +305,7 @@ public class DaisyAPIImpl implements DaisyAPI {
     }
 
     @Override
-    public List<ProgramAdmission> getProgramAdmissions(
+    public List<ProgramAdmission> getProgramAdmissions(final Program program, final Semester admissionSemester) {
-        final Program program,
-        final Semester admissionSemester
-    ) {
         return program()
             .path(String.valueOf(program.getId()))
             .path("admissions")
@@ -410,11 +384,7 @@ public class DaisyAPIImpl implements DaisyAPI {
     }
 
     @Override
-    public boolean setPublishingConsent(
+    public boolean setPublishingConsent(int projectId, int personId, PublishingConsentLevel publishingConsentLevel) {
-        int projectId,
-        int personId,
-        PublishingConsentLevel publishingConsentLevel
-    ) {
         final Invocation.Builder request = thesis()
             .path(Integer.toString(projectId))
             .path("author")

core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java

@@ -29,22 +29,12 @@ public class MailFacade implements Serializable {
     @Inject
     private GeneralSystemSettingsService generalSystemSettingsService;
 
-    private Set<Recipient> addProjectAuthors(
+    private Set<Recipient> addProjectAuthors(ProjectStatus ps, Set<ProjectType> pc, Date startDate, Date endDate) {
-        ProjectStatus ps,
-        Set<ProjectType> pc,
-        Date startDate,
-        Date endDate
-    ) {
         final ProjectService.Filter filter = setProjectParams(ps, pc, startDate, endDate);
         return authorsFromProjects(filter);
     }
 
-    private Set<Recipient> addProjectSupervisors(
+    private Set<Recipient> addProjectSupervisors(ProjectStatus ps, Set<ProjectType> pc, Date startDate, Date endDate) {
-        ProjectStatus ps,
-        Set<ProjectType> pc,
-        Date startDate,
-        Date endDate
-    ) {
         final ProjectService.Filter filter = setProjectParams(ps, pc, startDate, endDate);
         return supervisorsFromProjects(filter);
     }
@@ -59,12 +49,7 @@ public class MailFacade implements Serializable {
         return coSupervisorsFromProjects(filter);
     }
 
-    private Set<Recipient> addProjectReviewers(
+    private Set<Recipient> addProjectReviewers(ProjectStatus ps, Set<ProjectType> pc, Date startDate, Date endDate) {
-        ProjectStatus ps,
-        Set<ProjectType> pc,
-        Date startDate,
-        Date endDate
-    ) {
         final ProjectService.Filter filter = setProjectParams(ps, pc, startDate, endDate);
         return reviewersFromProjects(filter);
     }
@@ -148,12 +133,7 @@ public class MailFacade implements Serializable {
         }
     }
 
-    public Set<Recipient> getRecipients(
+    public Set<Recipient> getRecipients(MailChoice choice, Set<ProjectType> pc, Date startDate, Date endDate) {
-        MailChoice choice,
-        Set<ProjectType> pc,
-        Date startDate,
-        Date endDate
-    ) {
         switch (choice) {
             case THESIS_SUPPORT:
                 return addThesisSupport();
@@ -167,15 +147,9 @@ public class MailFacade implements Serializable {
                 return addProjectReviewers(ProjectStatus.ACTIVE, pc, startDate, endDate);
             case ALL_FOLLOWERS:
                 Set<Recipient> allFollowers = new HashSet<>();
-                allFollowers.addAll(
+                allFollowers.addAll(addProjectSupervisors(ProjectStatus.ACTIVE, pc, startDate, endDate));
-                    addProjectSupervisors(ProjectStatus.ACTIVE, pc, startDate, endDate)
+                allFollowers.addAll(addProjectReviewers(ProjectStatus.ACTIVE, pc, startDate, endDate));
-                );
+                allFollowers.addAll(addProjectCoSupervisors(ProjectStatus.ACTIVE, pc, startDate, endDate));
-                allFollowers.addAll(
-                    addProjectReviewers(ProjectStatus.ACTIVE, pc, startDate, endDate)
-                );
-                allFollowers.addAll(
-                    addProjectCoSupervisors(ProjectStatus.ACTIVE, pc, startDate, endDate)
-                );
                 return allFollowers;
             case AUTHORS_MATCHED_IDEA:
                 IdeaService.Filter matchedFilter = setIdeaParams(

core/src/main/java/se/su/dsv/scipro/file/FileDescription.java

@@ -171,9 +171,7 @@ public class FileDescription extends DomainObject {
     }
 
     private String getSubdirectory() {
-        return Long.toString(
+        return Long.toString((id / FILES_PER_SUBDIRECTORY) * FILES_PER_SUBDIRECTORY + FILES_PER_SUBDIRECTORY);
-            (id / FILES_PER_SUBDIRECTORY) * FILES_PER_SUBDIRECTORY + FILES_PER_SUBDIRECTORY
-        );
     }
 
     public boolean isDataAvailable() {

core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java

@@ -5,9 +5,7 @@ import jakarta.inject.Provider;
 import jakarta.persistence.EntityManager;
 import se.su.dsv.scipro.system.GenericRepo;
 
-public class FileDescriptionRepoImpl
+public class FileDescriptionRepoImpl extends GenericRepo<FileDescription, Long> implements FileDescriptionRepo {
-    extends GenericRepo<FileDescription, Long>
-    implements FileDescriptionRepo {
 
     @Inject
     public FileDescriptionRepoImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java

@@ -6,9 +6,7 @@ import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import se.su.dsv.scipro.system.AbstractRepository;
 
-public class FileReferenceRepositoryImpl
+public class FileReferenceRepositoryImpl extends AbstractRepository implements FileReferenceRepository {
-    extends AbstractRepository
-    implements FileReferenceRepository {
 
     @Inject
     public FileReferenceRepositoryImpl(final Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java

@@ -7,9 +7,7 @@ import jakarta.transaction.Transactional;
 import java.io.InputStream;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 
-public class FileServiceImpl
+public class FileServiceImpl extends AbstractServiceImpl<FileDescription, Long> implements FileService {
-    extends AbstractServiceImpl<FileDescription, Long>
-    implements FileService {
 
     private final FileReferenceRepository fileReferenceRepository;
     private final FileDescriptionRepo fileDescriptionRepository;

core/src/main/java/se/su/dsv/scipro/file/ProjectFile.java

@@ -99,12 +99,7 @@ public class ProjectFile extends DomainObject {
 
     @Override
     public int hashCode() {
-        return Objects.hash(
+        return Objects.hash(this.getId(), this.getProject(), this.getFileSource(), this.getFileDescription());
-            this.getId(),
-            this.getProject(),
-            this.getFileSource(),
-            this.getFileDescription()
-        );
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java

@@ -10,9 +10,7 @@ import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.Pageable;
 
-public class ProjectFileRepositoryImpl
+public class ProjectFileRepositoryImpl extends AbstractServiceImpl<ProjectFile, Long> implements ProjectFileRepository {
-    extends AbstractServiceImpl<ProjectFile, Long>
-    implements ProjectFileRepository {
 
     @Inject
     public ProjectFileRepositoryImpl(final Provider<EntityManager> em) {
@@ -39,10 +37,7 @@ public class ProjectFileRepositoryImpl
     }
 
     @Override
-    public Optional<ProjectFile> findProjectFile(
+    public Optional<ProjectFile> findProjectFile(final FileDescription fileDescription, final Project project) {
-        final FileDescription fileDescription,
-        final Project project
-    ) {
         return Optional.ofNullable(
             findOne(
                 Expressions.allOf(

core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java

@@ -12,20 +12,14 @@ public class ProjectFileServiceImpl implements ProjectFileService {
     private final ProjectFileRepository projectFileRepository;
 
     @Inject
-    public ProjectFileServiceImpl(
+    public ProjectFileServiceImpl(final FileService fileService, final ProjectFileRepository projectFileRepository) {
-        final FileService fileService,
-        final ProjectFileRepository projectFileRepository
-    ) {
         this.fileService = fileService;
         this.projectFileRepository = projectFileRepository;
     }
 
     @Override
     @Transactional
-    public ProjectFile store(
+    public ProjectFile store(final ProjectFileUpload projectFileUpload, final FileSource fileSource) {
-        final ProjectFileUpload projectFileUpload,
-        final FileSource fileSource
-    ) {
         final FileReference fileDescription = fileService.storeFile(projectFileUpload);
         return createProjectFile(fileDescription, projectFileUpload.getProject(), fileSource);
     }
@@ -37,10 +31,7 @@ public class ProjectFileServiceImpl implements ProjectFileService {
         final Project project,
         final FileSource fileSource
     ) {
-        Optional<ProjectFile> existing = projectFileRepository.findProjectFile(
+        Optional<ProjectFile> existing = projectFileRepository.findProjectFile(fileDescription, project);
-            fileDescription,
-            project
-        );
         if (existing.isPresent()) {
             return existing.get();
         }
@@ -48,11 +39,7 @@ public class ProjectFileServiceImpl implements ProjectFileService {
         return createProjectFile(reference, project, fileSource);
     }
 
-    private ProjectFile createProjectFile(
+    private ProjectFile createProjectFile(FileReference reference, Project project, FileSource fileSource) {
-        FileReference reference,
-        Project project,
-        FileSource fileSource
-    ) {
         final ProjectFile projectFile = new ProjectFile();
         projectFile.setFileReference(reference);
         projectFile.setFileSource(fileSource);

core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java

@@ -23,9 +23,7 @@ public class AuthorRepositoryImpl extends AbstractRepository implements AuthorRe
     @Override
     public Optional<Author> findByProjectAndUser(Project project, User user) {
         final QAuthor author = QAuthor.author;
-        final Author author1 = from(author)
+        final Author author1 = from(author).where(author.project.eq(project), author.user.eq(user)).fetchOne();
-            .where(author.project.eq(project), author.user.eq(user))
-            .fetchOne();
         return Optional.ofNullable(author1);
     }
 

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java

@@ -241,9 +241,7 @@ public class FinalSeminar extends LazyDeletableDomainObject {
         return Collections.unmodifiableSet(activeParticipations);
     }
 
-    public void setActiveParticipations(
+    public void setActiveParticipations(Collection<FinalSeminarActiveParticipation> activeParticipations) {
-        Collection<FinalSeminarActiveParticipation> activeParticipations
-    ) {
         this.activeParticipations.clear();
         this.activeParticipations.addAll(activeParticipations);
     }
@@ -273,9 +271,7 @@ public class FinalSeminar extends LazyDeletableDomainObject {
         if (o == this) return true;
         if (!(o instanceof FinalSeminar)) return false;
         final FinalSeminar other = (FinalSeminar) o;
-        return (
+        return (other.canEqual(this) && super.equals(o) && Objects.equals(this.getId(), other.getId()));
-            other.canEqual(this) && super.equals(o) && Objects.equals(this.getId(), other.getId())
-        );
     }
 
     @Override
@@ -371,9 +367,7 @@ public class FinalSeminar extends LazyDeletableDomainObject {
         return getNotGradedParticipations(respondents);
     }
 
-    private Collection<User> getNotGradedParticipations(
+    private Collection<User> getNotGradedParticipations(Set<? extends FinalSeminarParticipation> participations) {
-        Set<? extends FinalSeminarParticipation> participations
-    ) {
         List<User> result = new ArrayList<>();
         for (FinalSeminarParticipation participation : participations) {
             if (participation.getGrade() == null) {

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipation.java

@@ -40,9 +40,7 @@ public class FinalSeminarActiveParticipation extends FinalSeminarParticipation {
         if (o == this) return true;
         if (!(o instanceof FinalSeminarActiveParticipation)) return false;
         final FinalSeminarActiveParticipation other = (FinalSeminarActiveParticipation) o;
-        return (
+        return (other.canEqual(this) && super.equals(o) && Objects.equals(this.project, other.project));
-            other.canEqual(this) && super.equals(o) && Objects.equals(this.project, other.project)
-        );
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepository.java

@@ -5,8 +5,5 @@ import se.su.dsv.scipro.system.ProjectType;
 import se.su.dsv.scipro.system.User;
 
 public interface FinalSeminarActiveParticipationRepository {
-    List<FinalSeminarActiveParticipation> findByParticipatingUserAndLevel(
+    List<FinalSeminarActiveParticipation> findByParticipatingUserAndLevel(User user, ProjectType projectType);
-        User user,
-        ProjectType projectType
-    );
 }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java

@@ -18,17 +18,10 @@ public class FinalSeminarActiveParticipationRepositoryImpl
     }
 
     @Override
-    public List<FinalSeminarActiveParticipation> findByParticipatingUserAndLevel(
+    public List<FinalSeminarActiveParticipation> findByParticipatingUserAndLevel(User user, ProjectType projectType) {
-        User user,
-        ProjectType projectType
-    ) {
         return from(QFinalSeminarActiveParticipation.finalSeminarActiveParticipation)
             .where(QFinalSeminarActiveParticipation.finalSeminarActiveParticipation.user.eq(user))
-            .where(
+            .where(QFinalSeminarActiveParticipation.finalSeminarActiveParticipation.project.projectType.eq(projectType))
-                QFinalSeminarActiveParticipation.finalSeminarActiveParticipation.project.projectType.eq(
-                    projectType
-                )
-            )
             .fetch();
     }
 }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationService.java

@@ -3,7 +3,6 @@ package se.su.dsv.scipro.finalseminar;
 import se.su.dsv.scipro.system.GenericService;
 import se.su.dsv.scipro.system.User;
 
-public interface FinalSeminarActiveParticipationService
+public interface FinalSeminarActiveParticipationService extends GenericService<FinalSeminarActiveParticipation, Long> {
-    extends GenericService<FinalSeminarActiveParticipation, Long> {
     FinalSeminarActiveParticipation findByFinalSeminarUser(FinalSeminar finalSeminar, User user);
 }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java

@@ -20,10 +20,7 @@ public class FinalSeminarActiveParticipationServiceImpl
     }
 
     @Override
-    public FinalSeminarActiveParticipation findByFinalSeminarUser(
+    public FinalSeminarActiveParticipation findByFinalSeminarUser(FinalSeminar finalSeminar, User user) {
-        FinalSeminar finalSeminar,
-        User user
-    ) {
         for (FinalSeminarActiveParticipation fsap : finalSeminar.getActiveParticipations()) {
             if (fsap.getUser().equals(user)) {
                 return fsap;

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java

@@ -57,15 +57,10 @@ public class FinalSeminarCreationSubscribers {
         );
     }
 
-    private List<User> getSubscribersStillNeedingOppositionOrParticipation(
+    private List<User> getSubscribersStillNeedingOppositionOrParticipation(List<Author> subscribers) {
-        List<Author> subscribers
-    ) {
         return subscribers
             .stream()
-            .filter(
+            .filter(subscriber -> onlyFailedOppositions(subscriber) || onlyFailedParticipations(subscriber))
-                subscriber ->
-                    onlyFailedOppositions(subscriber) || onlyFailedParticipations(subscriber)
-            )
             .map(Author::getUser)
             .toList();
     }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarMovedEvent.java

@@ -2,8 +2,4 @@ package se.su.dsv.scipro.finalseminar;
 
 import java.time.LocalDateTime;
 
-public record FinalSeminarMovedEvent(
+public record FinalSeminarMovedEvent(FinalSeminar finalSeminar, LocalDateTime from, LocalDateTime to) {}
-    FinalSeminar finalSeminar,
-    LocalDateTime from,
-    LocalDateTime to
-) {}

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOpposition.java

@@ -46,12 +46,7 @@ public class FinalSeminarOpposition extends FinalSeminarParticipation {
     // ----------------------------------------------------------------------------------
     // JPA-mappings of other tables referencing to this table (final_seminar_opposition)
     // ----------------------------------------------------------------------------------
-    @OneToOne(
+    @OneToOne(optional = true, orphanRemoval = true, cascade = CascadeType.ALL, mappedBy = "finalSeminarOpposition")
-        optional = true,
-        orphanRemoval = true,
-        cascade = CascadeType.ALL,
-        mappedBy = "finalSeminarOpposition"
-    )
     private OppositionReport oppositionReport;
 
     // ----------------------------------------------------------------------------------
@@ -105,11 +100,7 @@ public class FinalSeminarOpposition extends FinalSeminarParticipation {
         if (o == this) return true;
         if (!(o instanceof FinalSeminarOpposition)) return false;
         final FinalSeminarOpposition other = (FinalSeminarOpposition) o;
-        return (
+        return (other.canEqual(this) && super.equals(o) && Objects.equals(this.getProject(), other.getProject()));
-            other.canEqual(this) &&
-            super.equals(o) &&
-            Objects.equals(this.getProject(), other.getProject())
-        );
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepo.java

@@ -9,8 +9,6 @@ import se.su.dsv.scipro.system.User;
 
 @Transactional
 public interface FinalSeminarOppositionRepo
-    extends
+    extends JpaRepository<FinalSeminarOpposition, Long>, QueryDslPredicateExecutor<FinalSeminarOpposition> {
-        JpaRepository<FinalSeminarOpposition, Long>,
-        QueryDslPredicateExecutor<FinalSeminarOpposition> {
     List<FinalSeminarOpposition> findByOpposingUserAndType(User user, ProjectType projectType);
 }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java

@@ -18,15 +18,10 @@ public class FinalSeminarOppositionRepoImpl
     }
 
     @Override
-    public List<FinalSeminarOpposition> findByOpposingUserAndType(
+    public List<FinalSeminarOpposition> findByOpposingUserAndType(User user, ProjectType projectType) {
-        User user,
-        ProjectType projectType
-    ) {
         return createQuery()
             .where(QFinalSeminarOpposition.finalSeminarOpposition.user.eq(user))
-            .where(
+            .where(QFinalSeminarOpposition.finalSeminarOpposition.project.projectType.eq(projectType))
-                QFinalSeminarOpposition.finalSeminarOpposition.project.projectType.eq(projectType)
-            )
             .fetch();
     }
 }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionService.java

@@ -2,8 +2,7 @@ package se.su.dsv.scipro.finalseminar;
 
 import se.su.dsv.scipro.system.GenericService;
 
-public interface FinalSeminarOppositionService
+public interface FinalSeminarOppositionService extends GenericService<FinalSeminarOpposition, Long> {
-    extends GenericService<FinalSeminarOpposition, Long> {
     @Override
     void delete(Long aLong);
 }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java

@@ -6,9 +6,7 @@ import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import se.su.dsv.scipro.system.AbstractRepository;
 
-public class FinalSeminarRepositoryImpl
+public class FinalSeminarRepositoryImpl extends AbstractRepository implements FinalSeminarRepository {
-    extends AbstractRepository
-    implements FinalSeminarRepository {
 
     @Inject
     public FinalSeminarRepositoryImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentService.java

@@ -3,7 +3,6 @@ package se.su.dsv.scipro.finalseminar;
 import java.util.List;
 import se.su.dsv.scipro.system.GenericService;
 
-public interface FinalSeminarRespondentService
+public interface FinalSeminarRespondentService extends GenericService<FinalSeminarRespondent, Long> {
-    extends GenericService<FinalSeminarRespondent, Long> {
     List<FinalSeminarRespondent> findOrCreate(FinalSeminar finalSeminar);
 }

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarScheduling.java

@@ -6,11 +6,7 @@ import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.util.Either;
 
 public interface FinalSeminarScheduling {
-    Either<SchedulingError, FinalSeminar> schedule(
+    Either<SchedulingError, FinalSeminar> schedule(Project project, LocalDateTime when, FinalSeminarDetails details);
-        Project project,
-        LocalDateTime when,
-        FinalSeminarDetails details
-    );
 
     LocalDate getEarliestSeminarDate();
 

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarService.java

@@ -20,10 +20,11 @@ public interface FinalSeminarService
         Project project
     );
 
-    Either<
+    Either<ActiveParticipationRegistrationErrorStatus, FinalSeminarActiveParticipation> attemptAddActiveParticipation(
-        ActiveParticipationRegistrationErrorStatus,
+        User student,
-        FinalSeminarActiveParticipation
+        FinalSeminar finalSeminar,
-    > attemptAddActiveParticipation(User student, FinalSeminar finalSeminar, Project project);
+        Project project
+    );
 
     Either<OpposeError, FinalSeminarOpposition> attemptAddOppositionAsSupervisor(
         User student,
@@ -31,20 +32,13 @@ public interface FinalSeminarService
         Project project
     );
 
-    Either<
+    Either<ParticipateError, FinalSeminarActiveParticipation> attemptAddActiveParticipationAsSupervisor(
-        ParticipateError,
-        FinalSeminarActiveParticipation
-    > attemptAddActiveParticipationAsSupervisor(
         User student,
         FinalSeminar finalSeminar,
         Project project
     );
 
-    Either<OppositionRegistrationErrorStatus, Void> canOppose(
+    Either<OppositionRegistrationErrorStatus, Void> canOppose(User Student, FinalSeminar finalSeminar, Project project);
-        User Student,
-        FinalSeminar finalSeminar,
-        Project project
-    );
 
     Either<ActiveParticipationRegistrationErrorStatus, Void> canActiveParticipate(
         User student,
@@ -185,10 +179,7 @@ public interface FinalSeminarService
                 Objects.equals(this.getLazyDeleted(), other.getLazyDeleted()) &&
                 Objects.equals(this.getExempted(), other.getExempted()) &&
                 Objects.equals(this.getOnlyActiveProjects(), other.getOnlyActiveProjects()) &&
-                Objects.equals(
+                Objects.equals(this.getOnlyActiveOrCompletedProjects(), other.getOnlyActiveOrCompletedProjects()) &&
-                    this.getOnlyActiveOrCompletedProjects(),
-                    other.getOnlyActiveOrCompletedProjects()
-                ) &&
                 Objects.equals(this.getHeadSupervisor(), other.getHeadSupervisor()) &&
                 Objects.equals(this.getDegreeType(), other.getDegreeType()) &&
                 Objects.equals(this.onlyNonManualParticipants, other.onlyNonManualParticipants)

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java

@@ -27,9 +27,7 @@ import se.su.dsv.scipro.system.ProjectType;
 import se.su.dsv.scipro.system.User;
 import se.su.dsv.scipro.util.Either;
 
-public class FinalSeminarServiceImpl
+public class FinalSeminarServiceImpl extends AbstractServiceImpl<FinalSeminar, Long> implements FinalSeminarService {
-    extends AbstractServiceImpl<FinalSeminar, Long>
-    implements FinalSeminarService {
 
     @Inject
     FinalSeminarSettingsService finalSeminarSettingsService;
@@ -135,11 +133,7 @@ public class FinalSeminarServiceImpl
         return Either.right(persisted);
     }
 
-    private FinalSeminar setDetails(
+    private FinalSeminar setDetails(FinalSeminar finalSeminar, LocalDateTime when, FinalSeminarDetails details) {
-        FinalSeminar finalSeminar,
-        LocalDateTime when,
-        FinalSeminarDetails details
-    ) {
         Instant instant = when.atZone(clock.getZone()).toInstant();
         finalSeminar.setStartDate(Date.from(instant));
         return updateDetails(finalSeminar, details);
@@ -158,10 +152,7 @@ public class FinalSeminarServiceImpl
         return moveSeminar(finalSeminar, to);
     }
 
-    private Either<MovingError, FinalSeminar> moveSeminar(
+    private Either<MovingError, FinalSeminar> moveSeminar(FinalSeminar finalSeminar, LocalDateTime to) {
-        FinalSeminar finalSeminar,
-        LocalDateTime to
-    ) {
         ZonedDateTime oldTime = finalSeminar.getStartDate().toInstant().atZone(clock.getZone());
         Instant instant = to.atZone(clock.getZone()).toInstant();
         finalSeminar.setStartDate(Date.from(instant));
@@ -173,10 +164,7 @@ public class FinalSeminarServiceImpl
 
     @Override
     @Transactional
-    public FinalSeminar updateDetails(
+    public FinalSeminar updateDetails(FinalSeminar finalSeminar, FinalSeminarDetails finalSeminarDetails) {
-        FinalSeminar finalSeminar,
-        FinalSeminarDetails finalSeminarDetails
-    ) {
         finalSeminar.setRoom(finalSeminarDetails.location());
         finalSeminar.setExtraInfo(finalSeminarDetails.extraInfo());
         finalSeminar.setManualParticipants(finalSeminarDetails.manualParticipants());
@@ -251,19 +239,18 @@ public class FinalSeminarServiceImpl
         if (finalSeminar.getOppositions().size() >= finalSeminar.getMaxOpponents()) {
             return Either.left(new TooManyOpponents());
         }
-        for (FinalSeminarOpposition opposition : finalSeminarOppositionRepository.findByOpposingUserAndType(
+        List<FinalSeminarOpposition> oppositions = finalSeminarOppositionRepository.findByOpposingUserAndType(
             Student,
             project.getProjectType()
-        )) {
+        );
+        for (FinalSeminarOpposition opposition : oppositions) {
             if (opposition.getGrade() == null) {
                 return Either.left(new UngradedOpposition());
             } else if (opposition.getGrade() == FinalSeminarGrade.APPROVED) {
                 return Either.left(new AlreadyOpposed());
             }
         }
-        int oppositionPriorityDays = finalSeminarSettingsService
+        int oppositionPriorityDays = finalSeminarSettingsService.getInstance().getOppositionPriorityDays();
-            .getInstance()
-            .getOppositionPriorityDays();
         final Instant seminarDate = finalSeminar.getDateCreated().toInstant();
         final Instant available = seminarDate.plus(Period.ofDays(oppositionPriorityDays));
         if (available.isAfter(Instant.now()) && findByProject(project) == null) {
@@ -333,11 +320,7 @@ public class FinalSeminarServiceImpl
         }
     }
 
-    private FinalSeminarOpposition createAndSaveOpposition(
+    private FinalSeminarOpposition createAndSaveOpposition(User student, FinalSeminar finalSeminar, Project project) {
-        User student,
-        FinalSeminar finalSeminar,
-        Project project
-    ) {
         FinalSeminarOpposition opposition = new FinalSeminarOpposition();
         opposition.setUser(student);
         opposition.setFinalSeminar(finalSeminar);
@@ -352,11 +335,7 @@ public class FinalSeminarServiceImpl
     public Either<
         ActiveParticipationRegistrationErrorStatus,
         FinalSeminarActiveParticipation
-    > attemptAddActiveParticipation(
+    > attemptAddActiveParticipation(final User student, final FinalSeminar finalSeminar, final Project project) {
-        final User student,
-        final FinalSeminar finalSeminar,
-        final Project project
-    ) {
         return canActiveParticipate(student, finalSeminar).map(allowed ->
             createAndSaveActiveParticipation(student, finalSeminar, project)
         );
@@ -364,10 +343,7 @@ public class FinalSeminarServiceImpl
 
     @Override
     @Transactional
-    public Either<
+    public Either<ParticipateError, FinalSeminarActiveParticipation> attemptAddActiveParticipationAsSupervisor(
-        ParticipateError,
-        FinalSeminarActiveParticipation
-    > attemptAddActiveParticipationAsSupervisor(
         User student,
         FinalSeminar finalSeminar,
         Project project
@@ -455,9 +431,7 @@ public class FinalSeminarServiceImpl
             bb.and(onlyNonManualParticipantsFilter());
         }
         if (params.getDegreeType() != null) {
-            bb.and(
+            bb.and(QFinalSeminar.finalSeminar.project.projectType.degreeType.eq(params.getDegreeType()));
-                QFinalSeminar.finalSeminar.project.projectType.degreeType.eq(params.getDegreeType())
-            );
         }
         if (params.getHeadSupervisor() != null) {
             bb.and(hasHeadSupervisor(params.getHeadSupervisor()));
@@ -478,10 +452,7 @@ public class FinalSeminarServiceImpl
     }
 
     private BooleanExpression onlyActiveOrCompletedProjectsFilter() {
-        return QFinalSeminar.finalSeminar.project.projectStatus.in(
+        return QFinalSeminar.finalSeminar.project.projectStatus.in(ProjectStatus.ACTIVE, ProjectStatus.COMPLETED);
-            ProjectStatus.ACTIVE,
-            ProjectStatus.COMPLETED
-        );
     }
 
     @Override
@@ -507,12 +478,7 @@ public class FinalSeminarServiceImpl
         return project
             .getProjectParticipants()
             .stream()
-            .map(author ->
+            .map(author -> findFinalSeminarOppositionsByOpponentAndProjectType(project.getProjectType(), author))
-                findFinalSeminarOppositionsByOpponentAndProjectType(
-                    project.getProjectType(),
-                    author
-                )
-            )
             .flatMap(List::stream)
             .toList();
     }
@@ -520,10 +486,7 @@ public class FinalSeminarServiceImpl
     @Override
     public boolean hasHadFinalSeminar(Project project) {
         FinalSeminar finalSeminar = findByProject(project);
-        return (
+        return (finalSeminar != null && finalSeminar.getStartDate().toInstant().isBefore(clock.instant()));
-            finalSeminar != null &&
-            finalSeminar.getStartDate().toInstant().isBefore(clock.instant())
-        );
     }
 
     @Override
@@ -573,9 +536,7 @@ public class FinalSeminarServiceImpl
         authorRepository
             .findByProjectAndUser(project, user)
             .ifPresent(author ->
-                author.setSubscribedToFinalSeminarNotifications(
+                author.setSubscribedToFinalSeminarNotifications(!author.isSubscribedToFinalSeminarNotifications())
-                    !author.isSubscribedToFinalSeminarNotifications()
-                )
             );
     }
 
@@ -585,12 +546,7 @@ public class FinalSeminarServiceImpl
             return seminar.oppositions
                 .any()
                 .grade.isNull()
-                .or(
+                .or(seminar.activeParticipations.any().grade.isNull().or(seminar.respondents.any().grade.isNull()));
-                    seminar.activeParticipations
-                        .any()
-                        .grade.isNull()
-                        .or(seminar.respondents.any().grade.isNull())
-                );
         } else {
             return seminar.startDate
                 .between(after, before)

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettings.java

@@ -146,8 +146,7 @@ public class FinalSeminarSettings extends DomainObject {
             super.equals(o) &&
             Objects.equals(this.getId(), other.getId()) &&
             this.getDaysAheadToCreate() == other.getDaysAheadToCreate() &&
-            this.getDaysAheadToRegisterParticipation() ==
+            this.getDaysAheadToRegisterParticipation() == other.getDaysAheadToRegisterParticipation() &&
-            other.getDaysAheadToRegisterParticipation() &&
             this.getDaysAheadToRegisterOpposition() == other.getDaysAheadToRegisterOpposition() &&
             this.getDaysAheadToUploadThesis() == other.getDaysAheadToUploadThesis() &&
             this.isThesisMustBePDF() == other.isThesisMustBePDF() &&

core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java

@@ -14,9 +14,7 @@ import se.su.dsv.scipro.system.User;
 
 public class FinalSeminarUploadControllerImpl implements FinalSeminarUploadController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
+    private static final Logger LOGGER = LoggerFactory.getLogger(FinalSeminarUploadControllerImpl.class);
-        FinalSeminarUploadControllerImpl.class
-    );
 
     private final FileService fileDescriptionService;
     private final FinalSeminarService finalSeminarService;
@@ -57,10 +55,7 @@ public class FinalSeminarUploadControllerImpl implements FinalSeminarUploadContr
 
     @Override
     @Transactional
-    public SeminarDocumentUpload replaceSeminarDocument(
+    public SeminarDocumentUpload replaceSeminarDocument(final FinalSeminar finalSeminar, final FileUpload fileUpload) {
-        final FinalSeminar finalSeminar,
-        final FileUpload fileUpload
-    ) {
         if (finalSeminar.getDocument() != null) {
             // if someone else deletes the document while it is being replaced
             fileDescriptionService.delete(finalSeminar.getDocument());
@@ -94,10 +89,7 @@ public class FinalSeminarUploadControllerImpl implements FinalSeminarUploadContr
         seminar.setDocumentUploadDate(new Date());
 
         seminar = finalSeminarService.save(seminar);
-        plagiarismControl.submit(
+        plagiarismControl.submit(fileReference.getFileDescription(), seminar.getProject().getHeadSupervisor());
-            fileReference.getFileDescription(),
-            seminar.getProject().getHeadSupervisor()
-        );
 
         eventBus.post(new FinalSeminarThesisUploadedEvent(seminar));
     }

core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisService.java

@@ -9,9 +9,7 @@ import se.su.dsv.scipro.system.FilteredService;
 import se.su.dsv.scipro.system.GenericService;
 
 public interface FinalThesisService
-    extends
+    extends GenericService<FinalThesis, Long>, FilteredService<FinalThesis, Long, FinalThesisService.Filter> {
-        GenericService<FinalThesis, Long>,
-        FilteredService<FinalThesis, Long, FinalThesisService.Filter> {
     FinalThesis upload(ProjectFileUpload fileUpload, String englishTitle, String swedishTitle);
 
     boolean hasFinalThesis(Project project);

core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java

@@ -27,9 +27,7 @@ import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.Pageable;
 
 @Named
-public class FinalThesisServiceImpl
+public class FinalThesisServiceImpl extends AbstractServiceImpl<FinalThesis, Long> implements FinalThesisService {
-    extends AbstractServiceImpl<FinalThesis, Long>
-    implements FinalThesisService {
 
     protected final NotificationController notificationController;
     protected final ProjectFileService projectFileService;
@@ -59,15 +57,9 @@ public class FinalThesisServiceImpl
 
     @Override
     @Transactional
-    public FinalThesis upload(
+    public FinalThesis upload(ProjectFileUpload fileUpload, String englishTitle, String swedishTitle) {
-        ProjectFileUpload fileUpload,
-        String englishTitle,
-        String swedishTitle
-    ) {
         ProjectFile fileDescription = storeFinalThesisFile(fileUpload);
-        final FileReference reference = fileService.createReference(
+        final FileReference reference = fileService.createReference(fileDescription.getFileDescription());
-            fileDescription.getFileDescription()
-        );
         FinalThesis finalThesis = new FinalThesis();
         finalThesis.setDocument(reference);
         finalThesis.setProject(fileUpload.getProject());
@@ -93,9 +85,7 @@ public class FinalThesisServiceImpl
 
     @Override
     public FileDescription getFinalThesisFileDescription(Project project) {
-        return hasFinalThesis(project)
+        return hasFinalThesis(project) ? findByProject(project).getDocument().getFileDescription() : null;
-            ? findByProject(project).getDocument().getFileDescription()
-            : null;
     }
 
     @Override
@@ -111,10 +101,7 @@ public class FinalThesisServiceImpl
     private FinalThesis findByProject0(Project project) {
         return from(QFinalThesis.finalThesis)
             .where(QFinalThesis.finalThesis.project.eq(project))
-            .orderBy(
+            .orderBy(QFinalThesis.finalThesis.dateCreated.desc(), QFinalThesis.finalThesis.id.desc())
-                QFinalThesis.finalThesis.dateCreated.desc(),
-                QFinalThesis.finalThesis.id.desc()
-            )
             .fetch()
             .get(0);
     }
@@ -165,10 +152,7 @@ public class FinalThesisServiceImpl
         finalThesis.setEnglishTitle(englishTitle);
         finalThesis.setSwedishTitle(swedishTitle);
         save(finalThesis);
-        plagiarismControl.submit(
+        plagiarismControl.submit(finalThesis.getDocument().getFileDescription(), project.getHeadSupervisor());
-            finalThesis.getDocument().getFileDescription(),
-            project.getHeadSupervisor()
-        );
         eventBus.post(new FinalThesisApprovedEvent(project));
         notificationController.notifyProject(
             project,

core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java

@@ -76,9 +76,7 @@ public class FirstMeetingReminderWorker extends AbstractWorker {
             .filter(idea -> needRemindingToday(idea, today))
             .collect(Collectors.groupingBy(idea -> idea.getMatch().getSupervisor()));
 
-        final String baseURL = generalSystemSettingsService
+        final String baseURL = generalSystemSettingsService.getGeneralSystemSettingsInstance().getSciproURL();
-            .getGeneralSystemSettingsInstance()
-            .getSciproURL();
 
         beginTransaction();
         needReminding
@@ -218,10 +216,7 @@ public class FirstMeetingReminderWorker extends AbstractWorker {
             Scheduler scheduler,
             Provider<FirstMeetingReminderWorker> firstMeetingReminderWorker
         ) {
-            scheduler
+            scheduler.schedule("First meeting reminders").runBy(firstMeetingReminderWorker).dailyAt(11, 30);
-                .schedule("First meeting reminders")
-                .runBy(firstMeetingReminderWorker)
-                .dailyAt(11, 30);
         }
     }
 }

core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java

@@ -18,10 +18,7 @@ public class FirstMeetingServiceImpl
     private final ActivityPlanFacade activityPlanFacade;
 
     @Inject
-    public FirstMeetingServiceImpl(
+    public FirstMeetingServiceImpl(final Provider<EntityManager> em, final ActivityPlanFacade activityPlanFacade) {
-        final Provider<EntityManager> em,
-        final ActivityPlanFacade activityPlanFacade
-    ) {
         super(em, ProjectFirstMeeting.class, QProjectFirstMeeting.projectFirstMeeting);
         this.activityPlanFacade = activityPlanFacade;
     }
@@ -29,9 +26,7 @@ public class FirstMeetingServiceImpl
     @Override
     public Optional<ProjectFirstMeeting> findByProject(final Project project) {
         return Optional.ofNullable(
-            findOne(
+            findOne(QProjectFirstMeeting.projectFirstMeeting.activity.activityPlan.project.eq(project))
-                QProjectFirstMeeting.projectFirstMeeting.activity.activityPlan.project.eq(project)
-            )
         );
     }
 
@@ -44,9 +39,7 @@ public class FirstMeetingServiceImpl
         final String description
     ) {
         final Optional<ProjectFirstMeeting> optFirstMeeting = findByProject(project);
-        final ProjectFirstMeeting firstMeeting = optFirstMeeting.orElseGet(
+        final ProjectFirstMeeting firstMeeting = optFirstMeeting.orElseGet(ProjectFirstMeeting::new);
-            ProjectFirstMeeting::new
-        );
         final Activity activity = optFirstMeeting
             .map(ProjectFirstMeeting::getActivity)
             .orElseGet(() -> createNewActivity(project));
@@ -62,11 +55,7 @@ public class FirstMeetingServiceImpl
         return activity;
     }
 
-    private Activity updateActivity(
+    private Activity updateActivity(final Activity activity, final Date date, final String description) {
-        final Activity activity,
-        final Date date,
-        final String description
-    ) {
         activity.setDate(date);
         activity.setDescription(description);
         return activityPlanFacade.saveActivity(activity);

core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java

@@ -7,9 +7,7 @@ import se.su.dsv.scipro.forum.dataobjects.ForumThread;
 import se.su.dsv.scipro.forum.dataobjects.QForumThread;
 import se.su.dsv.scipro.system.GenericRepo;
 
-public class AbstractThreadRepositoryImpl
+public class AbstractThreadRepositoryImpl extends GenericRepo<ForumThread, Long> implements AbstractThreadRepository {
-    extends GenericRepo<ForumThread, Long>
-    implements AbstractThreadRepository {
 
     @Inject
     public AbstractThreadRepositoryImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/forum/BasicForumService.java

@@ -7,12 +7,7 @@ import se.su.dsv.scipro.forum.dataobjects.ForumThread;
 import se.su.dsv.scipro.system.User;
 
 public interface BasicForumService extends Serializable {
-    ForumPost createReply(
+    ForumPost createReply(ForumThread forumThread, User poster, String content, Set<Attachment> attachments);
-        ForumThread forumThread,
-        User poster,
-        String content,
-        Set<Attachment> attachments
-    );
 
     boolean setRead(User user, ForumPost post, boolean read);
 

core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java

@@ -95,12 +95,7 @@ public class BasicForumServiceImpl implements BasicForumService {
         return state;
     }
 
-    private ForumPost createForumPost(
+    private ForumPost createForumPost(User user, String content, ForumThread forumThread, Set<Attachment> fileUploads) {
-        User user,
-        String content,
-        ForumThread forumThread,
-        Set<Attachment> fileUploads
-    ) {
         final HashSet<FileReference> storedAttachments = fileUploads
             .stream()
             .map(attachment -> attachment.createReference(fileService))

core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepository.java

@@ -11,9 +11,7 @@ import se.su.dsv.scipro.system.User;
 
 @Transactional
 public interface ForumPostReadStateRepository
-    extends
+    extends JpaRepository<ForumPostReadState, ForumPostReadStateId>, QueryDslPredicateExecutor<ForumPostReadState> {
-        JpaRepository<ForumPostReadState, ForumPostReadStateId>,
-        QueryDslPredicateExecutor<ForumPostReadState> {
     ForumPostReadState find(User user, ForumPost post);
 
     void setThreadRead(User user, ForumThread forumThread, boolean read);

core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepository.java

@@ -11,8 +11,7 @@ import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.util.Pair;
 
 @Transactional
-public interface ForumPostRepository
+public interface ForumPostRepository extends JpaRepository<ForumPost, Long>, QueryDslPredicateExecutor<ForumPost> {
-    extends JpaRepository<ForumPost, Long>, QueryDslPredicateExecutor<ForumPost> {
     List<ForumPost> findByThread(ForumThread forumThread);
 
     List<Pair<ProjectThread, ForumPost>> latestPost(Project project, int amount);

core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java

@@ -17,9 +17,7 @@ import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.GenericRepo;
 import se.su.dsv.scipro.util.Pair;
 
-public class ForumPostRepositoryImpl
+public class ForumPostRepositoryImpl extends GenericRepo<ForumPost, Long> implements ForumPostRepository {
-    extends GenericRepo<ForumPost, Long>
-    implements ForumPostRepository {
 
     @Inject
     public ForumPostRepositoryImpl(Provider<EntityManager> em) {
@@ -28,12 +26,7 @@ public class ForumPostRepositoryImpl
 
     @Override
     public List<ForumPost> findByThread(ForumThread forumThread) {
-        return findAll(
+        return findAll(allOf(QForumPost.forumPost.forumThread.eq(forumThread), QForumPost.forumPost.deleted.isFalse()));
-            allOf(
-                QForumPost.forumPost.forumThread.eq(forumThread),
-                QForumPost.forumPost.deleted.isFalse()
-            )
-        );
     }
 
     @Override
@@ -48,9 +41,7 @@ public class ForumPostRepositoryImpl
             .limit(amount)
             .fetch()
             .stream()
-            .map(tuple ->
+            .map(tuple -> new Pair<>(tuple.get(QProjectThread.projectThread), tuple.get(QForumPost.forumPost)))
-                new Pair<>(tuple.get(QProjectThread.projectThread), tuple.get(QForumPost.forumPost))
-            )
             .toList();
     }
 }

core/src/main/java/se/su/dsv/scipro/forum/GroupForumService.java

@@ -9,24 +9,13 @@ import se.su.dsv.scipro.system.User;
 public interface GroupForumService {
     GroupThread findOne(long threadId);
 
-    GroupThread createThread(
+    GroupThread createThread(Group group, User user, String subject, String content, Set<Attachment> fileUploads);
-        Group group,
-        User user,
-        String subject,
-        String content,
-        Set<Attachment> fileUploads
-    );
 
     void markRead(User user, GroupThread groupThread);
 
     List<GroupThread> getThreads(Group group);
 
-    ForumPost createReply(
+    ForumPost createReply(GroupThread groupThread, User poster, String content, Set<Attachment> attachments);
-        GroupThread groupThread,
-        User poster,
-        String content,
-        Set<Attachment> attachments
-    );
 
     List<ForumPost> getPosts(GroupThread groupThread);
 }

core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java

@@ -72,12 +72,7 @@ public class GroupForumServiceImpl implements GroupForumService {
         final String content,
         final Set<Attachment> attachments
     ) {
-        ForumPost reply = basicForumService.createReply(
+        ForumPost reply = basicForumService.createReply(groupThread.getForumThread(), poster, content, attachments);
-            groupThread.getForumThread(),
-            poster,
-            content,
-            attachments
-        );
         eventBus.post(new NewGroupForumReplyEvent(groupThread, reply));
         return reply;
     }

core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java

@@ -9,9 +9,7 @@ import se.su.dsv.scipro.forum.dataobjects.QGroupThread;
 import se.su.dsv.scipro.group.Group;
 import se.su.dsv.scipro.system.GenericRepo;
 
-public class GroupThreadRepositoryImpl
+public class GroupThreadRepositoryImpl extends GenericRepo<GroupThread, Long> implements GroupThreadRepository {
-    extends GenericRepo<GroupThread, Long>
-    implements GroupThreadRepository {
 
     @Inject
     public GroupThreadRepositoryImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java

@@ -8,20 +8,9 @@ import se.su.dsv.scipro.system.User;
 import se.su.dsv.scipro.util.Pair;
 
 public interface ProjectForumService {
-    ProjectThread createThread(
+    ProjectThread createThread(Project project, User user, String subject, String content, Set<Attachment> fileUploads);
-        Project project,
-        User user,
-        String subject,
-        String content,
-        Set<Attachment> fileUploads
-    );
 
-    ForumPost createReply(
+    ForumPost createReply(ProjectThread projectThread, User poster, String content, Set<Attachment> attachments);
-        ProjectThread projectThread,
-        User poster,
-        String content,
-        Set<Attachment> attachments
-    );
 
     void markRead(User user, ProjectThread thread);
 

core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java

@@ -78,12 +78,7 @@ public class ProjectForumServiceImpl implements ProjectForumService {
         final String content,
         final Set<Attachment> attachments
     ) {
-        ForumPost reply = basicForumService.createReply(
+        ForumPost reply = basicForumService.createReply(projectThread.getForumThread(), poster, content, attachments);
-            projectThread.getForumThread(),
-            poster,
-            content,
-            attachments
-        );
         reply
             .getAttachments()
             .forEach(attachment ->

core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java

@@ -9,9 +9,7 @@ import se.su.dsv.scipro.forum.dataobjects.QProjectThread;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.GenericRepo;
 
-public class ProjectThreadRepositoryImpl
+public class ProjectThreadRepositoryImpl extends GenericRepo<ProjectThread, Long> implements ProjectThreadRepository {
-    extends GenericRepo<ProjectThread, Long>
-    implements ProjectThreadRepository {
 
     @Inject
     public ProjectThreadRepositoryImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java

@@ -90,22 +90,14 @@ public class ForumNotifications {
             .map(Notification::getNotificationEvent)
             .distinct()
             .forEach(notificationEvent -> {
-                ForumNotification connection = new ForumNotification(
+                ForumNotification connection = new ForumNotification(event.getMessage(), notificationEvent);
-                    event.getMessage(),
-                    notificationEvent
-                );
                 forumNotificationRepository.save(connection);
             });
     }
 
-    private void sendAndConnect(
+    private void sendAndConnect(ForumPost post, Function<NotificationSource, Set<Notification>> send) {
-        ForumPost post,
-        Function<NotificationSource, Set<Notification>> send
-    ) {
         NotificationSource notificationSource = new NotificationSource();
-        notificationSource.setMessage(
+        notificationSource.setMessage(String.format("Posted by %s\n\n%s", getPostedBy(post), post.getContent()));
-            String.format("Posted by %s\n\n%s", getPostedBy(post), post.getContent())
-        );
         notificationSource.setAdditionalMessage(post.getSubject());
 
         send
@@ -133,11 +125,7 @@ public class ForumNotifications {
         forumNotificationRepository
             .findByForumPost(forumPostReadEvent.post())
             .ifPresent(connection ->
-                notificationService.setRead(
+                notificationService.setRead(forumPostReadEvent.user(), connection.getNotificationEvent(), true)
-                    forumPostReadEvent.user(),
-                    connection.getNotificationEvent(),
-                    true
-                )
             );
     }
 }

core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java

@@ -92,11 +92,7 @@ public class ZipReporter implements Reporter {
 
     @Override
     public Path generate(final User user) throws IOException {
-        final Path zipFile = Files.createTempFile(
+        final Path zipFile = Files.createTempFile(Paths.get(FileDescription.FILE_ROOT), "gdpr-report-", ".zip");
-            Paths.get(FileDescription.FILE_ROOT),
-            "gdpr-report-",
-            ".zip"
-        );
         try (final FileSystem zipFileFS = getZipFileSystem(zipFile)) {
             final List<FileDescription> uploadedFiles = fileDescriptionService.findAll(
                 QFileDescription.fileDescription.uploader.eq(user)
@@ -122,15 +118,7 @@ public class ZipReporter implements Reporter {
                     dt("E-mail"),
                     dd(text(user.getEmailAddress())),
                     dt("Usernames"),
-                    dd(
+                    dd(ul(user.getUsernames().stream().map(username -> li(textL(username.getUsername()))).toList())),
-                        ul(
-                            user
-                                .getUsernames()
-                                .stream()
-                                .map(username -> li(textL(username.getUsername())))
-                                .toList()
-                        )
-                    ),
                     dt("Created"),
                     dd(text(dateString(user.getDateCreated()))),
                     dt("Program admissions"),
@@ -139,18 +127,14 @@ public class ZipReporter implements Reporter {
                             user
                                 .getPrograms()
                                 .stream()
-                                .map(program ->
+                                .map(program -> li(textL(program.getNameEn() + " (" + program.getCode() + ")")))
-                                    li(textL(program.getNameEn() + " (" + program.getCode() + ")"))
-                                )
                                 .toList()
                         )
                     )
                 )
             );
             if (user.getUnit() != null) {
-                personalInformation.addAll(
+                personalInformation.addAll(List.of(dt("Unit"), dd(text(user.getUnit().getTitle()))));
-                    List.of(dt("Unit"), dd(text(user.getUnit().getTitle())))
-                );
             }
             if (!user.getLanguages().isEmpty()) {
                 final String languages = user
@@ -158,9 +142,7 @@ public class ZipReporter implements Reporter {
                     .stream()
                     .map(Language::name)
                     .collect(Collectors.joining(", "));
-                personalInformation.addAll(
+                personalInformation.addAll(List.of(dt("Supervising languages"), dd(text(languages))));
-                    List.of(dt("Supervising languages"), dd(text(languages)))
-                );
             }
             if (!user.getResearchAreas().isEmpty()) {
                 final String researchAreas = user
@@ -172,14 +154,7 @@ public class ZipReporter implements Reporter {
             }
             final List<Html.Node> reportData = new LinkedList<>(
                 Arrays.asList(
-                    h1(
+                    h1(text("GDPR report for " + user.getFullName() + " generated on " + dateString(new Date()))),
-                        text(
-                            "GDPR report for " +
-                            user.getFullName() +
-                            " generated on " +
-                            dateString(new Date())
-                        )
-                    ),
                     h2(text("Personal data")),
                     dl(personalInformation),
                     h2(text("Authorships")),
@@ -344,8 +319,7 @@ public class ZipReporter implements Reporter {
         supervisorshipReport.addAll(reviewerInteraction(user, project));
         supervisorshipReport.addAll(reviewerApprovals(project));
 
-        final List<SupervisorGradingReport> gradingReports =
+        final List<SupervisorGradingReport> gradingReports = gradingReportService.getSupervisorGradingReports(project);
-            gradingReportService.getSupervisorGradingReports(project);
         for (SupervisorGradingReport gradingReport : gradingReports) {
             if (hasAnyAssessment(gradingReport)) {
                 supervisorshipReport.addAll(gradingReportHtml(gradingReport));
@@ -538,13 +512,7 @@ public class ZipReporter implements Reporter {
                             )
                         ),
                         dt("Language"),
-                        dd(
+                        dd(text(Optional.ofNullable(project.getLanguage()).map(Language::name).orElse("None")))
-                            text(
-                                Optional.ofNullable(project.getLanguage())
-                                    .map(Language::name)
-                                    .orElse("None")
-                            )
-                        )
                     )
                 )
             )
@@ -554,19 +522,15 @@ public class ZipReporter implements Reporter {
             children.addAll(finalSeminarReport(finalSeminar));
         }
         final List<FinalSeminarOpposition> oppositions =
-            finalSeminarService.findFinalSeminarOppositionsByOpponentAndProjectType(
+            finalSeminarService.findFinalSeminarOppositionsByOpponentAndProjectType(project.getProjectType(), user);
-                project.getProjectType(),
-                user
-            );
         if (!oppositions.isEmpty()) {
-            List<FinalSeminar> seminars = oppositions
+            List<FinalSeminar> seminars = oppositions.stream().map(FinalSeminarParticipation::getFinalSeminar).toList();
-                .stream()
-                .map(FinalSeminarParticipation::getFinalSeminar)
-                .toList();
             children.addAll(oppositionsReport("Oppositions", seminars));
         }
-        final List<FinalSeminarActiveParticipation> participations =
+        final List<FinalSeminarActiveParticipation> participations = finalSeminarService.findUserParticipating(
-            finalSeminarService.findUserParticipating(project, user);
+            project,
+            user
+        );
         if (!participations.isEmpty()) {
             List<FinalSeminar> seminars = participations
                 .stream()
@@ -574,17 +538,11 @@ public class ZipReporter implements Reporter {
                 .toList();
             children.addAll(oppositionsReport("Active participations", seminars));
         }
-        final List<PeerRequest> peerRequests = peerRequestService.findByRequesterAndProject(
+        final List<PeerRequest> peerRequests = peerRequestService.findByRequesterAndProject(user, project);
-            user,
-            project
-        );
         if (!peerRequests.isEmpty()) {
             children.addAll(peerRequestsReport(peerRequests));
         }
-        final List<PeerReview> peerReviews = peerReviewService.findNonExpiredReviewsByProjectAuthor(
+        final List<PeerReview> peerReviews = peerReviewService.findNonExpiredReviewsByProjectAuthor(user, project);
-            user,
-            project
-        );
         if (!peerReviews.isEmpty()) {
             children.addAll(peerReviewsReport(peerReviews));
         }
@@ -592,18 +550,10 @@ public class ZipReporter implements Reporter {
         return li(children);
     }
 
-    private List<Node> oppositionsReport(
+    private List<Node> oppositionsReport(final String heading, final List<FinalSeminar> oppositions) {
-        final String heading,
-        final List<FinalSeminar> oppositions
-    ) {
         return Arrays.asList(
             h4(text(heading)),
-            ul(
+            ul(oppositions.stream().map(opposition -> li(finalSeminarParticipantReport(opposition))).toList())
-                oppositions
-                    .stream()
-                    .map(opposition -> li(finalSeminarParticipantReport(opposition)))
-                    .toList()
-            )
         );
     }
 
@@ -648,9 +598,7 @@ public class ZipReporter implements Reporter {
 
     private List<Node> peerReviewReport(final PeerReview peerReview) {
         final List<Node> nodes = new LinkedList<>();
-        nodes.addAll(
+        nodes.addAll(Arrays.asList(dt("Started"), dd(text(dateString(peerReview.getDateCreated())))));
-            Arrays.asList(dt("Started"), dd(text(dateString(peerReview.getDateCreated()))))
-        );
         nodes.addAll(Arrays.asList(dt("Status"), dd(text(peerReview.getStatus().name()))));
         if (peerReview.getComment() != null) {
             nodes.addAll(Arrays.asList(dt("Comment"), dd(text(peerReview.getComment()))));
@@ -682,9 +630,7 @@ public class ZipReporter implements Reporter {
                                                     dd(
                                                         text(
                                                             answer.getAnswer().name() +
-                                                            Optional.ofNullable(
+                                                            Optional.ofNullable(answer.getMotivation())
-                                                                answer.getMotivation()
-                                                            )
                                                                 .map(m -> " - " + m)
                                                                 .orElse("")
                                                         )
@@ -706,12 +652,7 @@ public class ZipReporter implements Reporter {
     private List<Node> peerRequestsReport(final List<PeerRequest> peerRequests) {
         return Arrays.asList(
             h4(text("Peer requests")),
-            ul(
+            ul(peerRequests.stream().map(peerRequest -> li(peerRequestReport(peerRequest))).toList())
-                peerRequests
-                    .stream()
-                    .map(peerRequest -> li(peerRequestReport(peerRequest)))
-                    .toList()
-            )
         );
     }
 
@@ -783,8 +724,7 @@ public class ZipReporter implements Reporter {
         return date.toString();
     }
 
-    private void copyFiles(final FileSystem zipFileFS, final List<FileDescription> all)
+    private void copyFiles(final FileSystem zipFileFS, final List<FileDescription> all) throws IOException {
-        throws IOException {
         final Path uploadedFiles = zipFileFS.getPath("Attachments");
         Files.createDirectories(uploadedFiles);
         for (final FileDescription fileDescription : all) {

core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettings.java

@@ -392,16 +392,10 @@ public class GeneralSystemSettings extends DomainObject {
             Objects.equals(this.getReviewerSupportMail(), other.getReviewerSupportMail()) &&
             Objects.equals(this.getThesisSupportMail(), other.getThesisSupportMail()) &&
             Objects.equals(this.getExternalRoomBookingURL(), other.getExternalRoomBookingURL()) &&
-            Objects.equals(
+            Objects.equals(this.getExternalGettingStartedWithIdeaURL(), other.getExternalGettingStartedWithIdeaURL()) &&
-                this.getExternalGettingStartedWithIdeaURL(),
-                other.getExternalGettingStartedWithIdeaURL()
-            ) &&
             Objects.equals(this.getExternalGradingURL(), other.getExternalGradingURL()) &&
             this.isFinalSurveyAvailable() == other.isFinalSurveyAvailable() &&
-            Objects.equals(
+            Objects.equals(this.getActiveProjectIdeaSupportMail(), other.getActiveProjectIdeaSupportMail())
-                this.getActiveProjectIdeaSupportMail(),
-                other.getActiveProjectIdeaSupportMail()
-            )
         );
     }
 

core/src/main/java/se/su/dsv/scipro/grading/GradingBasis.java

@@ -68,13 +68,7 @@ public final class GradingBasis {
 
     @Override
     public int hashCode() {
-        return Objects.hash(
+        return Objects.hash(criteria, overallMotivation, locked, rejectionComment, rejectionCommentFeedback);
-            criteria,
-            overallMotivation,
-            locked,
-            rejectionComment,
-            rejectionCommentFeedback
-        );
     }
 
     @Override
@@ -151,9 +145,7 @@ public final class GradingBasis {
                 .stream()
                 .mapToInt(Requirement::points)
                 .max()
-                .orElseThrow(() ->
+                .orElseThrow(() -> new IllegalStateException("Criterion without requirements: " + title()));
-                    new IllegalStateException("Criterion without requirements: " + title())
-                );
         }
 
         public record Requirement(int points, String description) {}

core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java

@@ -27,28 +27,18 @@ public class GradingHistory
     public List<Event> getTimeline(Project project) {
         ArrayList<Event> events = new ArrayList<>();
 
-        Collection<SubmissionEvent> submissions = gradingHistoryEventRepository.findSubmissions(
+        Collection<SubmissionEvent> submissions = gradingHistoryEventRepository.findSubmissions(project);
-            project
-        );
         for (SubmissionEvent submission : submissions) {
             if (submission.getCorrections() == null || submission.getCorrections().isBlank()) {
-                events.add(
+                events.add(new Event.InitialSubmission(submission.getWhen(), submission.getAuthor()));
-                    new Event.InitialSubmission(submission.getWhen(), submission.getAuthor())
-                );
             } else {
                 events.add(
-                    new Event.Resubmitted(
+                    new Event.Resubmitted(submission.getWhen(), submission.getAuthor(), submission.getCorrections())
-                        submission.getWhen(),
-                        submission.getAuthor(),
-                        submission.getCorrections()
-                    )
                 );
             }
         }
 
-        Collection<RejectionEvent> rejections = gradingHistoryEventRepository.findRejections(
+        Collection<RejectionEvent> rejections = gradingHistoryEventRepository.findRejections(project);
-            project
-        );
         for (RejectionEvent rejection : rejections) {
             events.add(new Event.Rejected(rejection.getWhen(), rejection.getReason()));
         }

core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java

@@ -8,9 +8,7 @@ import java.util.Collection;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractRepository;
 
-public class GradingHistoryEventRepositoryImpl
+public class GradingHistoryEventRepositoryImpl extends AbstractRepository implements GradingHistoryEventRepository {
-    extends AbstractRepository
-    implements GradingHistoryEventRepository {
 
     @Inject
     public GradingHistoryEventRepositoryImpl(Provider<EntityManager> em) {
@@ -25,9 +23,7 @@ public class GradingHistoryEventRepositoryImpl
 
     @Override
     public Collection<RejectionEvent> findRejections(Project project) {
-        return from(QRejectionEvent.rejectionEvent)
+        return from(QRejectionEvent.rejectionEvent).where(QRejectionEvent.rejectionEvent.project.eq(project)).fetch();
-            .where(QRejectionEvent.rejectionEvent.project.eq(project))
-            .fetch();
     }
 
     @Override
@@ -38,9 +34,7 @@ public class GradingHistoryEventRepositoryImpl
 
     @Override
     public Collection<ApprovedEvent> findApprovals(Project project) {
-        return from(QApprovedEvent.approvedEvent)
+        return from(QApprovedEvent.approvedEvent).where(QApprovedEvent.approvedEvent.project.eq(project)).fetch();
-            .where(QApprovedEvent.approvedEvent.project.eq(project))
-            .fetch();
     }
 
     @Override

core/src/main/java/se/su/dsv/scipro/grading/GradingReportTemplateUpdate.java

@@ -20,10 +20,7 @@ public record GradingReportTemplateUpdate(
 
         for (GradeLimit gradeLimit1 : gradeLimits) {
             for (GradeLimit gradeLimit2 : gradeLimits) {
-                if (
+                if (gradeLimit1 != gradeLimit2 && gradeLimit1.minimumPoints() == gradeLimit2.minimumPoints()) {
-                    gradeLimit1 != gradeLimit2 &&
-                    gradeLimit1.minimumPoints() == gradeLimit2.minimumPoints()
-                ) {
                     throw new IllegalArgumentException(
                         "Duplicate minimum points on grades: %s and %s".formatted(
                                 gradeLimit1.grade(),

core/src/main/java/se/su/dsv/scipro/grading/GradingService.java

@@ -11,12 +11,7 @@ public interface GradingService {
      */
     List<Examination> getExaminations(String token, long projectId, long authorId);
 
-    Either<GetGradeError, Optional<Result>> getResult(
+    Either<GetGradeError, Optional<Result>> getResult(String token, long projectId, long authorId, long examinationId);
-        String token,
-        long projectId,
-        long authorId,
-        long examinationId
-    );
 
     Either<ReportGradeError, Void> reportGrade(
         String token,

core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java

@@ -31,11 +31,7 @@ public class GradingServiceImpl implements GradingService {
     }
 
     @Override
-    public List<Examination> getExaminations(
+    public List<Examination> getExaminations(final String token, final long projectId, final long authorId) {
-        final String token,
-        final long projectId,
-        final long authorId
-    ) {
         final WebTarget client = service();
         final Response response = client
             .path("thesis")

core/src/main/java/se/su/dsv/scipro/grading/GradingTypeConverter.java

@@ -10,8 +10,7 @@ import java.io.IOException;
 public class GradingTypeConverter extends JsonDeserializer<Grade.Type> {
 
     @Override
-    public Grade.Type deserialize(final JsonParser p, final DeserializationContext ctxt)
+    public Grade.Type deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
-        throws IOException {
         if (p.currentTokenId() == JsonTokenId.ID_STRING) {
             final String text = p.getText();
             switch (text) {
@@ -22,12 +21,7 @@ public class GradingTypeConverter extends JsonDeserializer<Grade.Type> {
                 case "T":
                     return Grade.Type.CREDITED;
                 default:
-                    throw new InvalidFormatException(
+                    throw new InvalidFormatException(p, "Invalid grade type", text, Grade.Type.class);
-                        p,
-                        "Invalid grade type",
-                        text,
-                        Grade.Type.class
-                    );
             }
         }
         throw new InvalidFormatException(p, "Grade type must be a string", null, Grade.Type.class);

core/src/main/java/se/su/dsv/scipro/grading/Name.java

@@ -2,7 +2,4 @@ package se.su.dsv.scipro.grading;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public record Name(
+public record Name(@JsonProperty("swedish") String swedish, @JsonProperty("english") String english) {}
-    @JsonProperty("swedish") String swedish,
-    @JsonProperty("english") String english
-) {}

core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java

@@ -30,9 +30,7 @@ public class NationalSubjectCategoryRepositoryImpl
 
     @Override
     public Optional<NationalSubjectCategory> findByExternalId(Integer externalId) {
-        NationalSubjectCategory nationalSubjectCategory = from(
+        NationalSubjectCategory nationalSubjectCategory = from(QNationalSubjectCategory.nationalSubjectCategory)
-            QNationalSubjectCategory.nationalSubjectCategory
-        )
             .where(QNationalSubjectCategory.nationalSubjectCategory.externalId.eq(externalId))
             .select(QNationalSubjectCategory.nationalSubjectCategory)
             .fetchOne();

core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java

@@ -9,9 +9,7 @@ public class NationalSubjectCategoryServiceImpl implements NationalSubjectCatego
     private final NationalSubjectCategoryRepository nationalSubjectCategoryRepository;
 
     @Inject
-    public NationalSubjectCategoryServiceImpl(
+    public NationalSubjectCategoryServiceImpl(NationalSubjectCategoryRepository nationalSubjectCategoryRepository) {
-        NationalSubjectCategoryRepository nationalSubjectCategoryRepository
-    ) {
         this.nationalSubjectCategoryRepository = nationalSubjectCategoryRepository;
     }
 

core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java

@@ -7,9 +7,7 @@ import jakarta.transaction.Transactional;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractRepository;
 
-public class PublicationMetadataRepositoryImpl
+public class PublicationMetadataRepositoryImpl extends AbstractRepository implements PublicationMetadataRepository {
-    extends AbstractRepository
-    implements PublicationMetadataRepository {
 
     @Inject
     public PublicationMetadataRepositoryImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataService.java

@@ -7,8 +7,5 @@ public interface PublicationMetadataService {
 
     void save(PublicationMetadata publicationMetadata);
 
-    boolean hasSuppliedPublicationMetadata(
+    boolean hasSuppliedPublicationMetadata(Project project, boolean noNationalSubjectCategoriesAvailable);
-        Project project,
-        boolean noNationalSubjectCategoriesAvailable
-    );
 }

core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java

@@ -10,9 +10,7 @@ public class PublicationMetadataServiceImpl implements PublicationMetadataServic
     private final PublicationMetadataRepository publicationMetadataRepository;
 
     @Inject
-    public PublicationMetadataServiceImpl(
+    public PublicationMetadataServiceImpl(PublicationMetadataRepository publicationMetadataRepository) {
-        PublicationMetadataRepository publicationMetadataRepository
-    ) {
         this.publicationMetadataRepository = publicationMetadataRepository;
     }
 
@@ -34,15 +32,11 @@ public class PublicationMetadataServiceImpl implements PublicationMetadataServic
     }
 
     @Override
-    public boolean hasSuppliedPublicationMetadata(
+    public boolean hasSuppliedPublicationMetadata(Project project, boolean noNationalSubjectCategoriesAvailable) {
-        Project project,
-        boolean noNationalSubjectCategoriesAvailable
-    ) {
         final PublicationMetadata metadata = getByProject(project);
         return (
             notBlank(metadata.getAbstractEnglish()) &&
-            (project.getLanguage() == Language.ENGLISH ||
+            (project.getLanguage() == Language.ENGLISH || notBlank(metadata.getAbstractSwedish())) &&
-                notBlank(metadata.getAbstractSwedish())) &&
             (noNationalSubjectCategoriesAvailable || metadata.getNationalSubjectCategory() != null)
         );
     }

core/src/main/java/se/su/dsv/scipro/group/GroupFacadeImpl.java

@@ -11,10 +11,7 @@ public class GroupFacadeImpl implements GroupFacade {
             return true;
         }
         for (Project project : group.getProjects()) {
-            if (
+            if (project.getHeadSupervisor().equals(user) || project.getCoSupervisors().contains(user)) {
-                project.getHeadSupervisor().equals(user) ||
-                project.getCoSupervisors().contains(user)
-            ) {
                 return true;
             }
         }

core/src/main/java/se/su/dsv/scipro/group/GroupService.java

@@ -8,8 +8,7 @@ import se.su.dsv.scipro.system.FilteredService;
 import se.su.dsv.scipro.system.GenericService;
 import se.su.dsv.scipro.system.User;
 
-public interface GroupService
+public interface GroupService extends GenericService<Group, Long>, FilteredService<Group, Long, GroupService.Filter> {
-    extends GenericService<Group, Long>, FilteredService<Group, Long, GroupService.Filter> {
     List<Group> findAll(final Filter filter);
 
     class Filter implements Serializable {

core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepository.java

@@ -8,7 +8,6 @@ import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 
 @Transactional
 public interface ActivityFinalSeminarRepository
-    extends
+    extends JpaRepository<ActivityFinalSeminar, Long>, QueryDslPredicateExecutor<ActivityFinalSeminar> {
-        JpaRepository<ActivityFinalSeminar, Long>, QueryDslPredicateExecutor<ActivityFinalSeminar> {
     Optional<ActivityFinalSeminar> findByFinalSeminar(FinalSeminar finalSeminar);
 }

core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java

@@ -18,8 +18,6 @@ public class ActivityFinalSeminarRepositoryImpl
 
     @Override
     public Optional<ActivityFinalSeminar> findByFinalSeminar(final FinalSeminar finalSeminar) {
-        return Optional.ofNullable(
+        return Optional.ofNullable(findOne(QActivityFinalSeminar.activityFinalSeminar.finalSeminar.eq(finalSeminar)));
-            findOne(QActivityFinalSeminar.activityFinalSeminar.finalSeminar.eq(finalSeminar))
-        );
     }
 }

core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java

@@ -45,27 +45,18 @@ public class FinalSeminarActivityHandler {
         synchronizeFinalSeminarActivity(finalSeminar, finalSeminar.getStartDate());
     }
 
-    private void synchronizeFinalSeminarActivity(
+    private void synchronizeFinalSeminarActivity(final FinalSeminar finalSeminar, final Date finalSeminarStartDate) {
-        final FinalSeminar finalSeminar,
-        final Date finalSeminarStartDate
-    ) {
         final Optional<ActivityFinalSeminar> optFinalSeminarActivity =
             activityFinalSeminarRepository.findByFinalSeminar(finalSeminar);
 
         if (optFinalSeminarActivity.isPresent()) {
-            updateActivity(
+            updateActivity(optFinalSeminarActivity.get().getActivity(), finalSeminar.getStartDate());
-                optFinalSeminarActivity.get().getActivity(),
-                finalSeminar.getStartDate()
-            );
         } else {
             createNewActivity(finalSeminar, finalSeminarStartDate);
         }
     }
 
-    private void createNewActivity(
+    private void createNewActivity(final FinalSeminar finalSeminar, final Date finalSeminarStartDate) {
-        final FinalSeminar finalSeminar,
-        final Date finalSeminarStartDate
-    ) {
         final Activity activity = Activity.builder()
             .activityPlan(activityPlanFacade.retrieveActivityPlan(finalSeminar.getProject()))
             .date(finalSeminarStartDate)
@@ -75,10 +66,7 @@ public class FinalSeminarActivityHandler {
             .build();
         activity.setAction(Action.FINAL_SEMINAR);
         final Activity savedActivity = activityPlanFacade.saveActivity(activity);
-        final ActivityFinalSeminar finalSeminarActivity = new ActivityFinalSeminar(
+        final ActivityFinalSeminar finalSeminarActivity = new ActivityFinalSeminar(savedActivity, finalSeminar);
-            savedActivity,
-            finalSeminar
-        );
         activityFinalSeminarRepository.save(finalSeminarActivity);
     }
 

core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThread.java

@@ -148,13 +148,7 @@ class ActivityThread {
 
         @Override
         public String toString() {
-            return (
+            return ("ActivityThread.Id(threadId=" + this.getThreadId() + ", activityId=" + this.getActivityId() + ")");
-                "ActivityThread.Id(threadId=" +
-                this.getThreadId() +
-                ", activityId=" +
-                this.getActivityId() +
-                ")"
-            );
         }
     }
 }

core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java

@@ -37,9 +37,7 @@ public class PostActivityUploadToForum {
         final User uploader = fileDescription.getUploader();
         final Set<Attachment> attachments = Set.of(Attachment.existing(fileDescription));
 
-        final Optional<ProjectThread> activityThread = activityThreadRepository.findByActivity(
+        final Optional<ProjectThread> activityThread = activityThreadRepository.findByActivity(activity);
-            activity
-        );
         if (activityThread.isPresent()) {
             final ProjectThread projectThread = activityThread.get();
             projectForumService.createReply(

core/src/main/java/se/su/dsv/scipro/mail/Failure.java

@@ -17,21 +17,16 @@ class Failure extends SMTPMailResult {
     @Override
     public void log(final Logger logger) {
         logger.info(
-            "Failed to deliver the mail to all recipients. Specified recipients: " +
+            "Failed to deliver the mail to all recipients. Specified recipients: " + Arrays.toString(getAllRecipients())
-            Arrays.toString(getAllRecipients())
         );
         if (exception.getValidSentAddresses() != null) {
             logger.info("Delivered to: " + Arrays.toString(exception.getValidSentAddresses()));
         }
         if (exception.getValidUnsentAddresses() != null) {
-            logger.warn(
+            logger.warn("Could not deliver to: " + Arrays.toString(exception.getValidUnsentAddresses()));
-                "Could not deliver to: " + Arrays.toString(exception.getValidUnsentAddresses())
-            );
         }
         if (exception.getInvalidAddresses() != null) {
-            logger.error(
+            logger.error("Invalid email found: " + Arrays.toString(exception.getInvalidAddresses()));
-                "Invalid email found: " + Arrays.toString(exception.getInvalidAddresses())
-            );
         }
     }
 }

core/src/main/java/se/su/dsv/scipro/mail/MailEventService.java

@@ -8,8 +8,7 @@ import se.su.dsv.scipro.system.GenericService;
 import se.su.dsv.scipro.system.User;
 
 public interface MailEventService
-    extends
+    extends GenericService<MailEvent, Long>, FilteredService<MailEvent, Long, MailEventService.Filter> {
-        GenericService<MailEvent, Long>, FilteredService<MailEvent, Long, MailEventService.Filter> {
     Iterable<MailEvent> findUnsent();
 
     class Filter implements Serializable {
@@ -71,12 +70,7 @@ public interface MailEventService
 
         @Override
         public int hashCode() {
-            return Objects.hash(
+            return Objects.hash(this.getUser(), this.getSubject(), this.getSentAfter(), this.getSentBefore());
-                this.getUser(),
-                this.getSubject(),
-                this.getSentAfter(),
-                this.getSentBefore()
-            );
         }
 
         @Override

core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java

@@ -9,9 +9,7 @@ import java.util.List;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.Pageable;
 
-public class MailEventServiceImpl
+public class MailEventServiceImpl extends AbstractServiceImpl<MailEvent, Long> implements MailEventService {
-    extends AbstractServiceImpl<MailEvent, Long>
-    implements MailEventService {
 
     @Inject
     public MailEventServiceImpl(Provider<EntityManager> em) {

core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java

@@ -37,8 +37,7 @@ public class MailEventWorker extends AbstractWorker {
             return;
         }
 
-        GeneralSystemSettings systemSettings =
+        GeneralSystemSettings systemSettings = systemSettingsService.getGeneralSystemSettingsInstance();
-            systemSettingsService.getGeneralSystemSettingsInstance();
 
         this.beginTransaction();
         Iterable<MailEvent> unsent = mailEventService.findUnsent();
@@ -52,10 +51,7 @@ public class MailEventWorker extends AbstractWorker {
                 mailEvent = mailEventService.findOne(mailEvent.getId());
                 String subject = mailEvent.getSubject();
 
-                String fromName = Objects.requireNonNullElse(
+                String fromName = Objects.requireNonNullElse(mailEvent.getFromName(), systemSettings.getMailFromName());
-                    mailEvent.getFromName(),
-                    systemSettings.getMailFromName()
-                );
 
                 String fromEmail = Objects.requireNonNullElse(
                     mailEvent.getFromEmail(),
@@ -97,8 +93,7 @@ public class MailEventWorker extends AbstractWorker {
 
     private String[] generateRecipients(final MailEvent mailEvent) {
         final Set<User> recipients = filteredRecipients(mailEvent.getRecipients());
-        final String[] recipientsEmails = new String[recipients.size() +
+        final String[] recipientsEmails = new String[recipients.size() + mailEvent.getNonUserRecipients().size()];
-        mailEvent.getNonUserRecipients().size()];
         int i = 0;
         for (User u : recipients) {
             recipientsEmails[i] = u.getEmailAddress();

core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java

@@ -11,11 +11,7 @@ public class RedirectingMailer extends SMTPMailer {
     private final String redirectTo;
 
     @Inject
-    public RedirectingMailer(
+    public RedirectingMailer(final Session session, final String redirectTo, FileService fileDescriptionService) {
-        final Session session,
-        final String redirectTo,
-        FileService fileDescriptionService
-    ) {
         super(session, fileDescriptionService);
         this.redirectTo = redirectTo;
     }

core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java

@@ -19,10 +19,7 @@ public class AddActivityPlanOnProjectStart {
     }
 
     @Inject
-    public AddActivityPlanOnProjectStart(
+    public AddActivityPlanOnProjectStart(final ActivityPlanFacade activityPlanFacade, final EventBus eventBus) {
-        final ActivityPlanFacade activityPlanFacade,
-        final EventBus eventBus
-    ) {
         this(activityPlanFacade);
         eventBus.register(this);
     }
@@ -46,11 +43,7 @@ public class AddActivityPlanOnProjectStart {
                     .atTime(applicationPeriod.getCourseStartTime())
                     .atZone(ZoneId.systemDefault())
                     .toInstant();
-                activityPlanFacade.addActivitiesFromTemplate(
+                activityPlanFacade.addActivitiesFromTemplate(project, template, Date.from(courseStartDate));
-                    project,
-                    template,
-                    Date.from(courseStartDate)
-                );
             });
     }
 }

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriod.java

@@ -29,12 +29,7 @@ public class ApplicationPeriod extends DomainObject {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @OneToMany(
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "applicationPeriod", cascade = CascadeType.ALL, orphanRemoval = true)
-        fetch = FetchType.LAZY,
-        mappedBy = "applicationPeriod",
-        cascade = CascadeType.ALL,
-        orphanRemoval = true
-    )
     private Set<ApplicationPeriodProjectType> projectTypes = new HashSet<>();
 
     private String name;
@@ -51,20 +46,10 @@ public class ApplicationPeriod extends DomainObject {
     @Column(name = "course_end_date")
     private LocalDate courseEndDate;
 
-    @OneToMany(
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "applicationPeriod", cascade = CascadeType.ALL, orphanRemoval = true)
-        fetch = FetchType.LAZY,
-        mappedBy = "applicationPeriod",
-        cascade = CascadeType.ALL,
-        orphanRemoval = true
-    )
     private Set<ApplicationPeriodExemption> applicationPeriodExemptions = new HashSet<>();
 
-    @OneToMany(
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "applicationPeriod", cascade = CascadeType.ALL, orphanRemoval = true)
-        fetch = FetchType.LAZY,
-        mappedBy = "applicationPeriod",
-        cascade = CascadeType.ALL,
-        orphanRemoval = true
-    )
     private Set<Target> targets = new HashSet<>();
 
     public ApplicationPeriod() {}
@@ -77,9 +62,7 @@ public class ApplicationPeriod extends DomainObject {
         return Collections.unmodifiableSet(applicationPeriodExemptions);
     }
 
-    public void setApplicationPeriodExemptions(
+    public void setApplicationPeriodExemptions(final Set<ApplicationPeriodExemption> applicationPeriodExemptions) {
-        final Set<ApplicationPeriodExemption> applicationPeriodExemptions
-    ) {
         this.applicationPeriodExemptions = new HashSet<>(applicationPeriodExemptions);
     }
 
@@ -96,11 +79,7 @@ public class ApplicationPeriod extends DomainObject {
     }
 
     public long noOfExemptedStudents() {
-        return applicationPeriodExemptions
+        return applicationPeriodExemptions.stream().map(ApplicationPeriodExemption::getUser).distinct().count();
-            .stream()
-            .map(ApplicationPeriodExemption::getUser)
-            .distinct()
-            .count();
     }
 
     public boolean hasApplicationPeriodExemptions() {

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodExemption.java

@@ -37,8 +37,7 @@ public class ApplicationPeriodExemption implements Serializable {
 
     @EmbeddedId
     @AttributeOverride(name = "type", column = @Column(name = "type"))
-    private ApplicationPeriodExemptionId applicationperiodexemptionId =
+    private ApplicationPeriodExemptionId applicationperiodexemptionId = new ApplicationPeriodExemptionId();
-        new ApplicationPeriodExemptionId();
 
     @MapsId("studentId")
     @ManyToOne(optional = false)
@@ -90,9 +89,7 @@ public class ApplicationPeriodExemption implements Serializable {
         return this.grantedOn;
     }
 
-    public void setApplicationperiodexemptionId(
+    public void setApplicationperiodexemptionId(ApplicationPeriodExemptionId applicationperiodexemptionId) {
-        ApplicationPeriodExemptionId applicationperiodexemptionId
-    ) {
         this.applicationperiodexemptionId = applicationperiodexemptionId;
     }
 
@@ -158,10 +155,7 @@ public class ApplicationPeriodExemption implements Serializable {
         final ApplicationPeriodExemption other = (ApplicationPeriodExemption) o;
         return (
             other.canEqual(this) &&
-            Objects.equals(
+            Objects.equals(this.getApplicationperiodexemptionId(), other.getApplicationperiodexemptionId()) &&
-                this.getApplicationperiodexemptionId(),
-                other.getApplicationperiodexemptionId()
-            ) &&
             Objects.equals(this.getEndDate(), other.getEndDate()) &&
             Objects.equals(this.getType(), other.getType())
         );
@@ -173,10 +167,6 @@ public class ApplicationPeriodExemption implements Serializable {
 
     @Override
     public int hashCode() {
-        return Objects.hash(
+        return Objects.hash(this.getApplicationperiodexemptionId(), this.getEndDate(), this.getType());
-            this.getApplicationperiodexemptionId(),
-            this.getEndDate(),
-            this.getType()
-        );
     }
 }

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectType.java

@@ -15,8 +15,7 @@ import se.su.dsv.scipro.system.ProjectType;
 public class ApplicationPeriodProjectType implements Serializable {
 
     @EmbeddedId
-    private ApplicationPeriodProjectTypeId applicationPeriodProjectTypeId =
+    private ApplicationPeriodProjectTypeId applicationPeriodProjectTypeId = new ApplicationPeriodProjectTypeId();
-        new ApplicationPeriodProjectTypeId();
 
     @MapsId("applicationPeriodId")
     @ManyToOne
@@ -34,10 +33,7 @@ public class ApplicationPeriodProjectType implements Serializable {
 
     protected ApplicationPeriodProjectType() {}
 
-    public ApplicationPeriodProjectType(
+    public ApplicationPeriodProjectType(ApplicationPeriod applicationPeriod, ProjectType projectType) {
-        ApplicationPeriod applicationPeriod,
-        ProjectType projectType
-    ) {
         this.applicationPeriod = applicationPeriod;
         this.projectType = projectType;
     }

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeService.java

@@ -5,8 +5,5 @@ import se.su.dsv.scipro.system.ProjectType;
 
 public interface ApplicationPeriodProjectTypeService
     extends GenericService<ApplicationPeriodProjectType, ApplicationPeriodProjectTypeId> {
-    ApplicationPeriodProjectType findOne(
+    ApplicationPeriodProjectType findOne(ApplicationPeriod applicationPeriod, ProjectType projectType);
-        ApplicationPeriod applicationPeriod,
-        ProjectType projectType
-    );
 }

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java

@@ -13,30 +13,19 @@ public class ApplicationPeriodProjectTypeServiceImpl
 
     @Inject
     public ApplicationPeriodProjectTypeServiceImpl(Provider<EntityManager> em) {
-        super(
+        super(em, ApplicationPeriodProjectType.class, QApplicationPeriodProjectType.applicationPeriodProjectType);
-            em,
-            ApplicationPeriodProjectType.class,
-            QApplicationPeriodProjectType.applicationPeriodProjectType
-        );
     }
 
     @Override
-    public ApplicationPeriodProjectType findOne(
+    public ApplicationPeriodProjectType findOne(ApplicationPeriod applicationPeriod, ProjectType projectType) {
-        ApplicationPeriod applicationPeriod,
-        ProjectType projectType
-    ) {
         return findOne(byApplicationPeriod(applicationPeriod).and(byProjectType(projectType)));
     }
 
     public static BooleanExpression byApplicationPeriod(ApplicationPeriod applicationPeriod) {
-        return QApplicationPeriodProjectType.applicationPeriodProjectType.applicationPeriod.eq(
+        return QApplicationPeriodProjectType.applicationPeriodProjectType.applicationPeriod.eq(applicationPeriod);
-            applicationPeriod
-        );
     }
 
     public static BooleanExpression byProjectType(ProjectType projectType) {
-        return QApplicationPeriodProjectType.applicationPeriodProjectType.projectType.eq(
+        return QApplicationPeriodProjectType.applicationPeriodProjectType.projectType.eq(projectType);
-            projectType
-        );
     }
 }

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodService.java

@@ -11,10 +11,7 @@ public interface ApplicationPeriodService extends GenericService<ApplicationPeri
     List<StudentPeriod> getCurrentStudentPeriods(final User student);
     List<ProjectType> getTypesForStudent(ApplicationPeriod applicationPeriod, User student);
     List<ApplicationPeriod> getCurrentSupervisorPeriods(User supervisor);
-    Collection<ApplicationPeriod> getPreviousPeriods(
+    Collection<ApplicationPeriod> getPreviousPeriods(ApplicationPeriod applicationPeriod, int limit);
-        ApplicationPeriod applicationPeriod,
-        int limit
-    );
     ApplicationPeriod getCurrentPeriod(final ProjectType pc);
     ApplicationPeriod getPreviousPeriodByProjectType(ProjectType projectType);
     boolean courseStartHasPassed(final ApplicationPeriod ap);

core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java

@@ -46,25 +46,20 @@ public class ApplicationPeriodServiceImpl
     public List<StudentPeriod> getCurrentStudentPeriods(User student) {
         LocalDate currentDate = LocalDate.now(clock);
         Set<ApplicationPeriod> phs = new HashSet<>(getCurrentPeriods(currentDate));
-        QApplicationPeriodExemption exemption =
+        QApplicationPeriodExemption exemption = QApplicationPeriodExemption.applicationPeriodExemption;
-            QApplicationPeriodExemption.applicationPeriodExemption;
         final List<ApplicationPeriodExemption> currentExemptions = from(exemption)
             .where(
-                allOf(
+                allOf(exemption.user.eq(student), anyOf(exemption.endDate.goe(currentDate), exemption.endDate.isNull()))
-                    exemption.user.eq(student),
-                    anyOf(exemption.endDate.goe(currentDate), exemption.endDate.isNull())
-                )
             )
             .fetch();
-        final Map<ApplicationPeriod, List<ApplicationPeriodExemption.Type>> periodExemptions =
+        final Map<ApplicationPeriod, List<ApplicationPeriodExemption.Type>> periodExemptions = currentExemptions
-            currentExemptions
+            .stream()
-                .stream()
+            .collect(
-                .collect(
+                Collectors.groupingBy(
-                    Collectors.groupingBy(
+                    ApplicationPeriodExemption::getApplicationPeriod,
-                        ApplicationPeriodExemption::getApplicationPeriod,
+                    Collectors.mapping(ApplicationPeriodExemption::getType, Collectors.toList())
-                        Collectors.mapping(ApplicationPeriodExemption::getType, Collectors.toList())
+                )
-                    )
+            );
-                );
 
         final List<StudentPeriod> studentPeriods = new ArrayList<>();
         for (ApplicationPeriod openApplicationPeriod : phs) {
@@ -97,10 +92,7 @@ public class ApplicationPeriodServiceImpl
 
     @Override
     public List<ProjectType> getTypesForStudent(ApplicationPeriod applicationPeriod, User student) {
-        if (
+        if (student.getDegreeType() == DegreeType.NONE || hasTypeExemption(applicationPeriod, student)) {
-            student.getDegreeType() == DegreeType.NONE ||
-            hasTypeExemption(applicationPeriod, student)
-        ) {
             return new ArrayList<>(applicationPeriod.getProjectTypes());
         } else {
             return applicationPeriod
@@ -114,11 +106,7 @@ public class ApplicationPeriodServiceImpl
     private boolean hasTypeExemption(ApplicationPeriod applicationPeriod, User student) {
         return (
             null !=
-            getExemptionForExemptionType(
+            getExemptionForExemptionType(applicationPeriod, student, ApplicationPeriodExemption.Type.PROJECT_TYPE)
-                applicationPeriod,
-                student,
-                ApplicationPeriodExemption.Type.PROJECT_TYPE
-            )
         );
     }
 
@@ -127,8 +115,7 @@ public class ApplicationPeriodServiceImpl
         User student,
         ApplicationPeriodExemption.Type type
     ) {
-        final QApplicationPeriodExemption QApe =
+        final QApplicationPeriodExemption QApe = QApplicationPeriodExemption.applicationPeriodExemption;
-            QApplicationPeriodExemption.applicationPeriodExemption;
         return from(QApe)
             .where(
                 allOf(
@@ -144,27 +131,18 @@ public class ApplicationPeriodServiceImpl
     public boolean hasIdeaSizeExemption(User student, ApplicationPeriod applicationPeriod) {
         return (
             null !=
-            getExemptionForExemptionType(
+            getExemptionForExemptionType(applicationPeriod, student, ApplicationPeriodExemption.Type.NUMBER_OF_AUTHORS)
-                applicationPeriod,
-                student,
-                ApplicationPeriodExemption.Type.NUMBER_OF_AUTHORS
-            )
         );
     }
 
     @Override
     public List<ApplicationPeriod> getCurrentSupervisorPeriods(final User supervisor) {
         LocalDateTime now = LocalDateTime.now(clock);
-        return findAll(
+        return findAll(Expressions.allOf(startedBeforeOrAt(now.toLocalDate()), courseStartAfterOrAt(now)));
-            Expressions.allOf(startedBeforeOrAt(now.toLocalDate()), courseStartAfterOrAt(now))
-        );
     }
 
     @Override
-    public Collection<ApplicationPeriod> getPreviousPeriods(
+    public Collection<ApplicationPeriod> getPreviousPeriods(ApplicationPeriod applicationPeriod, int limit) {
-        ApplicationPeriod applicationPeriod,
-        int limit
-    ) {
         return findAll(
             endedBefore(applicationPeriod.getStartDate()),
             new PageRequest(0, limit, new Sort(Sort.Direction.DESC, "startDate"))
@@ -179,9 +157,7 @@ public class ApplicationPeriodServiceImpl
     @Transactional
     public ApplicationPeriod getCurrentPeriod(ProjectType pc) {
         final LocalDate currentDate = LocalDate.now(clock);
-        return findOne(
+        return findOne(startedBeforeOrAt(currentDate).and(endedAfterOrAt(currentDate)).and(haveProjectType(pc)));
-            startedBeforeOrAt(currentDate).and(endedAfterOrAt(currentDate)).and(haveProjectType(pc))
-        );
     }
 
     @Override
@@ -218,11 +194,7 @@ public class ApplicationPeriodServiceImpl
 
     @Override
     public boolean hasCurrentSelectSupervisorIdeaExemption(ApplicationPeriod ap, User student) {
-        return hasCurrentExemption(
+        return hasCurrentExemption(ap, student, ApplicationPeriodExemption.Type.SELECT_SUPERVISOR_IDEA);
-            ap,
-            student,
-            ApplicationPeriodExemption.Type.SELECT_SUPERVISOR_IDEA
-        );
     }
 
     private boolean hasCurrentExemption(
@@ -231,24 +203,13 @@ public class ApplicationPeriodServiceImpl
         ApplicationPeriodExemption.Type type
     ) {
         final LocalDate today = LocalDate.now();
-        final ApplicationPeriodExemption exemption = getExemptionForExemptionType(
+        final ApplicationPeriodExemption exemption = getExemptionForExemptionType(applicationPeriod, student, type);
-            applicationPeriod,
-            student,
-            type
-        );
         return exemption != null && !today.isAfter(exemption.getEndDate());
     }
 
     @Override
-    public boolean hasCurrentSubmitIdeaExemption(
+    public boolean hasCurrentSubmitIdeaExemption(ApplicationPeriod applicationPeriod, User student) {
-        ApplicationPeriod applicationPeriod,
+        return hasCurrentExemption(applicationPeriod, student, ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA);
-        User student
-    ) {
-        return hasCurrentExemption(
-            applicationPeriod,
-            student,
-            ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA
-        );
     }
 
     @Override
@@ -275,40 +236,24 @@ public class ApplicationPeriodServiceImpl
 
     @Override
     public List<ApplicationPeriod> findUpcomingPeriods() {
-        return findAll(
+        return findAll(QApplicationPeriod.applicationPeriod.courseStartDateTime.after(LocalDateTime.now(clock)));
-            QApplicationPeriod.applicationPeriod.courseStartDateTime.after(LocalDateTime.now(clock))
-        );
     }
 
     @Override
     public boolean isVisibleForSupervisors(final ApplicationPeriod applicationPeriod) {
         final LocalDate now = LocalDate.now(clock);
-        return !(
+        return !(now.isBefore(applicationPeriod.getStartDate()) || now.isAfter(applicationPeriod.getCourseStartDate()));
-            now.isBefore(applicationPeriod.getStartDate()) ||
-            now.isAfter(applicationPeriod.getCourseStartDate())
-        );
     }
 
-    private boolean periodsOverlap(
+    private boolean periodsOverlap(LocalDate p1Start, LocalDate p1End, LocalDate p2Start, LocalDate p2End) {
-        LocalDate p1Start,
-        LocalDate p1End,
-        LocalDate p2Start,
-        LocalDate p2End
-    ) {
         return p2Start.isBefore(p1End) && p2End.isAfter(p1Start);
     }
 
-    private boolean isEditing(
+    private boolean isEditing(final ApplicationPeriod newPeriod, final ApplicationPeriod foundPeriod) {
-        final ApplicationPeriod newPeriod,
-        final ApplicationPeriod foundPeriod
-    ) {
         return (newPeriod.getId() != null && newPeriod.equals(foundPeriod));
     }
 
-    private boolean projectTypeMatch(
+    private boolean projectTypeMatch(final Set<ProjectType> fromNewPeriod, final Set<ProjectType> fromOldPeriod) {
-        final Set<ProjectType> fromNewPeriod,
-        final Set<ProjectType> fromOldPeriod
-    ) {
         for (ProjectType projectType : fromNewPeriod) {
             if (fromOldPeriod.contains(projectType)) {
                 return true;