diff --git a/core/src/main/java/se/su/dsv/scipro/CoreConfig.java b/core/src/main/java/se/su/dsv/scipro/CoreConfig.java index f0039079ab..2dc8f54929 100644 --- a/core/src/main/java/se/su/dsv/scipro/CoreConfig.java +++ b/core/src/main/java/se/su/dsv/scipro/CoreConfig.java @@ -212,9 +212,7 @@ public class CoreConfig { } @Bean - public GradingHistory gradingHistory( - GradingHistoryEventRepository gradingHistoryEventRepository - ) { + public GradingHistory gradingHistory(GradingHistoryEventRepository gradingHistoryEventRepository) { return new GradingHistory(gradingHistoryEventRepository); } @@ -324,32 +322,22 @@ public class CoreConfig { } @Bean - public ApplicationPeriodProjectTypeServiceImpl applicationPeriodProjectTypeService( - Provider<EntityManager> em - ) { + public ApplicationPeriodProjectTypeServiceImpl applicationPeriodProjectTypeService(Provider<EntityManager> em) { return new ApplicationPeriodProjectTypeServiceImpl(em); } @Bean - public ApplicationPeriodServiceImpl applicationPeriodService( - Provider<EntityManager> em, - Clock clock - ) { + public ApplicationPeriodServiceImpl applicationPeriodService(Provider<EntityManager> em, Clock clock) { return new ApplicationPeriodServiceImpl(em, clock); } @Bean - public AuthenticationServiceImpl authenticationService( - Set<AuthenticationProvider> authenticationProviders - ) { + public AuthenticationServiceImpl authenticationService(Set<AuthenticationProvider> authenticationProviders) { return new AuthenticationServiceImpl(authenticationProviders); } @Bean - public LocalAuthentication localAuthentication( - UserService userService, - PasswordService passwordService - ) { + public LocalAuthentication localAuthentication(UserService userService, PasswordService passwordService) { return new LocalAuthentication(userService, passwordService); } @@ -430,12 +418,7 @@ public class CoreConfig { FileReferenceRepository fileReferenceRepository, FileDescriptionRepo fileDescriptionRepository ) { - return new FileServiceImpl( - em, - fileReferenceRepository, - fileDescriptionRepository, - fileStore - ); + return new FileServiceImpl(em, fileReferenceRepository, fileDescriptionRepository, fileStore); } @Bean @@ -446,16 +429,12 @@ public class CoreConfig { } @Bean - public FinalSeminarOppositionServiceImpl finalSeminarOppositionService( - Provider<EntityManager> em - ) { + public FinalSeminarOppositionServiceImpl finalSeminarOppositionService(Provider<EntityManager> em) { return new FinalSeminarOppositionServiceImpl(em); } @Bean - public FinalSeminarRespondentServiceImpl finalSeminarRespondentService( - Provider<EntityManager> em - ) { + public FinalSeminarRespondentServiceImpl finalSeminarRespondentService(Provider<EntityManager> em) { return new FinalSeminarRespondentServiceImpl(em); } @@ -545,16 +524,12 @@ public class CoreConfig { } @Bean - public GeneralSystemSettingsServiceImpl generalSystemSettingsService( - Provider<EntityManager> em - ) { + public GeneralSystemSettingsServiceImpl generalSystemSettingsService(Provider<EntityManager> em) { return new GeneralSystemSettingsServiceImpl(em); } @Bean - public GradeCalculatorServiceImpl gradeCalculatorService( - GradingReportService gradingReportService - ) { + public GradeCalculatorServiceImpl gradeCalculatorService(GradingReportService gradingReportService) { return new GradeCalculatorServiceImpl(gradingReportService); } @@ -649,9 +624,7 @@ public class CoreConfig { } @Bean - public MilestonePhaseTemplateServiceImpl milestonePhaseTemplateService( - Provider<EntityManager> em - ) { + public MilestonePhaseTemplateServiceImpl milestonePhaseTemplateService(Provider<EntityManager> em) { return new MilestonePhaseTemplateServiceImpl(em); } @@ -754,18 +727,11 @@ public class CoreConfig { PlagiarismRequestRepository plagiarismRequestRepository, UrkundSubmissionRepository urkundSubmissionRepository ) { - return new PlagiarismControlImpl( - plagiarismRequestRepository, - urkundSubmissionRepository, - fileService - ); + return new PlagiarismControlImpl(plagiarismRequestRepository, urkundSubmissionRepository, fileService); } @Bean - public PreliminaryMatchServiceImpl preliminaryMatchService( - Provider<EntityManager> em, - IdeaService ideaService - ) { + public PreliminaryMatchServiceImpl preliminaryMatchService(Provider<EntityManager> em, IdeaService ideaService) { return new PreliminaryMatchServiceImpl(em, ideaService); } @@ -783,9 +749,7 @@ public class CoreConfig { } @Bean - public ProjectFinalSeminarStatisticsServiceImpl projectFinalSeminarStatisticsService( - Provider<EntityManager> em - ) { + public ProjectFinalSeminarStatisticsServiceImpl projectFinalSeminarStatisticsService(Provider<EntityManager> em) { return new ProjectFinalSeminarStatisticsServiceImpl(em); } @@ -812,9 +776,7 @@ public class CoreConfig { } @Bean - public ProjectPeopleStatisticsServiceImpl projectPeopleStatisticsService( - Provider<EntityManager> em - ) { + public ProjectPeopleStatisticsServiceImpl projectPeopleStatisticsService(Provider<EntityManager> em) { return new ProjectPeopleStatisticsServiceImpl(em); } @@ -850,16 +812,12 @@ public class CoreConfig { } @Bean - public ReceiverConfigurationServiceImpl receiverConfigurationService( - Provider<EntityManager> em - ) { + public ReceiverConfigurationServiceImpl receiverConfigurationService(Provider<EntityManager> em) { return new ReceiverConfigurationServiceImpl(em); } @Bean - public ReviewerDeadlineFollowupServiceImpl reviewerDeadlineFollowupService( - Provider<EntityManager> em - ) { + public ReviewerDeadlineFollowupServiceImpl reviewerDeadlineFollowupService(Provider<EntityManager> em) { return new ReviewerDeadlineFollowupServiceImpl(em); } @@ -981,10 +939,7 @@ public class CoreConfig { } @Bean - public UrkundApiImpl urkundApi( - UrkundSettingsRepository urkundSettingsRepository, - FileService fileService - ) { + public UrkundApiImpl urkundApi(UrkundSettingsRepository urkundSettingsRepository, FileService fileService) { return new UrkundApiImpl(urkundSettingsRepository, fileService); } @@ -1072,11 +1027,7 @@ public class CoreConfig { ActivityFinalSeminarRepository activityFinalSeminarRepository, EventBus eventBus ) { - return new FinalSeminarActivityHandler( - activityPlanFacade, - activityFinalSeminarRepository, - eventBus - ); + return new FinalSeminarActivityHandler(activityPlanFacade, activityFinalSeminarRepository, eventBus); } @Bean @@ -1085,11 +1036,7 @@ public class CoreConfig { ProjectForumService projectForumService, ActivityThreadRepository activityThreadRepository ) { - return new PostActivityUploadToForum( - projectForumService, - activityThreadRepository, - eventBus - ); + return new PostActivityUploadToForum(projectForumService, activityThreadRepository, eventBus); } @Bean @@ -1140,10 +1087,7 @@ public class CoreConfig { } @Bean - public ProjectStartNotifier projectStartNotifier( - EventBus eventBus, - NotificationController notificationController - ) { + public ProjectStartNotifier projectStartNotifier(EventBus eventBus, NotificationController notificationController) { return new ProjectStartNotifier(eventBus, notificationController); } @@ -1165,9 +1109,7 @@ public class CoreConfig { } @Bean - public CommentThreadServiceImpl commentThreadService( - CommentThreadRepo commentThreadRepository - ) { + public CommentThreadServiceImpl commentThreadService(CommentThreadRepo commentThreadRepository) { return new CommentThreadServiceImpl(commentThreadRepository); } diff --git a/core/src/main/java/se/su/dsv/scipro/DataInitializer.java b/core/src/main/java/se/su/dsv/scipro/DataInitializer.java index 9549d197aa..913e3c7de5 100644 --- a/core/src/main/java/se/su/dsv/scipro/DataInitializer.java +++ b/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( - LocalDate.now().minusDays(APPLICATION_PERIOD_START_MINUS_DAYS) - ); + applicationPeriod.setStartDate(LocalDate.now().minusDays(APPLICATION_PERIOD_START_MINUS_DAYS)); applicationPeriod.setEndDate(LocalDate.now().plusDays(APPLICATION_PERIOD_END_PLUS_DAYS)); - applicationPeriod.setCourseStartDate( - LocalDate.now().plusDays(APPLICATION_PERIOD_COURSE_START_PLUS_DAYS) - ); + applicationPeriod.setCourseStartDate(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( - String title, - User headSupervisor, - User student1, - User student2, - User reviewer - ) { + private void createProject(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.builder() - .firstName(firstName) - .lastName(lastName) - .emailAddress(firstName + MAIL) - .build() - ); + User user = save(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( - "För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem." - ) + .description("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( - "U3 Problem", - "U3 Problem", - 1, - gradingCriterionPointTemplates - ); + gradingReportTemplate.addProjectCriterion("U3 Problem", "U3 Problem", 1, gradingCriterionPointTemplates); gradingCriterionPointTemplates = initPointTemplates(); gradingCriterionPointTemplates.add( @@ -473,12 +450,7 @@ public class DataInitializer implements Lifecycle { ) .build() ); - gradingReportTemplate.addProjectCriterion( - "U8 Resultat", - "U8 Result", - 1, - gradingCriterionPointTemplates - ); + gradingReportTemplate.addProjectCriterion("U8 Resultat", "U8 Result", 1, gradingCriterionPointTemplates); gradingCriterionPointTemplates = initPointTemplates(); gradingCriterionPointTemplates.add( @@ -692,12 +664,7 @@ public class DataInitializer implements Lifecycle { .build() ); gradingReportTemplate - .addIndividualCriterion( - "Ö4 Deadlines", - "Ö4 Deadlines", - 0, - gradingCriterionPointTemplates - ) + .addIndividualCriterion("Ö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( - "För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem." - ) + .description("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( - "U3 Problem", - "U3 Problem", - 1, - gradingCriterionPointTemplates - ); + gradingReportTemplateMaster.addProjectCriterion("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( - "För 3 poäng krävs dessutom: att det finns ett betydande djup i dataanalysen." - ) + .description("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( - "U8 Resultat", - "U8 Result", - 2, - gradingCriterionPointTemplates - ); + gradingReportTemplateMaster.addProjectCriterion("U8 Resultat", "U8 Result", 2, gradingCriterionPointTemplates); gradingCriterionPointTemplates = initPointTemplates(); gradingCriterionPointTemplates.add( @@ -1224,12 +1177,7 @@ public class DataInitializer implements Lifecycle { .build() ); gradingReportTemplateMaster - .addIndividualCriterion( - "Ö4 Deadlines", - "Ö4 Deadlines", - 0, - gradingCriterionPointTemplates - ) + .addIndividualCriterion("Ö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( - "För 1 poäng krävs: att uppsatsen ger en introduktion till uppsatsens ämne och problem." - ) + .description("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( - "Ö4 Deadlines", - "Ö4 Deadlines", - 0, - gradingCriterionPointTemplates - ) + .addIndividualCriterion("Ö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( - new GradingCriterionPointTemplate.Builder().point(0).build() - ); + gradingCriterionPointTemplates.add(new GradingCriterionPointTemplate.Builder().point(0).build()); return gradingCriterionPointTemplates; } private void createDefaultProjectTypesIfNotDone() { - bachelorClass = new ProjectType( - ProjectType.BACHELOR, - "Bachelor", - "Bachelor degree thesis project" - ); + bachelorClass = new ProjectType(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( - ProjectType.MAGISTER, - "Magister", - "One-year-Master degree thesis project" - ); + magisterClass = new ProjectType(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( - type, - title, - description - ); + MilestoneActivityTemplate milestoneActivityTemplate = new MilestoneActivityTemplate(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( - title, - description - ); + MilestonePhaseTemplate milestonePhaseTemplate1 = new MilestonePhaseTemplate(title, description); return save(milestonePhaseTemplate1); } diff --git a/core/src/main/java/se/su/dsv/scipro/RepositoryConfiguration.java b/core/src/main/java/se/su/dsv/scipro/RepositoryConfiguration.java index 686be61e3a..d759376ea1 100644 --- a/core/src/main/java/se/su/dsv/scipro/RepositoryConfiguration.java +++ b/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( - Provider<EntityManager> em - ) { + public GradingHistoryEventRepositoryImpl gradingHistoryEventRepository(Provider<EntityManager> em) { return new GradingHistoryEventRepositoryImpl(em); } @@ -67,9 +65,7 @@ public class RepositoryConfiguration { } @Bean - public ActivityFinalSeminarRepositoryImpl activityFinalSeminarRepository( - Provider<EntityManager> em - ) { + public ActivityFinalSeminarRepositoryImpl activityFinalSeminarRepository(Provider<EntityManager> em) { return new ActivityFinalSeminarRepositoryImpl(em); } @@ -151,9 +147,7 @@ public class RepositoryConfiguration { } @Bean - public ForumPostReadStateRepositoryImpl forumPostReadStateRepository( - Provider<EntityManager> em - ) { + public ForumPostReadStateRepositoryImpl forumPostReadStateRepository(Provider<EntityManager> em) { return new ForumPostReadStateRepositoryImpl(em); } @@ -178,16 +172,12 @@ public class RepositoryConfiguration { } @Bean - public MilestoneActivityTemplateRepositoryImpl milestoneActivityTemplateRepository( - Provider<EntityManager> em - ) { + public MilestoneActivityTemplateRepositoryImpl milestoneActivityTemplateRepository(Provider<EntityManager> em) { return new MilestoneActivityTemplateRepositoryImpl(em); } @Bean - public NationalSubjectCategoryRepositoryImpl nationalSubjectCategoryRepository( - Provider<EntityManager> em - ) { + public NationalSubjectCategoryRepositoryImpl nationalSubjectCategoryRepository(Provider<EntityManager> em) { return new NationalSubjectCategoryRepositoryImpl(em); } @@ -227,9 +217,7 @@ public class RepositoryConfiguration { } @Bean - public PublicationMetadataRepositoryImpl publicationMetadataRepository( - Provider<EntityManager> em - ) { + public PublicationMetadataRepositoryImpl publicationMetadataRepository(Provider<EntityManager> em) { return new PublicationMetadataRepositoryImpl(em); } @@ -239,9 +227,7 @@ public class RepositoryConfiguration { } @Bean - public ReviewerDeadlineSettingsRepositoryImpl reviewerDeadlineSettingsRepository( - Provider<EntityManager> em - ) { + public ReviewerDeadlineSettingsRepositoryImpl reviewerDeadlineSettingsRepository(Provider<EntityManager> em) { return new ReviewerDeadlineSettingsRepositoryImpl(em); } @@ -296,9 +282,7 @@ public class RepositoryConfiguration { } @Bean - public SupervisorGradingReportRepositoryImpl supervisorGradingReportRepository( - Provider<EntityManager> em - ) { + public SupervisorGradingReportRepositoryImpl supervisorGradingReportRepository(Provider<EntityManager> em) { return new SupervisorGradingReportRepositoryImpl(em); } } diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityFileUploadedEvent.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityFileUploadedEvent.java index 419bbdec40..ac77b7496a 100644 --- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityFileUploadedEvent.java +++ b/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( - final Activity activity, - final FileDescription fileDescription - ) { + public ActivityFileUploadedEvent(final Activity activity, final FileDescription fileDescription) { this.activity = activity; this.fileDescription = fileDescription; } diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlan.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlan.java index 3016c9f6b0..d5ce02780a 100755 --- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlan.java +++ b/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( - this.getId(), - this.getActivities(), - this.getProject(), - this.getStartDate() - ); + return Objects.hash(this.getId(), this.getActivities(), this.getProject(), this.getStartDate()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacade.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacade.java index 53327fb936..5bbfe0abfe 100644 --- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacade.java +++ b/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( - ActivityPlan schedule, - User user, - String name, - String description - ); + ActivityPlanTemplate createTemplateFromSchedule(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( - final Project project, - final Date from, - final Date to, - Pageable pageable - ); + List<Activity> findEventsByProject(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); diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java index 8ddecf10d1..795d2f5664 100755 --- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java +++ b/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( - template.getId() - ); //Reload lazily linked entities + ActivityPlanTemplate reloadedTemplate = activityPlanTemplateService.findOne(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 - ? eventTemplate.getTitle() - : "no title"; - final String desc = eventTemplate.getDescription() != null - ? eventTemplate.getDescription() - : ""; + final String title = eventTemplate.getTitle() != null ? eventTemplate.getTitle() : "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<>( - new Activity.ByDateComparator().thenComparing(Activity::getId) - ); + SortedSet<Activity> activities = new TreeSet<>(new Activity.ByDateComparator().thenComparing(Activity::getId)); activities.addAll(schedule.getActivities()); for (final Activity activity : activities) { - final ActivityTemplate activityTemplate = createTemplateFromActivity( - previousActivityDate, - activity - ); + final ActivityTemplate activityTemplate = createTemplateFromActivity(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( - checklistTemplateService.findByName(event.getChecklist().getName()) - ); + eventTemplate.setChecklistTemplate(checklistTemplateService.findByName(event.getChecklist().getName())); } return eventTemplate; } private int daysBetween(Date previousEventDate, Date currentEventDate) { - return previousEventDate == null - ? 0 - : daysService.workDaysBetween(previousEventDate, currentEventDate); + return previousEventDate == null ? 0 : daysService.workDaysBetween(previousEventDate, currentEventDate); } @Override @@ -307,21 +292,12 @@ public class ActivityPlanFacadeImpl implements ActivityPlanFacade { } @Override - public List<Activity> findEventsByProject( - Project project, - Date from, - Date to, - Pageable pageable - ) { + public List<Activity> findEventsByProject(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( - event.activityPlan.project.eq(project), - event.date.after(dateFrom), - event.date.before(dateTo) - ), + allOf(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( - event.activityPlan.project.eq(project), - event.date.after(dateFrom), - event.date.before(dateTo) - ) + allOf(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( - question, - checklist.getNumberOfQuestions() - ); + ChecklistQuestion clQuestion = new ChecklistQuestion(question, checklist.getNumberOfQuestions()); clQuestion = checklistQuestionRepo.save(clQuestion); checklist.addQuestion(clQuestion); } diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java index 81d19d7b8a..3438d45b72 100755 --- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java +++ b/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 - extends AbstractServiceImpl<ActivityPlan, Long> - implements ActivityPlanService { +public class ActivityPlanServiceImpl extends AbstractServiceImpl<ActivityPlan, Long> implements ActivityPlanService { @Inject public ActivityPlanServiceImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java index ac29424bc6..505ee5e380 100755 --- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java +++ b/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( - QActivityPlanTemplate.activityPlanTemplate.creator.firstName.containsIgnoreCase( - filterString - ) - ) - .or( - QActivityPlanTemplate.activityPlanTemplate.creator.lastName.containsIgnoreCase( - filterString - ) - ); + .or(QActivityPlanTemplate.activityPlanTemplate.creator.firstName.containsIgnoreCase(filterString)) + .or(QActivityPlanTemplate.activityPlanTemplate.creator.lastName.containsIgnoreCase(filterString)); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java index 970bc2787e..3225fa5c61 100755 --- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java +++ b/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 - extends AbstractServiceImpl<Activity, Long> - implements ActivityService { +public class ActivityServiceImpl extends AbstractServiceImpl<Activity, Long> implements ActivityService { @Inject public ActivityServiceImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/Checklist.java b/core/src/main/java/se/su/dsv/scipro/checklist/Checklist.java index ad23e9ac27..5d9ad34c13 100755 --- a/core/src/main/java/se/su/dsv/scipro/checklist/Checklist.java +++ b/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( - name = "checklist_question_id", - referencedColumnName = "id" - ) + inverseJoinColumns = @JoinColumn(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( - name = "checklist_category_id", - referencedColumnName = "id" - ) + inverseJoinColumns = @JoinColumn(name = "checklist_category_id", referencedColumnName = "id") ) private List<se.su.dsv.scipro.checklist.ChecklistCategory> categories = new ArrayList<>(); @ElementCollection(fetch = FetchType.EAGER) - @CollectionTable( - name = "checklist_user_last_open_date", - joinColumns = @JoinColumn(name = "checklist_id") - ) + @CollectionTable(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") diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategory.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategory.java index ddfaf545b8..a17037190d 100755 --- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategory.java +++ b/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 ( - "ChecklistCategory(id=" + - this.getId() + - ", categoryName=" + - this.getCategoryName() + - ")" - ); + return ("ChecklistCategory(id=" + this.getId() + ", categoryName=" + this.getCategoryName() + ")"); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java index cd5fd67e61..fad2584ec7 100644 --- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java +++ b/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 - extends GenericRepo<ChecklistCategory, Long> - implements ChecklistCategoryRepo { +public class ChecklistCategoryRepoImpl extends GenericRepo<ChecklistCategory, Long> implements ChecklistCategoryRepo { @Inject public ChecklistCategoryRepoImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java index ee972cda02..9fe0fd26f3 100644 --- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java +++ b/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 - extends GenericRepo<ChecklistQuestion, Long> - implements ChecklistQuestionRepo { +public class ChecklistQuestionRepoImpl extends GenericRepo<ChecklistQuestion, Long> implements ChecklistQuestionRepo { @Inject public ChecklistQuestionRepoImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java index 2e73189d99..85e55133a4 100755 --- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java +++ b/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 - extends AbstractServiceImpl<Checklist, Long> - implements ChecklistService { +public class ChecklistServiceImpl 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( - QActivityPlan.activityPlan.project.eq(project), - QChecklistAnswer.checklistAnswer.answer.eq(answer) - ) + .where(QActivityPlan.activityPlan.project.eq(project), QChecklistAnswer.checklistAnswer.answer.eq(answer)) .fetchFirst(); } diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplate.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplate.java index ae23228289..3673bb5d02 100755 --- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplate.java +++ b/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( - name = "checklist_template_question", - joinColumns = @JoinColumn(name = "checklist_template_id") - ) + @CollectionTable(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( - name = "checklist_category_id", - referencedColumnName = "id" - ) + inverseJoinColumns = @JoinColumn(name = "checklist_category_id", referencedColumnName = "id") ) private List<ChecklistCategory> categories = new ArrayList<>(); diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateService.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateService.java index 16f6dba550..230939f28d 100755 --- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateService.java +++ b/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 - GenericService<ChecklistTemplate, Long>, FilteredService<ChecklistTemplate, Long, String> { + extends GenericService<ChecklistTemplate, Long>, FilteredService<ChecklistTemplate, Long, String> { void upChecklistTemplate(ChecklistTemplate checklistTemplate); void downChecklistTemplate(ChecklistTemplate checklistTemplate); void safeDeleteChecklistTemplate(ChecklistTemplate checklistTemplate); diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java index 12ee4d1355..9c0618e9a6 100755 --- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java +++ b/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( - filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter)), - pageable - ); + return findAll(filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter)), pageable); } @Override public long count(String filterString) { String filter = filterString == null ? "" : filterString; - return count( - filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter)) - ); + return count(filterStringIsCreatorName(filter).or(filterStringIsChecklistTemplateName(filter))); } @Transactional @Override public void upChecklistTemplate(ChecklistTemplate checklistTemplate) { if (findByTemplateNumber(checklistTemplate.getTemplateNumber() + 1) != null) { - ChecklistTemplate downChecklistTemplate = findByTemplateNumber( - checklistTemplate.getTemplateNumber() + 1 - ); + ChecklistTemplate downChecklistTemplate = findByTemplateNumber(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.getTemplateNumber() - 1 - ); + ChecklistTemplate upChecklistTemplate = findByTemplateNumber(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( - checklistTemplate.getTemplateNumber() - ) + QChecklistTemplate.checklistTemplate.templateNumber.gt(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 - .any() - .eq(project.getProjectType()), + QChecklistTemplate.checklistTemplate.projectTypes.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( - QChecklistTemplate.checklistTemplate.projectTypes.any().eq(project.getProjectType()) - ); + return findAll(QChecklistTemplate.checklistTemplate.projectTypes.any().eq(project.getProjectType())); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java b/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java index ec47d45eaa..02be2ca1e6 100644 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java +++ b/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( - int projectId, - int personId, - PublishingConsentLevel publishingConsentLevel - ); + boolean setPublishingConsent(int projectId, int personId, PublishingConsentLevel publishingConsentLevel); List<ResearchSubject> getNationalResearchSubjects(int organisationId); } diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java b/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java index f69e0b4697..372712f41d 100755 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java +++ b/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() - .register(HttpAuthenticationFeature.basic(user, password)); + this.client = ClientBuilder.newClient().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 - ? Optional.of(response.readEntity(Person.class)) - : Optional.empty(); + return response.getStatus() == 200 ? 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 - ? Optional.of(response.readEntity(Person.class)) - : Optional.empty(); + return response.getStatus() == 200 ? 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() - .path(String.valueOf(projectId)) - .request(MediaType.APPLICATION_XML_TYPE) - .delete(); + return thesis().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() - .path(String.valueOf(id)) - .request(MediaType.APPLICATION_XML_TYPE) - .get(Program.class); + return program().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 - ? Optional.of(response.readEntity(Thesis.class)) - : Optional.empty(); + return response.getStatus() == 200 ? 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 - ? Optional.ofNullable(response.readEntity(String.class)) - : Optional.empty(); + return response.getStatus() == 200 ? Optional.ofNullable(response.readEntity(String.class)) : Optional.empty(); } @Override @@ -231,11 +216,7 @@ public class DaisyAPIImpl implements DaisyAPI { } @Override - public PhotoResult getPhoto( - final Integer personId, - final int requesterId, - final boolean alwaysShow - ) { + public PhotoResult getPhoto(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( - final long projectId, - final String filename, - final InputStream data - ) { + public boolean sendPublicationFile(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( - final Program program, - final Semester admissionSemester - ) { + public List<ProgramAdmission> getProgramAdmissions(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( - int projectId, - int personId, - PublishingConsentLevel publishingConsentLevel - ) { + public boolean setPublishingConsent(int projectId, int personId, PublishingConsentLevel publishingConsentLevel) { final Invocation.Builder request = thesis() .path(Integer.toString(projectId)) .path("author") diff --git a/core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java b/core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java index 0313ec4576..54a2d04783 100755 --- a/core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java +++ b/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( - ProjectStatus ps, - Set<ProjectType> pc, - Date startDate, - Date endDate - ) { + private Set<Recipient> addProjectAuthors(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( - ProjectStatus ps, - Set<ProjectType> pc, - Date startDate, - Date endDate - ) { + private Set<Recipient> addProjectSupervisors(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( - ProjectStatus ps, - Set<ProjectType> pc, - Date startDate, - Date endDate - ) { + private Set<Recipient> addProjectReviewers(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( - MailChoice choice, - Set<ProjectType> pc, - Date startDate, - Date endDate - ) { + public Set<Recipient> getRecipients(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( - addProjectSupervisors(ProjectStatus.ACTIVE, pc, startDate, endDate) - ); - allFollowers.addAll( - addProjectReviewers(ProjectStatus.ACTIVE, pc, startDate, endDate) - ); - allFollowers.addAll( - addProjectCoSupervisors(ProjectStatus.ACTIVE, pc, startDate, endDate) - ); + allFollowers.addAll(addProjectSupervisors(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( diff --git a/core/src/main/java/se/su/dsv/scipro/file/FileDescription.java b/core/src/main/java/se/su/dsv/scipro/file/FileDescription.java index 4025acc579..d5d8c54bcb 100755 --- a/core/src/main/java/se/su/dsv/scipro/file/FileDescription.java +++ b/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( - (id / FILES_PER_SUBDIRECTORY) * FILES_PER_SUBDIRECTORY + FILES_PER_SUBDIRECTORY - ); + return Long.toString((id / FILES_PER_SUBDIRECTORY) * FILES_PER_SUBDIRECTORY + FILES_PER_SUBDIRECTORY); } public boolean isDataAvailable() { diff --git a/core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java index 250a9507c2..6d46ae3126 100644 --- a/core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java +++ b/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 - extends GenericRepo<FileDescription, Long> - implements FileDescriptionRepo { +public class FileDescriptionRepoImpl extends GenericRepo<FileDescription, Long> implements FileDescriptionRepo { @Inject public FileDescriptionRepoImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java index e5cb8650b8..674e1f59e7 100644 --- a/core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java +++ b/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 - extends AbstractRepository - implements FileReferenceRepository { +public class FileReferenceRepositoryImpl extends AbstractRepository implements FileReferenceRepository { @Inject public FileReferenceRepositoryImpl(final Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java index ee65aa0eb8..70346fb9c8 100755 --- a/core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java +++ b/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 - extends AbstractServiceImpl<FileDescription, Long> - implements FileService { +public class FileServiceImpl extends AbstractServiceImpl<FileDescription, Long> implements FileService { private final FileReferenceRepository fileReferenceRepository; private final FileDescriptionRepo fileDescriptionRepository; diff --git a/core/src/main/java/se/su/dsv/scipro/file/ProjectFile.java b/core/src/main/java/se/su/dsv/scipro/file/ProjectFile.java index ac32de1f7f..878bc12362 100644 --- a/core/src/main/java/se/su/dsv/scipro/file/ProjectFile.java +++ b/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( - this.getId(), - this.getProject(), - this.getFileSource(), - this.getFileDescription() - ); + return Objects.hash(this.getId(), this.getProject(), this.getFileSource(), this.getFileDescription()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java index 59af98029c..9358749539 100644 --- a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java +++ b/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 - extends AbstractServiceImpl<ProjectFile, Long> - implements ProjectFileRepository { +public class ProjectFileRepositoryImpl 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( - final FileDescription fileDescription, - final Project project - ) { + public Optional<ProjectFile> findProjectFile(final FileDescription fileDescription, final Project project) { return Optional.ofNullable( findOne( Expressions.allOf( diff --git a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java index a67df4c106..8d44fef071 100644 --- a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java +++ b/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( - final FileService fileService, - final ProjectFileRepository projectFileRepository - ) { + public ProjectFileServiceImpl(final FileService fileService, final ProjectFileRepository projectFileRepository) { this.fileService = fileService; this.projectFileRepository = projectFileRepository; } @Override @Transactional - public ProjectFile store( - final ProjectFileUpload projectFileUpload, - final FileSource fileSource - ) { + public ProjectFile store(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( - fileDescription, - project - ); + Optional<ProjectFile> existing = projectFileRepository.findProjectFile(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( - FileReference reference, - Project project, - FileSource fileSource - ) { + private ProjectFile createProjectFile(FileReference reference, Project project, FileSource fileSource) { final ProjectFile projectFile = new ProjectFile(); projectFile.setFileReference(reference); projectFile.setFileSource(fileSource); diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java index 9be4980742..db7e8ccd9c 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java +++ b/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) - .where(author.project.eq(project), author.user.eq(user)) - .fetchOne(); + final Author author1 = from(author).where(author.project.eq(project), author.user.eq(user)).fetchOne(); return Optional.ofNullable(author1); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java index 77784f1e52..6a9861175d 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java +++ b/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( - Collection<FinalSeminarActiveParticipation> activeParticipations - ) { + public void setActiveParticipations(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 ( - other.canEqual(this) && super.equals(o) && Objects.equals(this.getId(), other.getId()) - ); + return (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( - Set<? extends FinalSeminarParticipation> participations - ) { + private Collection<User> getNotGradedParticipations(Set<? extends FinalSeminarParticipation> participations) { List<User> result = new ArrayList<>(); for (FinalSeminarParticipation participation : participations) { if (participation.getGrade() == null) { diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipation.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipation.java index b567fc36b2..f0565b5a28 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipation.java +++ b/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 ( - other.canEqual(this) && super.equals(o) && Objects.equals(this.project, other.project) - ); + return (other.canEqual(this) && super.equals(o) && Objects.equals(this.project, other.project)); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepository.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepository.java index bda7747218..98bf95c743 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepository.java +++ b/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( - User user, - ProjectType projectType - ); + List<FinalSeminarActiveParticipation> findByParticipatingUserAndLevel(User user, ProjectType projectType); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java index ead207e533..f85dc68c0a 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java @@ -18,17 +18,10 @@ public class FinalSeminarActiveParticipationRepositoryImpl } @Override - public List<FinalSeminarActiveParticipation> findByParticipatingUserAndLevel( - User user, - ProjectType projectType - ) { + public List<FinalSeminarActiveParticipation> findByParticipatingUserAndLevel(User user, ProjectType projectType) { return from(QFinalSeminarActiveParticipation.finalSeminarActiveParticipation) .where(QFinalSeminarActiveParticipation.finalSeminarActiveParticipation.user.eq(user)) - .where( - QFinalSeminarActiveParticipation.finalSeminarActiveParticipation.project.projectType.eq( - projectType - ) - ) + .where(QFinalSeminarActiveParticipation.finalSeminarActiveParticipation.project.projectType.eq(projectType)) .fetch(); } } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationService.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationService.java index 2be4b22ac6..7540ccad98 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationService.java +++ b/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 - extends GenericService<FinalSeminarActiveParticipation, Long> { +public interface FinalSeminarActiveParticipationService extends GenericService<FinalSeminarActiveParticipation, Long> { FinalSeminarActiveParticipation findByFinalSeminarUser(FinalSeminar finalSeminar, User user); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java index ff9214faf7..c1c6f367a4 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java @@ -20,10 +20,7 @@ public class FinalSeminarActiveParticipationServiceImpl } @Override - public FinalSeminarActiveParticipation findByFinalSeminarUser( - FinalSeminar finalSeminar, - User user - ) { + public FinalSeminarActiveParticipation findByFinalSeminarUser(FinalSeminar finalSeminar, User user) { for (FinalSeminarActiveParticipation fsap : finalSeminar.getActiveParticipations()) { if (fsap.getUser().equals(user)) { return fsap; diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java index a9aab82b56..2774ea82a5 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java +++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java @@ -57,15 +57,10 @@ public class FinalSeminarCreationSubscribers { ); } - private List<User> getSubscribersStillNeedingOppositionOrParticipation( - List<Author> subscribers - ) { + private List<User> getSubscribersStillNeedingOppositionOrParticipation(List<Author> subscribers) { return subscribers .stream() - .filter( - subscriber -> - onlyFailedOppositions(subscriber) || onlyFailedParticipations(subscriber) - ) + .filter(subscriber -> onlyFailedOppositions(subscriber) || onlyFailedParticipations(subscriber)) .map(Author::getUser) .toList(); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarMovedEvent.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarMovedEvent.java index 4862bf7bef..9ba43dc5db 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarMovedEvent.java +++ b/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( - FinalSeminar finalSeminar, - LocalDateTime from, - LocalDateTime to -) {} +public record FinalSeminarMovedEvent(FinalSeminar finalSeminar, LocalDateTime from, LocalDateTime to) {} diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOpposition.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOpposition.java index aa92b39088..9825e981a8 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOpposition.java +++ b/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( - optional = true, - orphanRemoval = true, - cascade = CascadeType.ALL, - mappedBy = "finalSeminarOpposition" - ) + @OneToOne(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 ( - other.canEqual(this) && - super.equals(o) && - Objects.equals(this.getProject(), other.getProject()) - ); + return (other.canEqual(this) && super.equals(o) && Objects.equals(this.getProject(), other.getProject())); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepo.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepo.java index 81695f44d1..e636597075 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepo.java +++ b/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 - JpaRepository<FinalSeminarOpposition, Long>, - QueryDslPredicateExecutor<FinalSeminarOpposition> { + extends JpaRepository<FinalSeminarOpposition, Long>, QueryDslPredicateExecutor<FinalSeminarOpposition> { List<FinalSeminarOpposition> findByOpposingUserAndType(User user, ProjectType projectType); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java index 567ab5e017..00ad589634 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java @@ -18,15 +18,10 @@ public class FinalSeminarOppositionRepoImpl } @Override - public List<FinalSeminarOpposition> findByOpposingUserAndType( - User user, - ProjectType projectType - ) { + public List<FinalSeminarOpposition> findByOpposingUserAndType(User user, ProjectType projectType) { return createQuery() .where(QFinalSeminarOpposition.finalSeminarOpposition.user.eq(user)) - .where( - QFinalSeminarOpposition.finalSeminarOpposition.project.projectType.eq(projectType) - ) + .where(QFinalSeminarOpposition.finalSeminarOpposition.project.projectType.eq(projectType)) .fetch(); } } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionService.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionService.java index 34fbaa53df..60eeacc1a9 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionService.java +++ b/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 - extends GenericService<FinalSeminarOpposition, Long> { +public interface FinalSeminarOppositionService extends GenericService<FinalSeminarOpposition, Long> { @Override void delete(Long aLong); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java index 5100df7733..597496bd99 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java +++ b/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 - extends AbstractRepository - implements FinalSeminarRepository { +public class FinalSeminarRepositoryImpl extends AbstractRepository implements FinalSeminarRepository { @Inject public FinalSeminarRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentService.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentService.java index ffd6dc7638..aee6ce5e72 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentService.java +++ b/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 - extends GenericService<FinalSeminarRespondent, Long> { +public interface FinalSeminarRespondentService extends GenericService<FinalSeminarRespondent, Long> { List<FinalSeminarRespondent> findOrCreate(FinalSeminar finalSeminar); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarScheduling.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarScheduling.java index d4bb908813..c12560a261 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarScheduling.java +++ b/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( - Project project, - LocalDateTime when, - FinalSeminarDetails details - ); + Either<SchedulingError, FinalSeminar> schedule(Project project, LocalDateTime when, FinalSeminarDetails details); LocalDate getEarliestSeminarDate(); diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarService.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarService.java index 557e3cb405..5f56d80aaa 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarService.java +++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarService.java @@ -20,10 +20,11 @@ public interface FinalSeminarService Project project ); - Either< - ActiveParticipationRegistrationErrorStatus, - FinalSeminarActiveParticipation - > attemptAddActiveParticipation(User student, FinalSeminar finalSeminar, Project project); + Either<ActiveParticipationRegistrationErrorStatus, FinalSeminarActiveParticipation> attemptAddActiveParticipation( + User student, + FinalSeminar finalSeminar, + Project project + ); Either<OpposeError, FinalSeminarOpposition> attemptAddOppositionAsSupervisor( User student, @@ -31,20 +32,13 @@ public interface FinalSeminarService Project project ); - Either< - ParticipateError, - FinalSeminarActiveParticipation - > attemptAddActiveParticipationAsSupervisor( + Either<ParticipateError, FinalSeminarActiveParticipation> attemptAddActiveParticipationAsSupervisor( User student, FinalSeminar finalSeminar, Project project ); - Either<OppositionRegistrationErrorStatus, Void> canOppose( - User Student, - FinalSeminar finalSeminar, - Project project - ); + Either<OppositionRegistrationErrorStatus, Void> canOppose(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( - this.getOnlyActiveOrCompletedProjects(), - other.getOnlyActiveOrCompletedProjects() - ) && + Objects.equals(this.getOnlyActiveOrCompletedProjects(), other.getOnlyActiveOrCompletedProjects()) && Objects.equals(this.getHeadSupervisor(), other.getHeadSupervisor()) && Objects.equals(this.getDegreeType(), other.getDegreeType()) && Objects.equals(this.onlyNonManualParticipants, other.onlyNonManualParticipants) diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java index 0787ceb84f..0af91dca55 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java +++ b/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 - extends AbstractServiceImpl<FinalSeminar, Long> - implements FinalSeminarService { +public class FinalSeminarServiceImpl extends AbstractServiceImpl<FinalSeminar, Long> implements FinalSeminarService { @Inject FinalSeminarSettingsService finalSeminarSettingsService; @@ -135,11 +133,7 @@ public class FinalSeminarServiceImpl return Either.right(persisted); } - private FinalSeminar setDetails( - FinalSeminar finalSeminar, - LocalDateTime when, - FinalSeminarDetails details - ) { + private FinalSeminar setDetails(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( - FinalSeminar finalSeminar, - LocalDateTime to - ) { + private Either<MovingError, FinalSeminar> moveSeminar(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( - FinalSeminar finalSeminar, - FinalSeminarDetails finalSeminarDetails - ) { + public FinalSeminar updateDetails(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 - .getInstance() - .getOppositionPriorityDays(); + int oppositionPriorityDays = finalSeminarSettingsService.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( - User student, - FinalSeminar finalSeminar, - Project project - ) { + private FinalSeminarOpposition createAndSaveOpposition(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( - final User student, - final FinalSeminar finalSeminar, - final Project project - ) { + > attemptAddActiveParticipation(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< - ParticipateError, - FinalSeminarActiveParticipation - > attemptAddActiveParticipationAsSupervisor( + public Either<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( - QFinalSeminar.finalSeminar.project.projectType.degreeType.eq(params.getDegreeType()) - ); + bb.and(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( - ProjectStatus.ACTIVE, - ProjectStatus.COMPLETED - ); + return QFinalSeminar.finalSeminar.project.projectStatus.in(ProjectStatus.ACTIVE, ProjectStatus.COMPLETED); } @Override @@ -507,12 +478,7 @@ public class FinalSeminarServiceImpl return project .getProjectParticipants() .stream() - .map(author -> - findFinalSeminarOppositionsByOpponentAndProjectType( - project.getProjectType(), - author - ) - ) + .map(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 ( - finalSeminar != null && - finalSeminar.getStartDate().toInstant().isBefore(clock.instant()) - ); + return (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.isSubscribedToFinalSeminarNotifications() - ) + author.setSubscribedToFinalSeminarNotifications(!author.isSubscribedToFinalSeminarNotifications()) ); } @@ -585,12 +546,7 @@ public class FinalSeminarServiceImpl return seminar.oppositions .any() .grade.isNull() - .or( - seminar.activeParticipations - .any() - .grade.isNull() - .or(seminar.respondents.any().grade.isNull()) - ); + .or(seminar.activeParticipations.any().grade.isNull().or(seminar.respondents.any().grade.isNull())); } else { return seminar.startDate .between(after, before) diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettings.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettings.java index 85c870def6..6468b01d85 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettings.java +++ b/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() == - other.getDaysAheadToRegisterParticipation() && + this.getDaysAheadToRegisterParticipation() == other.getDaysAheadToRegisterParticipation() && this.getDaysAheadToRegisterOpposition() == other.getDaysAheadToRegisterOpposition() && this.getDaysAheadToUploadThesis() == other.getDaysAheadToUploadThesis() && this.isThesisMustBePDF() == other.isThesisMustBePDF() && diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java index d982a07278..abd46d339a 100755 --- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java +++ b/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( - FinalSeminarUploadControllerImpl.class - ); + private static final Logger LOGGER = LoggerFactory.getLogger(FinalSeminarUploadControllerImpl.class); private final FileService fileDescriptionService; private final FinalSeminarService finalSeminarService; @@ -57,10 +55,7 @@ public class FinalSeminarUploadControllerImpl implements FinalSeminarUploadContr @Override @Transactional - public SeminarDocumentUpload replaceSeminarDocument( - final FinalSeminar finalSeminar, - final FileUpload fileUpload - ) { + public SeminarDocumentUpload replaceSeminarDocument(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( - fileReference.getFileDescription(), - seminar.getProject().getHeadSupervisor() - ); + plagiarismControl.submit(fileReference.getFileDescription(), seminar.getProject().getHeadSupervisor()); eventBus.post(new FinalSeminarThesisUploadedEvent(seminar)); } diff --git a/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisService.java b/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisService.java index 7ac1ad452b..67d7a4da96 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisService.java +++ b/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 - GenericService<FinalThesis, Long>, - FilteredService<FinalThesis, Long, FinalThesisService.Filter> { + extends GenericService<FinalThesis, Long>, FilteredService<FinalThesis, Long, FinalThesisService.Filter> { FinalThesis upload(ProjectFileUpload fileUpload, String englishTitle, String swedishTitle); boolean hasFinalThesis(Project project); diff --git a/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java index b2dbd148a5..6e97f34e2f 100644 --- a/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java +++ b/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 - extends AbstractServiceImpl<FinalThesis, Long> - implements FinalThesisService { +public class FinalThesisServiceImpl 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( - ProjectFileUpload fileUpload, - String englishTitle, - String swedishTitle - ) { + public FinalThesis upload(ProjectFileUpload fileUpload, String englishTitle, String swedishTitle) { ProjectFile fileDescription = storeFinalThesisFile(fileUpload); - final FileReference reference = fileService.createReference( - fileDescription.getFileDescription() - ); + final FileReference reference = fileService.createReference(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) - ? findByProject(project).getDocument().getFileDescription() - : null; + return hasFinalThesis(project) ? 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( - QFinalThesis.finalThesis.dateCreated.desc(), - QFinalThesis.finalThesis.id.desc() - ) + .orderBy(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( - finalThesis.getDocument().getFileDescription(), - project.getHeadSupervisor() - ); + plagiarismControl.submit(finalThesis.getDocument().getFileDescription(), project.getHeadSupervisor()); eventBus.post(new FinalThesisApprovedEvent(project)); notificationController.notifyProject( project, diff --git a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java index ab1bd0a47f..e6aa513ad1 100644 --- a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java +++ b/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 - .getGeneralSystemSettingsInstance() - .getSciproURL(); + final String baseURL = generalSystemSettingsService.getGeneralSystemSettingsInstance().getSciproURL(); beginTransaction(); needReminding @@ -218,10 +216,7 @@ public class FirstMeetingReminderWorker extends AbstractWorker { Scheduler scheduler, Provider<FirstMeetingReminderWorker> firstMeetingReminderWorker ) { - scheduler - .schedule("First meeting reminders") - .runBy(firstMeetingReminderWorker) - .dailyAt(11, 30); + scheduler.schedule("First meeting reminders").runBy(firstMeetingReminderWorker).dailyAt(11, 30); } } } diff --git a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java index 3b12770a25..6b22d71c46 100644 --- a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java +++ b/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( - final Provider<EntityManager> em, - final ActivityPlanFacade activityPlanFacade - ) { + public FirstMeetingServiceImpl(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( - QProjectFirstMeeting.projectFirstMeeting.activity.activityPlan.project.eq(project) - ) + findOne(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( - ProjectFirstMeeting::new - ); + final ProjectFirstMeeting firstMeeting = optFirstMeeting.orElseGet(ProjectFirstMeeting::new); final Activity activity = optFirstMeeting .map(ProjectFirstMeeting::getActivity) .orElseGet(() -> createNewActivity(project)); @@ -62,11 +55,7 @@ public class FirstMeetingServiceImpl return activity; } - private Activity updateActivity( - final Activity activity, - final Date date, - final String description - ) { + private Activity updateActivity(final Activity activity, final Date date, final String description) { activity.setDate(date); activity.setDescription(description); return activityPlanFacade.saveActivity(activity); diff --git a/core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java index 59e92e6c30..a3e419470d 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java +++ b/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 - extends GenericRepo<ForumThread, Long> - implements AbstractThreadRepository { +public class AbstractThreadRepositoryImpl extends GenericRepo<ForumThread, Long> implements AbstractThreadRepository { @Inject public AbstractThreadRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/forum/BasicForumService.java b/core/src/main/java/se/su/dsv/scipro/forum/BasicForumService.java index 9ea9a4fe78..4bccf27413 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/BasicForumService.java +++ b/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( - ForumThread forumThread, - User poster, - String content, - Set<Attachment> attachments - ); + ForumPost createReply(ForumThread forumThread, User poster, String content, Set<Attachment> attachments); boolean setRead(User user, ForumPost post, boolean read); diff --git a/core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java index 87fd169f89..8da3bb70d6 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java +++ b/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( - User user, - String content, - ForumThread forumThread, - Set<Attachment> fileUploads - ) { + private ForumPost createForumPost(User user, String content, ForumThread forumThread, Set<Attachment> fileUploads) { final HashSet<FileReference> storedAttachments = fileUploads .stream() .map(attachment -> attachment.createReference(fileService)) diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepository.java b/core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepository.java index 1504508566..ec48e21286 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepository.java +++ b/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 - JpaRepository<ForumPostReadState, ForumPostReadStateId>, - QueryDslPredicateExecutor<ForumPostReadState> { + extends JpaRepository<ForumPostReadState, ForumPostReadStateId>, QueryDslPredicateExecutor<ForumPostReadState> { ForumPostReadState find(User user, ForumPost post); void setThreadRead(User user, ForumThread forumThread, boolean read); diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepository.java b/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepository.java index 828209712a..f557fd70a6 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepository.java +++ b/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 - extends JpaRepository<ForumPost, Long>, QueryDslPredicateExecutor<ForumPost> { +public interface ForumPostRepository extends JpaRepository<ForumPost, Long>, QueryDslPredicateExecutor<ForumPost> { List<ForumPost> findByThread(ForumThread forumThread); List<Pair<ProjectThread, ForumPost>> latestPost(Project project, int amount); diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java index 8970ddd43f..207d02c9d5 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java +++ b/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 - extends GenericRepo<ForumPost, Long> - implements ForumPostRepository { +public class ForumPostRepositoryImpl 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( - allOf( - QForumPost.forumPost.forumThread.eq(forumThread), - QForumPost.forumPost.deleted.isFalse() - ) - ); + return findAll(allOf(QForumPost.forumPost.forumThread.eq(forumThread), QForumPost.forumPost.deleted.isFalse())); } @Override @@ -48,9 +41,7 @@ public class ForumPostRepositoryImpl .limit(amount) .fetch() .stream() - .map(tuple -> - new Pair<>(tuple.get(QProjectThread.projectThread), tuple.get(QForumPost.forumPost)) - ) + .map(tuple -> new Pair<>(tuple.get(QProjectThread.projectThread), tuple.get(QForumPost.forumPost))) .toList(); } } diff --git a/core/src/main/java/se/su/dsv/scipro/forum/GroupForumService.java b/core/src/main/java/se/su/dsv/scipro/forum/GroupForumService.java index bb61ba6f9f..5d43341f3c 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/GroupForumService.java +++ b/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( - Group group, - User user, - String subject, - String content, - Set<Attachment> fileUploads - ); + GroupThread createThread(Group group, User user, String subject, String content, Set<Attachment> fileUploads); void markRead(User user, GroupThread groupThread); List<GroupThread> getThreads(Group group); - ForumPost createReply( - GroupThread groupThread, - User poster, - String content, - Set<Attachment> attachments - ); + ForumPost createReply(GroupThread groupThread, User poster, String content, Set<Attachment> attachments); List<ForumPost> getPosts(GroupThread groupThread); } diff --git a/core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java index 3e8733a766..00c48751cd 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java +++ b/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( - groupThread.getForumThread(), - poster, - content, - attachments - ); + ForumPost reply = basicForumService.createReply(groupThread.getForumThread(), poster, content, attachments); eventBus.post(new NewGroupForumReplyEvent(groupThread, reply)); return reply; } diff --git a/core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java index bb3cf9ea38..8d956453a7 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java +++ b/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 - extends GenericRepo<GroupThread, Long> - implements GroupThreadRepository { +public class GroupThreadRepositoryImpl extends GenericRepo<GroupThread, Long> implements GroupThreadRepository { @Inject public GroupThreadRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java index 2fdf3b6121..c8f9c3e020 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java +++ b/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( - Project project, - User user, - String subject, - String content, - Set<Attachment> fileUploads - ); + ProjectThread createThread(Project project, User user, String subject, String content, Set<Attachment> fileUploads); - ForumPost createReply( - ProjectThread projectThread, - User poster, - String content, - Set<Attachment> attachments - ); + ForumPost createReply(ProjectThread projectThread, User poster, String content, Set<Attachment> attachments); void markRead(User user, ProjectThread thread); diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java index 041cb9bd01..5de733222a 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java +++ b/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( - projectThread.getForumThread(), - poster, - content, - attachments - ); + ForumPost reply = basicForumService.createReply(projectThread.getForumThread(), poster, content, attachments); reply .getAttachments() .forEach(attachment -> diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java index 938f079f34..f42cbdbe41 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java +++ b/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 - extends GenericRepo<ProjectThread, Long> - implements ProjectThreadRepository { +public class ProjectThreadRepositoryImpl extends GenericRepo<ProjectThread, Long> implements ProjectThreadRepository { @Inject public ProjectThreadRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java b/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java index b49446ab0f..ecc248828e 100644 --- a/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java +++ b/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( - event.getMessage(), - notificationEvent - ); + ForumNotification connection = new ForumNotification(event.getMessage(), notificationEvent); forumNotificationRepository.save(connection); }); } - private void sendAndConnect( - ForumPost post, - Function<NotificationSource, Set<Notification>> send - ) { + private void sendAndConnect(ForumPost post, Function<NotificationSource, Set<Notification>> send) { NotificationSource notificationSource = new NotificationSource(); - notificationSource.setMessage( - String.format("Posted by %s\n\n%s", getPostedBy(post), post.getContent()) - ); + notificationSource.setMessage(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( - forumPostReadEvent.user(), - connection.getNotificationEvent(), - true - ) + notificationService.setRead(forumPostReadEvent.user(), connection.getNotificationEvent(), true) ); } } diff --git a/core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java b/core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java index 6f4f485ae8..d14eedd77c 100644 --- a/core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java +++ b/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( - Paths.get(FileDescription.FILE_ROOT), - "gdpr-report-", - ".zip" - ); + final Path zipFile = Files.createTempFile(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( - ul( - user - .getUsernames() - .stream() - .map(username -> li(textL(username.getUsername()))) - .toList() - ) - ), + dd(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 -> - li(textL(program.getNameEn() + " (" + program.getCode() + ")")) - ) + .map(program -> li(textL(program.getNameEn() + " (" + program.getCode() + ")"))) .toList() ) ) ) ); if (user.getUnit() != null) { - personalInformation.addAll( - List.of(dt("Unit"), dd(text(user.getUnit().getTitle()))) - ); + personalInformation.addAll(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( - List.of(dt("Supervising languages"), dd(text(languages))) - ); + personalInformation.addAll(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( - text( - "GDPR report for " + - user.getFullName() + - " generated on " + - dateString(new Date()) - ) - ), + h1(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 = - gradingReportService.getSupervisorGradingReports(project); + final List<SupervisorGradingReport> gradingReports = 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( - text( - Optional.ofNullable(project.getLanguage()) - .map(Language::name) - .orElse("None") - ) - ) + dd(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( - project.getProjectType(), - user - ); + finalSeminarService.findFinalSeminarOppositionsByOpponentAndProjectType(project.getProjectType(), user); if (!oppositions.isEmpty()) { - List<FinalSeminar> seminars = oppositions - .stream() - .map(FinalSeminarParticipation::getFinalSeminar) - .toList(); + List<FinalSeminar> seminars = oppositions.stream().map(FinalSeminarParticipation::getFinalSeminar).toList(); children.addAll(oppositionsReport("Oppositions", seminars)); } - final List<FinalSeminarActiveParticipation> participations = - finalSeminarService.findUserParticipating(project, user); + final List<FinalSeminarActiveParticipation> participations = finalSeminarService.findUserParticipating( + 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( - user, - project - ); + final List<PeerRequest> peerRequests = peerRequestService.findByRequesterAndProject(user, project); if (!peerRequests.isEmpty()) { children.addAll(peerRequestsReport(peerRequests)); } - final List<PeerReview> peerReviews = peerReviewService.findNonExpiredReviewsByProjectAuthor( - user, - project - ); + final List<PeerReview> peerReviews = peerReviewService.findNonExpiredReviewsByProjectAuthor(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( - final String heading, - final List<FinalSeminar> oppositions - ) { + private List<Node> oppositionsReport(final String heading, final List<FinalSeminar> oppositions) { return Arrays.asList( h4(text(heading)), - ul( - oppositions - .stream() - .map(opposition -> li(finalSeminarParticipantReport(opposition))) - .toList() - ) + ul(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( - Arrays.asList(dt("Started"), dd(text(dateString(peerReview.getDateCreated())))) - ); + nodes.addAll(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( - answer.getMotivation() - ) + Optional.ofNullable(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( - peerRequests - .stream() - .map(peerRequest -> li(peerRequestReport(peerRequest))) - .toList() - ) + ul(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) - throws IOException { + private void copyFiles(final FileSystem zipFileFS, final List<FileDescription> all) throws IOException { final Path uploadedFiles = zipFileFS.getPath("Attachments"); Files.createDirectories(uploadedFiles); for (final FileDescription fileDescription : all) { diff --git a/core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettings.java b/core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettings.java index cddbdec9f7..6f813e29de 100755 --- a/core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettings.java +++ b/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( - this.getExternalGettingStartedWithIdeaURL(), - other.getExternalGettingStartedWithIdeaURL() - ) && + Objects.equals(this.getExternalGettingStartedWithIdeaURL(), other.getExternalGettingStartedWithIdeaURL()) && Objects.equals(this.getExternalGradingURL(), other.getExternalGradingURL()) && this.isFinalSurveyAvailable() == other.isFinalSurveyAvailable() && - Objects.equals( - this.getActiveProjectIdeaSupportMail(), - other.getActiveProjectIdeaSupportMail() - ) + Objects.equals(this.getActiveProjectIdeaSupportMail(), other.getActiveProjectIdeaSupportMail()) ); } diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingBasis.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingBasis.java index 1f4ffa8098..59fac71689 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/GradingBasis.java +++ b/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( - criteria, - overallMotivation, - locked, - rejectionComment, - rejectionCommentFeedback - ); + return Objects.hash(criteria, overallMotivation, locked, rejectionComment, rejectionCommentFeedback); } @Override @@ -151,9 +145,7 @@ public final class GradingBasis { .stream() .mapToInt(Requirement::points) .max() - .orElseThrow(() -> - new IllegalStateException("Criterion without requirements: " + title()) - ); + .orElseThrow(() -> new IllegalStateException("Criterion without requirements: " + title())); } public record Requirement(int points, String description) {} diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java index fd63b20ac2..94d34d8cd0 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java +++ b/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( - project - ); + Collection<SubmissionEvent> submissions = gradingHistoryEventRepository.findSubmissions(project); for (SubmissionEvent submission : submissions) { if (submission.getCorrections() == null || submission.getCorrections().isBlank()) { - events.add( - new Event.InitialSubmission(submission.getWhen(), submission.getAuthor()) - ); + events.add(new Event.InitialSubmission(submission.getWhen(), submission.getAuthor())); } else { events.add( - new Event.Resubmitted( - submission.getWhen(), - submission.getAuthor(), - submission.getCorrections() - ) + new Event.Resubmitted(submission.getWhen(), submission.getAuthor(), submission.getCorrections()) ); } } - Collection<RejectionEvent> rejections = gradingHistoryEventRepository.findRejections( - project - ); + Collection<RejectionEvent> rejections = gradingHistoryEventRepository.findRejections(project); for (RejectionEvent rejection : rejections) { events.add(new Event.Rejected(rejection.getWhen(), rejection.getReason())); } diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java index ba4d062db3..25e99a7ab0 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java +++ b/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 - extends AbstractRepository - implements GradingHistoryEventRepository { +public class GradingHistoryEventRepositoryImpl 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) - .where(QRejectionEvent.rejectionEvent.project.eq(project)) - .fetch(); + return from(QRejectionEvent.rejectionEvent).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) - .where(QApprovedEvent.approvedEvent.project.eq(project)) - .fetch(); + return from(QApprovedEvent.approvedEvent).where(QApprovedEvent.approvedEvent.project.eq(project)).fetch(); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingReportTemplateUpdate.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingReportTemplateUpdate.java index 44401f767d..3e61581ab9 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/GradingReportTemplateUpdate.java +++ b/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 ( - gradeLimit1 != gradeLimit2 && - gradeLimit1.minimumPoints() == gradeLimit2.minimumPoints() - ) { + if (gradeLimit1 != gradeLimit2 && gradeLimit1.minimumPoints() == gradeLimit2.minimumPoints()) { throw new IllegalArgumentException( "Duplicate minimum points on grades: %s and %s".formatted( gradeLimit1.grade(), diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingService.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingService.java index 45151fa9e2..e8e6cbf91c 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/GradingService.java +++ b/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( - String token, - long projectId, - long authorId, - long examinationId - ); + Either<GetGradeError, Optional<Result>> getResult(String token, long projectId, long authorId, long examinationId); Either<ReportGradeError, Void> reportGrade( String token, diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java index 4a223e759d..ac6633a11f 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java +++ b/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( - final String token, - final long projectId, - final long authorId - ) { + public List<Examination> getExaminations(final String token, final long projectId, final long authorId) { final WebTarget client = service(); final Response response = client .path("thesis") diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingTypeConverter.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingTypeConverter.java index ce808eb356..97593806d3 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/GradingTypeConverter.java +++ b/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) - throws IOException { + public Grade.Type deserialize(final JsonParser p, final DeserializationContext ctxt) 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( - p, - "Invalid grade type", - text, - Grade.Type.class - ); + throw new InvalidFormatException(p, "Invalid grade type", text, Grade.Type.class); } } throw new InvalidFormatException(p, "Grade type must be a string", null, Grade.Type.class); diff --git a/core/src/main/java/se/su/dsv/scipro/grading/Name.java b/core/src/main/java/se/su/dsv/scipro/grading/Name.java index 4cdf0a89d6..718f353959 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/Name.java +++ b/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( - @JsonProperty("swedish") String swedish, - @JsonProperty("english") String english -) {} +public record Name(@JsonProperty("swedish") String swedish, @JsonProperty("english") String english) {} diff --git a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java index 313dc9f56e..06a435f102 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java +++ b/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( - QNationalSubjectCategory.nationalSubjectCategory - ) + NationalSubjectCategory nationalSubjectCategory = from(QNationalSubjectCategory.nationalSubjectCategory) .where(QNationalSubjectCategory.nationalSubjectCategory.externalId.eq(externalId)) .select(QNationalSubjectCategory.nationalSubjectCategory) .fetchOne(); diff --git a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java index c6d87dd111..921c83860e 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java +++ b/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( - NationalSubjectCategoryRepository nationalSubjectCategoryRepository - ) { + public NationalSubjectCategoryServiceImpl(NationalSubjectCategoryRepository nationalSubjectCategoryRepository) { this.nationalSubjectCategoryRepository = nationalSubjectCategoryRepository; } diff --git a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java index 67196e6d1f..3feb93ee35 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java +++ b/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 - extends AbstractRepository - implements PublicationMetadataRepository { +public class PublicationMetadataRepositoryImpl extends AbstractRepository implements PublicationMetadataRepository { @Inject public PublicationMetadataRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataService.java b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataService.java index 1c23074a6b..7e3118d786 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataService.java +++ b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataService.java @@ -7,8 +7,5 @@ public interface PublicationMetadataService { void save(PublicationMetadata publicationMetadata); - boolean hasSuppliedPublicationMetadata( - Project project, - boolean noNationalSubjectCategoriesAvailable - ); + boolean hasSuppliedPublicationMetadata(Project project, boolean noNationalSubjectCategoriesAvailable); } diff --git a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java index 4ec2e40fad..5a504df56a 100644 --- a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java +++ b/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( - PublicationMetadataRepository publicationMetadataRepository - ) { + public PublicationMetadataServiceImpl(PublicationMetadataRepository publicationMetadataRepository) { this.publicationMetadataRepository = publicationMetadataRepository; } @@ -34,15 +32,11 @@ public class PublicationMetadataServiceImpl implements PublicationMetadataServic } @Override - public boolean hasSuppliedPublicationMetadata( - Project project, - boolean noNationalSubjectCategoriesAvailable - ) { + public boolean hasSuppliedPublicationMetadata(Project project, boolean noNationalSubjectCategoriesAvailable) { final PublicationMetadata metadata = getByProject(project); return ( notBlank(metadata.getAbstractEnglish()) && - (project.getLanguage() == Language.ENGLISH || - notBlank(metadata.getAbstractSwedish())) && + (project.getLanguage() == Language.ENGLISH || notBlank(metadata.getAbstractSwedish())) && (noNationalSubjectCategoriesAvailable || metadata.getNationalSubjectCategory() != null) ); } diff --git a/core/src/main/java/se/su/dsv/scipro/group/GroupFacadeImpl.java b/core/src/main/java/se/su/dsv/scipro/group/GroupFacadeImpl.java index b47541913e..640aa7eb62 100755 --- a/core/src/main/java/se/su/dsv/scipro/group/GroupFacadeImpl.java +++ b/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 ( - project.getHeadSupervisor().equals(user) || - project.getCoSupervisors().contains(user) - ) { + if (project.getHeadSupervisor().equals(user) || project.getCoSupervisors().contains(user)) { return true; } } diff --git a/core/src/main/java/se/su/dsv/scipro/group/GroupService.java b/core/src/main/java/se/su/dsv/scipro/group/GroupService.java index 24af0edcba..9c73a665e1 100755 --- a/core/src/main/java/se/su/dsv/scipro/group/GroupService.java +++ b/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 - extends GenericService<Group, Long>, FilteredService<Group, Long, GroupService.Filter> { +public interface GroupService extends GenericService<Group, Long>, FilteredService<Group, Long, GroupService.Filter> { List<Group> findAll(final Filter filter); class Filter implements Serializable { diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepository.java b/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepository.java index 4c4be3b87a..94fdbb7801 100644 --- a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepository.java +++ b/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 - JpaRepository<ActivityFinalSeminar, Long>, QueryDslPredicateExecutor<ActivityFinalSeminar> { + extends JpaRepository<ActivityFinalSeminar, Long>, QueryDslPredicateExecutor<ActivityFinalSeminar> { Optional<ActivityFinalSeminar> findByFinalSeminar(FinalSeminar finalSeminar); } diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java index 6ba4c45396..4d944e9123 100644 --- a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java +++ b/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( - findOne(QActivityFinalSeminar.activityFinalSeminar.finalSeminar.eq(finalSeminar)) - ); + return Optional.ofNullable(findOne(QActivityFinalSeminar.activityFinalSeminar.finalSeminar.eq(finalSeminar))); } } diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java b/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java index b38cf98d07..3537a2baec 100644 --- a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java +++ b/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( - final FinalSeminar finalSeminar, - final Date finalSeminarStartDate - ) { + private void synchronizeFinalSeminarActivity(final FinalSeminar finalSeminar, final Date finalSeminarStartDate) { final Optional<ActivityFinalSeminar> optFinalSeminarActivity = activityFinalSeminarRepository.findByFinalSeminar(finalSeminar); if (optFinalSeminarActivity.isPresent()) { - updateActivity( - optFinalSeminarActivity.get().getActivity(), - finalSeminar.getStartDate() - ); + updateActivity(optFinalSeminarActivity.get().getActivity(), finalSeminar.getStartDate()); } else { createNewActivity(finalSeminar, finalSeminarStartDate); } } - private void createNewActivity( - final FinalSeminar finalSeminar, - final Date finalSeminarStartDate - ) { + private void createNewActivity(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( - savedActivity, - finalSeminar - ); + final ActivityFinalSeminar finalSeminarActivity = new ActivityFinalSeminar(savedActivity, finalSeminar); activityFinalSeminarRepository.save(finalSeminarActivity); } diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThread.java b/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThread.java index 26d2ffa25d..279cf1fd61 100644 --- a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThread.java +++ b/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThread.java @@ -148,13 +148,7 @@ class ActivityThread { @Override public String toString() { - return ( - "ActivityThread.Id(threadId=" + - this.getThreadId() + - ", activityId=" + - this.getActivityId() + - ")" - ); + return ("ActivityThread.Id(threadId=" + this.getThreadId() + ", activityId=" + this.getActivityId() + ")"); } } } diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java b/core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java index b81865dc9d..ecb14239ec 100644 --- a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java +++ b/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( - activity - ); + final Optional<ProjectThread> activityThread = activityThreadRepository.findByActivity(activity); if (activityThread.isPresent()) { final ProjectThread projectThread = activityThread.get(); projectForumService.createReply( diff --git a/core/src/main/java/se/su/dsv/scipro/mail/Failure.java b/core/src/main/java/se/su/dsv/scipro/mail/Failure.java index cc321727ae..3b4cd3278f 100644 --- a/core/src/main/java/se/su/dsv/scipro/mail/Failure.java +++ b/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: " + - Arrays.toString(getAllRecipients()) + "Failed to deliver the mail to all recipients. Specified recipients: " + Arrays.toString(getAllRecipients()) ); if (exception.getValidSentAddresses() != null) { logger.info("Delivered to: " + Arrays.toString(exception.getValidSentAddresses())); } if (exception.getValidUnsentAddresses() != null) { - logger.warn( - "Could not deliver to: " + Arrays.toString(exception.getValidUnsentAddresses()) - ); + logger.warn("Could not deliver to: " + Arrays.toString(exception.getValidUnsentAddresses())); } if (exception.getInvalidAddresses() != null) { - logger.error( - "Invalid email found: " + Arrays.toString(exception.getInvalidAddresses()) - ); + logger.error("Invalid email found: " + Arrays.toString(exception.getInvalidAddresses())); } } } diff --git a/core/src/main/java/se/su/dsv/scipro/mail/MailEventService.java b/core/src/main/java/se/su/dsv/scipro/mail/MailEventService.java index 6ac14374bd..4d791ee279 100755 --- a/core/src/main/java/se/su/dsv/scipro/mail/MailEventService.java +++ b/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 - GenericService<MailEvent, Long>, FilteredService<MailEvent, Long, MailEventService.Filter> { + extends 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( - this.getUser(), - this.getSubject(), - this.getSentAfter(), - this.getSentBefore() - ); + return Objects.hash(this.getUser(), this.getSubject(), this.getSentAfter(), this.getSentBefore()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java index 83b3e16ef2..3ec82255ca 100755 --- a/core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java +++ b/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 - extends AbstractServiceImpl<MailEvent, Long> - implements MailEventService { +public class MailEventServiceImpl extends AbstractServiceImpl<MailEvent, Long> implements MailEventService { @Inject public MailEventServiceImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java b/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java index 5d3f02ef2a..347c3da80d 100755 --- a/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java @@ -37,8 +37,7 @@ public class MailEventWorker extends AbstractWorker { return; } - GeneralSystemSettings systemSettings = - systemSettingsService.getGeneralSystemSettingsInstance(); + GeneralSystemSettings systemSettings = 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( - mailEvent.getFromName(), - systemSettings.getMailFromName() - ); + String fromName = Objects.requireNonNullElse(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() + - mailEvent.getNonUserRecipients().size()]; + final String[] recipientsEmails = new String[recipients.size() + mailEvent.getNonUserRecipients().size()]; int i = 0; for (User u : recipients) { recipientsEmails[i] = u.getEmailAddress(); diff --git a/core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java b/core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java index 213fd3d3c6..427eca3af6 100644 --- a/core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java +++ b/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( - final Session session, - final String redirectTo, - FileService fileDescriptionService - ) { + public RedirectingMailer(final Session session, final String redirectTo, FileService fileDescriptionService) { super(session, fileDescriptionService); this.redirectTo = redirectTo; } diff --git a/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java b/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java index d7ea8925cf..dccf244fce 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java +++ b/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java @@ -19,10 +19,7 @@ public class AddActivityPlanOnProjectStart { } @Inject - public AddActivityPlanOnProjectStart( - final ActivityPlanFacade activityPlanFacade, - final EventBus eventBus - ) { + public AddActivityPlanOnProjectStart(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( - project, - template, - Date.from(courseStartDate) - ); + activityPlanFacade.addActivitiesFromTemplate(project, template, Date.from(courseStartDate)); }); } } diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriod.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriod.java index 7bb4fbea90..9dc48661d9 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriod.java +++ b/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( - fetch = FetchType.LAZY, - mappedBy = "applicationPeriod", - cascade = CascadeType.ALL, - orphanRemoval = true - ) + @OneToMany(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( - fetch = FetchType.LAZY, - mappedBy = "applicationPeriod", - cascade = CascadeType.ALL, - orphanRemoval = true - ) + @OneToMany(fetch = FetchType.LAZY, mappedBy = "applicationPeriod", cascade = CascadeType.ALL, orphanRemoval = true) private Set<ApplicationPeriodExemption> applicationPeriodExemptions = new HashSet<>(); - @OneToMany( - fetch = FetchType.LAZY, - mappedBy = "applicationPeriod", - cascade = CascadeType.ALL, - orphanRemoval = true - ) + @OneToMany(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( - final Set<ApplicationPeriodExemption> applicationPeriodExemptions - ) { + public void setApplicationPeriodExemptions(final Set<ApplicationPeriodExemption> applicationPeriodExemptions) { this.applicationPeriodExemptions = new HashSet<>(applicationPeriodExemptions); } @@ -96,11 +79,7 @@ public class ApplicationPeriod extends DomainObject { } public long noOfExemptedStudents() { - return applicationPeriodExemptions - .stream() - .map(ApplicationPeriodExemption::getUser) - .distinct() - .count(); + return applicationPeriodExemptions.stream().map(ApplicationPeriodExemption::getUser).distinct().count(); } public boolean hasApplicationPeriodExemptions() { diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodExemption.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodExemption.java index 3858a7887b..8df4af1ba6 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodExemption.java +++ b/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 = - new ApplicationPeriodExemptionId(); + private ApplicationPeriodExemptionId applicationperiodexemptionId = new ApplicationPeriodExemptionId(); @MapsId("studentId") @ManyToOne(optional = false) @@ -90,9 +89,7 @@ public class ApplicationPeriodExemption implements Serializable { return this.grantedOn; } - public void setApplicationperiodexemptionId( - ApplicationPeriodExemptionId applicationperiodexemptionId - ) { + public void setApplicationperiodexemptionId(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( - this.getApplicationperiodexemptionId(), - other.getApplicationperiodexemptionId() - ) && + Objects.equals(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( - this.getApplicationperiodexemptionId(), - this.getEndDate(), - this.getType() - ); + return Objects.hash(this.getApplicationperiodexemptionId(), this.getEndDate(), this.getType()); } } diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectType.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectType.java index 3536696c00..83be7f857d 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectType.java +++ b/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 = - new ApplicationPeriodProjectTypeId(); + private ApplicationPeriodProjectTypeId applicationPeriodProjectTypeId = new ApplicationPeriodProjectTypeId(); @MapsId("applicationPeriodId") @ManyToOne @@ -34,10 +33,7 @@ public class ApplicationPeriodProjectType implements Serializable { protected ApplicationPeriodProjectType() {} - public ApplicationPeriodProjectType( - ApplicationPeriod applicationPeriod, - ProjectType projectType - ) { + public ApplicationPeriodProjectType(ApplicationPeriod applicationPeriod, ProjectType projectType) { this.applicationPeriod = applicationPeriod; this.projectType = projectType; } diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeService.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeService.java index 0a7026069e..a142a808d2 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeService.java +++ b/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( - ApplicationPeriod applicationPeriod, - ProjectType projectType - ); + ApplicationPeriodProjectType findOne(ApplicationPeriod applicationPeriod, ProjectType projectType); } diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java index 173f9543b1..1f2de009fa 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java +++ b/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( - em, - ApplicationPeriodProjectType.class, - QApplicationPeriodProjectType.applicationPeriodProjectType - ); + super(em, ApplicationPeriodProjectType.class, QApplicationPeriodProjectType.applicationPeriodProjectType); } @Override - public ApplicationPeriodProjectType findOne( - ApplicationPeriod applicationPeriod, - ProjectType projectType - ) { + public ApplicationPeriodProjectType findOne(ApplicationPeriod applicationPeriod, ProjectType projectType) { return findOne(byApplicationPeriod(applicationPeriod).and(byProjectType(projectType))); } public static BooleanExpression byApplicationPeriod(ApplicationPeriod applicationPeriod) { - return QApplicationPeriodProjectType.applicationPeriodProjectType.applicationPeriod.eq( - applicationPeriod - ); + return QApplicationPeriodProjectType.applicationPeriodProjectType.applicationPeriod.eq(applicationPeriod); } public static BooleanExpression byProjectType(ProjectType projectType) { - return QApplicationPeriodProjectType.applicationPeriodProjectType.projectType.eq( - projectType - ); + return QApplicationPeriodProjectType.applicationPeriodProjectType.projectType.eq(projectType); } } diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodService.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodService.java index 1bd66284b5..f4c672c731 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodService.java +++ b/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( - ApplicationPeriod applicationPeriod, - int limit - ); + Collection<ApplicationPeriod> getPreviousPeriods(ApplicationPeriod applicationPeriod, int limit); ApplicationPeriod getCurrentPeriod(final ProjectType pc); ApplicationPeriod getPreviousPeriodByProjectType(ProjectType projectType); boolean courseStartHasPassed(final ApplicationPeriod ap); diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java index 8fe325f0af..74bd3c6256 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java +++ b/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.applicationPeriodExemption; + QApplicationPeriodExemption exemption = QApplicationPeriodExemption.applicationPeriodExemption; final List<ApplicationPeriodExemption> currentExemptions = from(exemption) .where( - allOf( - exemption.user.eq(student), - anyOf(exemption.endDate.goe(currentDate), exemption.endDate.isNull()) - ) + allOf(exemption.user.eq(student), anyOf(exemption.endDate.goe(currentDate), exemption.endDate.isNull())) ) .fetch(); - final Map<ApplicationPeriod, List<ApplicationPeriodExemption.Type>> periodExemptions = - currentExemptions - .stream() - .collect( - Collectors.groupingBy( - ApplicationPeriodExemption::getApplicationPeriod, - Collectors.mapping(ApplicationPeriodExemption::getType, Collectors.toList()) - ) - ); + final Map<ApplicationPeriod, List<ApplicationPeriodExemption.Type>> periodExemptions = currentExemptions + .stream() + .collect( + Collectors.groupingBy( + ApplicationPeriodExemption::getApplicationPeriod, + 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 ( - student.getDegreeType() == DegreeType.NONE || - hasTypeExemption(applicationPeriod, student) - ) { + if (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( - applicationPeriod, - student, - ApplicationPeriodExemption.Type.PROJECT_TYPE - ) + getExemptionForExemptionType(applicationPeriod, student, ApplicationPeriodExemption.Type.PROJECT_TYPE) ); } @@ -127,8 +115,7 @@ public class ApplicationPeriodServiceImpl User student, ApplicationPeriodExemption.Type type ) { - final QApplicationPeriodExemption QApe = - QApplicationPeriodExemption.applicationPeriodExemption; + final QApplicationPeriodExemption QApe = QApplicationPeriodExemption.applicationPeriodExemption; return from(QApe) .where( allOf( @@ -144,27 +131,18 @@ public class ApplicationPeriodServiceImpl public boolean hasIdeaSizeExemption(User student, ApplicationPeriod applicationPeriod) { return ( null != - getExemptionForExemptionType( - applicationPeriod, - student, - ApplicationPeriodExemption.Type.NUMBER_OF_AUTHORS - ) + getExemptionForExemptionType(applicationPeriod, student, ApplicationPeriodExemption.Type.NUMBER_OF_AUTHORS) ); } @Override public List<ApplicationPeriod> getCurrentSupervisorPeriods(final User supervisor) { LocalDateTime now = LocalDateTime.now(clock); - return findAll( - Expressions.allOf(startedBeforeOrAt(now.toLocalDate()), courseStartAfterOrAt(now)) - ); + return findAll(Expressions.allOf(startedBeforeOrAt(now.toLocalDate()), courseStartAfterOrAt(now))); } @Override - public Collection<ApplicationPeriod> getPreviousPeriods( - ApplicationPeriod applicationPeriod, - int limit - ) { + public Collection<ApplicationPeriod> getPreviousPeriods(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( - startedBeforeOrAt(currentDate).and(endedAfterOrAt(currentDate)).and(haveProjectType(pc)) - ); + return findOne(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( - ap, - student, - ApplicationPeriodExemption.Type.SELECT_SUPERVISOR_IDEA - ); + return hasCurrentExemption(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( - applicationPeriod, - student, - type - ); + final ApplicationPeriodExemption exemption = getExemptionForExemptionType(applicationPeriod, student, type); return exemption != null && !today.isAfter(exemption.getEndDate()); } @Override - public boolean hasCurrentSubmitIdeaExemption( - ApplicationPeriod applicationPeriod, - User student - ) { - return hasCurrentExemption( - applicationPeriod, - student, - ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA - ); + public boolean hasCurrentSubmitIdeaExemption(ApplicationPeriod applicationPeriod, 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( - QApplicationPeriod.applicationPeriod.courseStartDateTime.after(LocalDateTime.now(clock)) - ); + return findAll(QApplicationPeriod.applicationPeriod.courseStartDateTime.after(LocalDateTime.now(clock))); } @Override public boolean isVisibleForSupervisors(final ApplicationPeriod applicationPeriod) { final LocalDate now = LocalDate.now(clock); - return !( - now.isBefore(applicationPeriod.getStartDate()) || - now.isAfter(applicationPeriod.getCourseStartDate()) - ); + return !(now.isBefore(applicationPeriod.getStartDate()) || now.isAfter(applicationPeriod.getCourseStartDate())); } - private boolean periodsOverlap( - LocalDate p1Start, - LocalDate p1End, - LocalDate p2Start, - LocalDate p2End - ) { + private boolean periodsOverlap(LocalDate p1Start, LocalDate p1End, LocalDate p2Start, LocalDate p2End) { return p2Start.isBefore(p1End) && p2End.isAfter(p1Start); } - private boolean isEditing( - final ApplicationPeriod newPeriod, - final ApplicationPeriod foundPeriod - ) { + private boolean isEditing(final ApplicationPeriod newPeriod, final ApplicationPeriod foundPeriod) { return (newPeriod.getId() != null && newPeriod.equals(foundPeriod)); } - private boolean projectTypeMatch( - final Set<ProjectType> fromNewPeriod, - final Set<ProjectType> fromOldPeriod - ) { + private boolean projectTypeMatch(final Set<ProjectType> fromNewPeriod, final Set<ProjectType> fromOldPeriod) { for (ProjectType projectType : fromNewPeriod) { if (fromOldPeriod.contains(projectType)) { return true; diff --git a/core/src/main/java/se/su/dsv/scipro/match/ExemptedPeriod.java b/core/src/main/java/se/su/dsv/scipro/match/ExemptedPeriod.java index e7b4772384..43db4f3934 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/ExemptedPeriod.java +++ b/core/src/main/java/se/su/dsv/scipro/match/ExemptedPeriod.java @@ -9,10 +9,7 @@ public final class ExemptedPeriod extends StudentPeriod implements Serializable private final ApplicationPeriod applicationPeriod; private final List<ApplicationPeriodExemption.Type> exemptions; - public ExemptedPeriod( - ApplicationPeriod applicationPeriod, - List<ApplicationPeriodExemption.Type> exemptions - ) { + public ExemptedPeriod(ApplicationPeriod applicationPeriod, List<ApplicationPeriodExemption.Type> exemptions) { this.applicationPeriod = applicationPeriod; this.exemptions = exemptions; } diff --git a/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java index 85300d04bd..2f225178af 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java @@ -5,9 +5,7 @@ import jakarta.inject.Provider; import jakarta.persistence.EntityManager; import se.su.dsv.scipro.system.GenericRepo; -public class FirstMeetingRepositoryImpl - extends GenericRepo<FirstMeeting, Long> - implements FirstMeetingRepository { +public class FirstMeetingRepositoryImpl extends GenericRepo<FirstMeeting, Long> implements FirstMeetingRepository { @Inject public FirstMeetingRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/match/Idea.java b/core/src/main/java/se/su/dsv/scipro/match/Idea.java index bb8aa54e57..c98f1bc7ec 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/Idea.java +++ b/core/src/main/java/se/su/dsv/scipro/match/Idea.java @@ -103,14 +103,8 @@ public class Idea extends DomainObject { name = "theoryHow", column = @Column(name = "theory_how", insertable = false, updatable = false) ), - @AttributeOverride( - name = "what", - column = @Column(name = "what", insertable = false, updatable = false) - ), - @AttributeOverride( - name = "why", - column = @Column(name = "why", insertable = false, updatable = false) - ), + @AttributeOverride(name = "what", column = @Column(name = "what", insertable = false, updatable = false)), + @AttributeOverride(name = "why", column = @Column(name = "why", insertable = false, updatable = false)), @AttributeOverride( name = "literature", column = @Column(name = "literature", insertable = false, updatable = false) @@ -178,10 +172,7 @@ public class Idea extends DomainObject { // from table idea_language @ElementCollection - @CollectionTable( - name = "idea_language", - joinColumns = @JoinColumn(name = "idea_id", referencedColumnName = "id") - ) + @CollectionTable(name = "idea_language", joinColumns = @JoinColumn(name = "idea_id", referencedColumnName = "id")) @Column(name = "language") @Enumerated(EnumType.STRING) private Set<Language> languages = EnumSet.noneOf(Language.class); @@ -191,12 +182,7 @@ public class Idea extends DomainObject { private List<IdeaExport> exports = new ArrayList<>(); // from table idea_student - @OneToMany( - fetch = FetchType.LAZY, - mappedBy = "idea", - cascade = CascadeType.ALL, - orphanRemoval = true - ) + @OneToMany(fetch = FetchType.LAZY, mappedBy = "idea", cascade = CascadeType.ALL, orphanRemoval = true) @QueryInit({ "user", "program" }) private Set<IdeaParticipation> ideaParticipations = new HashSet<>(); @@ -532,9 +518,7 @@ public class Idea extends DomainObject { if (o == this) return true; if (!(o instanceof Idea)) return false; final Idea other = (Idea) o; - return ( - other.canEqual(this) && super.equals(o) && Objects.equals(this.getId(), other.getId()) - ); + return (other.canEqual(this) && super.equals(o) && Objects.equals(this.getId(), other.getId())); } protected boolean canEqual(final Object other) { diff --git a/core/src/main/java/se/su/dsv/scipro/match/IdeaExport.java b/core/src/main/java/se/su/dsv/scipro/match/IdeaExport.java index 0dfcef8d05..df0bf944ed 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/IdeaExport.java +++ b/core/src/main/java/se/su/dsv/scipro/match/IdeaExport.java @@ -111,13 +111,7 @@ public class IdeaExport extends DomainObject { @Override public String toString() { return ( - "IdeaExport(id=" + - this.getId() + - ", result=" + - this.getResult() + - ", reason=" + - this.getReason() + - ")" + "IdeaExport(id=" + this.getId() + ", result=" + this.getResult() + ", reason=" + this.getReason() + ")" ); } } diff --git a/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java b/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java index 22e195b7fa..7e42cba7a5 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java +++ b/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java @@ -28,17 +28,10 @@ public class IdeaFacade implements Serializable { params.setPublished(true); Iterable<Idea> ideas = ideaService.findAll(params); List<Idea> ideasWithinLimits = new ArrayList<>(); - final List<ProjectType> validTypes = applicationPeriodService.getTypesForStudent( - applicationPeriod, - student - ); + final List<ProjectType> validTypes = applicationPeriodService.getTypesForStudent(applicationPeriod, student); for (Idea idea : ideas) { if ( - targetService.hasTargetsLeft( - applicationPeriod, - idea.getMatch().getSupervisor(), - idea.getProjectType() - ) + targetService.hasTargetsLeft(applicationPeriod, idea.getMatch().getSupervisor(), idea.getProjectType()) ) { if (validTypes.contains(idea.getProjectType())) { ideasWithinLimits.add(idea); @@ -56,17 +49,10 @@ public class IdeaFacade implements Serializable { params.setPublished(true); Iterable<Idea> ideas = ideaService.findAll(params); List<Idea> ideasWithinLimits = new ArrayList<>(); - final List<ProjectType> validTypes = applicationPeriodService.getTypesForStudent( - applicationPeriod, - student - ); + final List<ProjectType> validTypes = applicationPeriodService.getTypesForStudent(applicationPeriod, student); for (Idea idea : ideas) { if ( - targetService.hasTargetsLeft( - applicationPeriod, - idea.getMatch().getSupervisor(), - idea.getProjectType() - ) + targetService.hasTargetsLeft(applicationPeriod, idea.getMatch().getSupervisor(), idea.getProjectType()) ) { if (validTypes.contains(idea.getProjectType())) { ideasWithinLimits.add(idea); diff --git a/core/src/main/java/se/su/dsv/scipro/match/IdeaService.java b/core/src/main/java/se/su/dsv/scipro/match/IdeaService.java index 4676e73f8c..f0713990a3 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/IdeaService.java +++ b/core/src/main/java/se/su/dsv/scipro/match/IdeaService.java @@ -12,8 +12,7 @@ import se.su.dsv.scipro.system.Pageable; import se.su.dsv.scipro.util.Either; import se.su.dsv.scipro.util.Pair; -public interface IdeaService - extends GenericService<Idea, Long>, FilteredService<Idea, Long, IdeaService.Filter> { +public interface IdeaService extends GenericService<Idea, Long>, FilteredService<Idea, Long, IdeaService.Filter> { Idea savePartnerProgram(Idea idea, User student, Program program); Long countMatched(ApplicationPeriod ap, User supervisor, ProjectType pc); Iterable<Idea> findAuthorIdeas(User author, Pageable pageable); @@ -54,17 +53,9 @@ public interface IdeaService void studentUnselect(Idea idea, User student); String getStatusString(Idea idea); boolean authorParticipatingOnActiveIdea(User author, ApplicationPeriod ap); - boolean authorParticipatingOnOtherActiveIdea( - User author, - ApplicationPeriod ap, - final Idea except - ); + boolean authorParticipatingOnOtherActiveIdea(User author, ApplicationPeriod ap, final Idea except); void inactivateIdea(Idea idea, boolean state, User creator); - Long countByApplicationPeriodAndType( - ApplicationPeriod applicationPeriod, - Type type, - Filter params - ); + Long countByApplicationPeriodAndType(ApplicationPeriod applicationPeriod, Type type, Filter params); Long countByApplicationPeriodAndProjectType( ApplicationPeriod applicationPeriod, ProjectType projectType, diff --git a/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java index 6728cb6f8c..08845a8a3f 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java @@ -42,22 +42,19 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements public static final String VALIDATION_PASSED = "Validation passed"; public static final String NO_LONGER_AVAILABLE_ERROR = "Idea is no longer available"; - public static final String ALREADY_PARTICIPATING_ERROR = - "You are already participating in another idea"; + public static final String ALREADY_PARTICIPATING_ERROR = "You are already participating in another idea"; public static final String PARTNER_ALREADY_PARTICIPATING_ERROR = "Your partner is already participating in another idea"; public static final String BACHELOR_NEED_PARTNER_ERROR = "You need to select a partner when the idea is on bachelor level"; - public static final String ADD_SELF_AS_PARTNER_ERROR = - "You may not add yourself as project partner"; + public static final String ADD_SELF_AS_PARTNER_ERROR = "You may not add yourself as project partner"; public static final String NO_AUTHORS_ERROR = "The idea is submitted by a student, number of students is not allowed"; public static final int TITLE_LENGTH = 3; public static final long EMPTY = 0; private static final String WRONG_LEVEL_FOR_YOUR_PARTNER = "The idea is the wrong level for your partner, please pick another one."; - private static final String WRONG_LEVEL_FOR_YOU = - "The idea is the wrong level for you, please pick another one."; + private static final String WRONG_LEVEL_FOR_YOU = "The idea is the wrong level for you, please pick another one."; public static final String ALREADY_HAVE_AN_ACTIVE_PROJECT = "You already have an active project on this level. You have to contact {0} to have it cancelled before you can pick a new idea."; public static final String PARTNER_ALREADY_HAS_ACTIVE_PROJECT = @@ -123,8 +120,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements @Override public Iterable<Idea> findReadyToStart() { DateExpression<LocalDateTime> currentDate = DateExpression.currentDate(LocalDateTime.class); - DateTimeExpression<LocalDateTime> courseStartDate = - QIdea.idea.applicationPeriod.courseStartDateTime; + DateTimeExpression<LocalDateTime> courseStartDate = QIdea.idea.applicationPeriod.courseStartDateTime; return findAll( allOf( QIdea.idea.cachedStatus.eq(Status.MATCHED), @@ -194,16 +190,11 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements public Either<SelectionError, Idea> supervisorAcceptIdea(Idea idea, User supervisor) { Target target = getTarget(idea.getApplicationPeriod(), supervisor, idea.getProjectType()); boolean targetsLeft = - target.getTarget() > - countMatched(idea.getApplicationPeriod(), supervisor, idea.getProjectType()); + target.getTarget() > countMatched(idea.getApplicationPeriod(), supervisor, idea.getProjectType()); return validateSupervisorAcceptance(idea, targetsLeft, supervisor); } - public Target getTarget( - ApplicationPeriod applicationPeriod, - User supervisor, - ProjectType projectType - ) { + public Target getTarget(ApplicationPeriod applicationPeriod, User supervisor, ProjectType projectType) { return targetRepository.getTarget(supervisor, applicationPeriod, projectType); } @@ -228,11 +219,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements ) { return new Pair<>(Boolean.FALSE, BACHELOR_NEED_PARTNER_ERROR); } - if ( - !projectService - .getActiveProjectsByUserAndProjectType(creator, idea.getProjectType()) - .isEmpty() - ) { + if (!projectService.getActiveProjectsByUserAndProjectType(creator, idea.getProjectType()).isEmpty()) { return new Pair<>( Boolean.FALSE, MessageFormat.format( @@ -254,11 +241,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements ) { return new Pair<>(Boolean.FALSE, WRONG_LEVEL_FOR_YOUR_PARTNER); } - if ( - !projectService - .getActiveProjectsByUserAndProjectType(coAuthor, idea.getProjectType()) - .isEmpty() - ) { + if (!projectService.getActiveProjectsByUserAndProjectType(coAuthor, idea.getProjectType()).isEmpty()) { return new Pair<>( Boolean.FALSE, MessageFormat.format( @@ -271,10 +254,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements if (authorParticipatingOnActiveIdea(creator, ap)) { return new Pair<>(Boolean.FALSE, ALREADY_PARTICIPATING_ERROR); } - final List<ProjectType> typesForStudent = applicationPeriodService.getTypesForStudent( - ap, - creator - ); + final List<ProjectType> typesForStudent = applicationPeriodService.getTypesForStudent(ap, creator); if (!typesForStudent.contains(idea.getProjectType())) { return new Pair<>(Boolean.FALSE, WRONG_LEVEL_FOR_YOU); } @@ -296,11 +276,10 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements return new Pair<>(Boolean.FALSE, NO_AUTHORS_ERROR); } } else { - final ApplicationPeriod currentPeriod = applicationPeriodService.getCurrentPeriod( + final ApplicationPeriod currentPeriod = applicationPeriodService.getCurrentPeriod(idea.getProjectType()); + final ApplicationPeriod previousPeriod = applicationPeriodService.getPreviousPeriodByProjectType( idea.getProjectType() ); - final ApplicationPeriod previousPeriod = - applicationPeriodService.getPreviousPeriodByProjectType(idea.getProjectType()); if (currentPeriod == null && previousPeriod == null) { return new Pair<>( @@ -314,10 +293,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements !authors .stream() .allMatch(author -> - applicationPeriodService.hasIdeaSizeExemption( - author, - idea.getApplicationPeriod() - ) + applicationPeriodService.hasIdeaSizeExemption(author, idea.getApplicationPeriod()) ) ) { return new Pair<>(Boolean.FALSE, "Selected number of authors is not allowed"); @@ -335,12 +311,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements @Override @Transactional - public Idea saveSupervisorIdea( - Idea idea, - User supervisor, - List<Keyword> keywords, - boolean newIdea - ) { + public Idea saveSupervisorIdea(Idea idea, User supervisor, List<Keyword> keywords, boolean newIdea) { Set<Keyword> keywordSet = new HashSet<>(keywords); Idea theIdea = idea; theIdea.setKeywords(keywordSet); @@ -391,9 +362,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements added.add(partner); } } - final Iterator<IdeaParticipation> currentParticipants = idea - .getIdeaParticipations() - .iterator(); + final Iterator<IdeaParticipation> currentParticipants = idea.getIdeaParticipations().iterator(); while (currentParticipants.hasNext()) { IdeaParticipation participant = currentParticipants.next(); final User user = participant.getUser(); @@ -501,11 +470,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements ) { Idea theIdea = acceptIdea0(idea, creator, accepteeProgram, coAuthor, applicationPeriod); - notificationController.notifyIdea( - theIdea, - IdeaEvent.Event.PARTNER_ACCEPT, - new NotificationSource() - ); + notificationController.notifyIdea(theIdea, IdeaEvent.Event.PARTNER_ACCEPT, new NotificationSource()); return theIdea; } @@ -541,14 +506,10 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements } if (reloaded.getApplicationPeriod() == null) { if (applicationPeriodService.getCurrentPeriod(reloaded.getProjectType()) != null) { - reloaded.setApplicationPeriod( - applicationPeriodService.getCurrentPeriod(idea.getProjectType()) - ); + reloaded.setApplicationPeriod(applicationPeriodService.getCurrentPeriod(idea.getProjectType())); } else { reloaded.setApplicationPeriod( - applicationPeriodService.getPreviousPeriodByProjectType( - reloaded.getProjectType() - ) + applicationPeriodService.getPreviousPeriodByProjectType(reloaded.getProjectType()) ); } } @@ -559,11 +520,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements } } - private void unmatch( - final Idea idea, - final User unmatcher, - final NotificationSource notificationSource - ) { + private void unmatch(final Idea idea, final User unmatcher, final NotificationSource notificationSource) { idea.getIdeaParticipations().removeAll(idea.getIdeaParticipations()); if (idea.getFirstMeeting() != null) { firstMeetingRepository.delete(idea.getFirstMeeting().getId()); @@ -619,18 +576,12 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements } } } else { - returnValue = - "Matched, course starting " + idea.getApplicationPeriod().getCourseStartDate(); + returnValue = "Matched, course starting " + idea.getApplicationPeriod().getCourseStartDate(); } return returnValue; } - private Idea addMatch( - User creator, - User supervisor, - Idea idea, - NotificationSource notificationSource - ) { + private Idea addMatch(User creator, User supervisor, Idea idea, NotificationSource notificationSource) { Match match = new Match(); match.setIdea(idea); idea.setMatch(match); @@ -639,11 +590,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements match.setStatus(idea.getMatchStatus()); if (notificationSource != null) { notificationSource.setMessage(String.valueOf(idea.getMatchStatus())); - notificationController.notifyIdea( - idea, - IdeaEvent.Event.STATUS_CHANGE, - notificationSource - ); + notificationController.notifyIdea(idea, IdeaEvent.Event.STATUS_CHANGE, notificationSource); } return save(idea); } @@ -661,11 +608,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements } @Override - public Long countByApplicationPeriodAndType( - ApplicationPeriod applicationPeriod, - Type type, - Filter params - ) { + public Long countByApplicationPeriodAndType(ApplicationPeriod applicationPeriod, Type type, Filter params) { return count(byPeriod(applicationPeriod).and(byType(type).and(fromParams(params)))); } @@ -705,10 +648,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements @Override public boolean canEdit(final Idea idea, final User student) { - boolean isAuthor = idea - .getIdeaParticipations() - .stream() - .anyMatch(ip -> Objects.equals(student, ip.getUser())); + boolean isAuthor = idea.getIdeaParticipations().stream().anyMatch(ip -> Objects.equals(student, ip.getUser())); if (!isAuthor) { return false; } @@ -716,15 +656,9 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements return ( applicationPeriodService.isOpen(applicationPeriod) || (idea.getType() == Type.STUDENT && - applicationPeriodService.hasCurrentSubmitIdeaExemption( - applicationPeriod, - student - )) || + applicationPeriodService.hasCurrentSubmitIdeaExemption(applicationPeriod, student)) || (idea.getType() == Type.SUPERVISOR && - applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption( - applicationPeriod, - student - )) + applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption(applicationPeriod, student)) ); } @@ -732,37 +666,22 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements return applicationPeriodService .getCurrentPeriods() .stream() - .filter(applicationPeriod -> - applicationPeriod.getProjectTypes().contains(idea.getProjectType()) - ) + .filter(applicationPeriod -> applicationPeriod.getProjectTypes().contains(idea.getProjectType())) .findAny() .map(applicationPeriod -> isSelectableInBasedOnTarget(idea, applicationPeriod)) .orElse(SelectionState.NO_APPLICATION_PERIOD); } - private SelectionState isSelectableInBasedOnTarget( - final Idea idea, - final ApplicationPeriod applicationPeriod - ) { + private SelectionState isSelectableInBasedOnTarget(final Idea idea, final ApplicationPeriod applicationPeriod) { Target target = getTarget(applicationPeriod, idea.getCreator(), idea.getProjectType()); long matched = countMatched(applicationPeriod, idea.getCreator(), idea.getProjectType()); - return matched >= target.getTarget() - ? SelectionState.NO_TARGETS_LEFT - : SelectionState.AVAILABLE; + return matched >= target.getTarget() ? SelectionState.NO_TARGETS_LEFT : SelectionState.AVAILABLE; } @Override - public boolean authorParticipatingOnOtherActiveIdea( - User author, - ApplicationPeriod ap, - Idea ideaToSave - ) { + public boolean authorParticipatingOnOtherActiveIdea(User author, ApplicationPeriod ap, Idea ideaToSave) { for (Idea idea : findAll(QIdea.idea.ideaParticipations.any().user.eq(author))) { - if ( - idea.getApplicationPeriod().equals(ap) && - !idea.equals(ideaToSave) && - !idea.isInactive() - ) { + if (idea.getApplicationPeriod().equals(ap) && !idea.equals(ideaToSave) && !idea.isInactive()) { return true; } } @@ -787,11 +706,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements if (params.getSupervisor() != null) { bb.and(bySupervisor(params.getSupervisor())); } - if ( - params.getSupervisor() == null && - params.getNoSupervisor() != null && - params.getNoSupervisor() - ) { + if (params.getSupervisor() == null && params.getNoSupervisor() != null && params.getNoSupervisor()) { bb.and(hasNoSupervisor()); } if (params.getTypes() != null) { @@ -809,9 +724,7 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements if (params.getApplicationPeriod() != null) { bb.and(byPeriod(params.getApplicationPeriod())); } - if ( - params.getTitleContains() != null && params.getTitleContains().length() >= TITLE_LENGTH - ) { + if (params.getTitleContains() != null && params.getTitleContains().length() >= TITLE_LENGTH) { bb.and(titleContains(params.getTitleContains())); } if (params.getCreatedAfter() != null) { diff --git a/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java index 9e8a1c0ce5..f8003f7687 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java @@ -14,9 +14,7 @@ import se.su.dsv.scipro.system.Pageable; import se.su.dsv.scipro.system.ResearchArea; import se.su.dsv.scipro.system.Sort; -public class KeywordServiceImpl - extends AbstractServiceImpl<Keyword, Long> - implements KeywordService { +public class KeywordServiceImpl extends AbstractServiceImpl<Keyword, Long> implements KeywordService { private static final Logger LOGGER = LoggerFactory.getLogger(KeywordServiceImpl.class); @@ -39,10 +37,7 @@ public class KeywordServiceImpl Keyword k = findOne(keyword.getId()); k.removeResearchArea(area); LOGGER.info( - "Removing relationship between Keyword: " + - k.getKeyword() + - " and Research area: " + - area.getTitle() + "Removing relationship between Keyword: " + k.getKeyword() + " and Research area: " + area.getTitle() ); } @@ -51,9 +46,7 @@ public class KeywordServiceImpl public void addConnection(Keyword keyword, ResearchArea area) { Keyword k = findOne(keyword.getId()); k.addResearchArea(area); - LOGGER.info( - "Relationship added, Keyword: " + k.getKeyword() + ", Research area: " + area.getTitle() - ); + LOGGER.info("Relationship added, Keyword: " + k.getKeyword() + ", Research area: " + area.getTitle()); } @Override @@ -68,10 +61,7 @@ public class KeywordServiceImpl @Override public List<Keyword> getAutoCompleteKeywords(String searchString, int limit) { - return findAll( - nameContains(searchString), - new PageRequest(0, limit, new Sort(Sort.Direction.ASC, "keyword")) - ); + return findAll(nameContains(searchString), new PageRequest(0, limit, new Sort(Sort.Direction.ASC, "keyword"))); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/match/Match.java b/core/src/main/java/se/su/dsv/scipro/match/Match.java index 723a5ad6ef..666f765e9a 100755 --- a/core/src/main/java/se/su/dsv/scipro/match/Match.java +++ b/core/src/main/java/se/su/dsv/scipro/match/Match.java @@ -116,13 +116,7 @@ public class Match extends DomainObject { @Override public int hashCode() { - return Objects.hash( - this.getId(), - this.getIdea(), - this.getSupervisor(), - this.getStatus(), - this.getChangedBy() - ); + return Objects.hash(this.getId(), this.getIdea(), this.getSupervisor(), this.getStatus(), this.getChangedBy()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java index 084a67ab1b..7e91a3cf45 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java @@ -36,10 +36,7 @@ public class MatchFollowUpServiceImpl implements MatchFollowUpService { private JPQLQuery<Long> getQuery(ApplicationPeriod applicationPeriod) { return JPAExpressions.select(QIdea.idea.count()) .from(QIdea.idea) - .where( - QIdea.idea.published.eq(true), - QIdea.idea.projectType.id.eq(QTarget.target1.projectType.id) - ) + .where(QIdea.idea.published.eq(true), QIdea.idea.projectType.id.eq(QTarget.target1.projectType.id)) .where( QIdea.idea.match.supervisor.id.eq(QTarget.target1.user.id), anyOf( @@ -50,48 +47,26 @@ public class MatchFollowUpServiceImpl implements MatchFollowUpService { } private static Predicate<TargetResult> unmet() { - return input -> - input != null && (input.getTarget().getTarget() > input.getSubmittedAndTaken()); + return input -> input != null && (input.getTarget().getTarget() > input.getSubmittedAndTaken()); } @Override public long countUnmetTargets(final ApplicationPeriod applicationPeriod) { List<TargetResult> list = from(QTarget.target1) - .where( - QTarget.target1.applicationPeriod.eq(applicationPeriod), - QTarget.target1.target.gt(0) - ) - .select( - Projections.constructor( - TargetResult.class, - QTarget.target1, - getQuery(applicationPeriod) - ) - ) + .where(QTarget.target1.applicationPeriod.eq(applicationPeriod), QTarget.target1.target.gt(0)) + .select(Projections.constructor(TargetResult.class, QTarget.target1, getQuery(applicationPeriod))) .fetch(); return list.stream().filter(unmet()).count(); } @Override - public Iterable<TargetResult> findUnmetTargets( - final ApplicationPeriod applicationPeriod, - final Pageable pageable - ) { + public Iterable<TargetResult> findUnmetTargets(final ApplicationPeriod applicationPeriod, final Pageable pageable) { StringPath sort = Expressions.stringPath(QTarget.target1, pageable.getSort().getProperty()); List<TargetResult> targetResults = from(QTarget.target1) - .where( - QTarget.target1.applicationPeriod.eq(applicationPeriod), - QTarget.target1.target.gt(0) - ) + .where(QTarget.target1.applicationPeriod.eq(applicationPeriod), QTarget.target1.target.gt(0)) .orderBy(pageable.getSort().isAscending() ? sort.asc() : sort.desc()) - .select( - Projections.constructor( - TargetResult.class, - QTarget.target1, - getQuery(applicationPeriod) - ) - ) + .select(Projections.constructor(TargetResult.class, QTarget.target1, getQuery(applicationPeriod))) .fetch(); return targetResults @@ -105,17 +80,8 @@ public class MatchFollowUpServiceImpl implements MatchFollowUpService { @Override public Set<User> findSupervisorsWithUnmetTargets(ApplicationPeriod applicationPeriod) { List<TargetResult> targetResults = from(QTarget.target1) - .where( - QTarget.target1.applicationPeriod.eq(applicationPeriod), - QTarget.target1.target.gt(0) - ) - .select( - Projections.constructor( - TargetResult.class, - QTarget.target1, - getQuery(applicationPeriod) - ) - ) + .where(QTarget.target1.applicationPeriod.eq(applicationPeriod), QTarget.target1.target.gt(0)) + .select(Projections.constructor(TargetResult.class, QTarget.target1, getQuery(applicationPeriod))) .fetch(); return targetResults diff --git a/core/src/main/java/se/su/dsv/scipro/match/OpenPeriod.java b/core/src/main/java/se/su/dsv/scipro/match/OpenPeriod.java index a781c14d52..ce99199f91 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/OpenPeriod.java +++ b/core/src/main/java/se/su/dsv/scipro/match/OpenPeriod.java @@ -9,10 +9,7 @@ public final class OpenPeriod extends StudentPeriod implements Serializable { private final ApplicationPeriod applicationPeriod; private final List<ApplicationPeriodExemption.Type> exemptions; - public OpenPeriod( - ApplicationPeriod applicationPeriod, - List<ApplicationPeriodExemption.Type> exemptions - ) { + public OpenPeriod(ApplicationPeriod applicationPeriod, List<ApplicationPeriodExemption.Type> exemptions) { this.applicationPeriod = applicationPeriod; this.exemptions = exemptions; } diff --git a/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java index b8298c612e..7a01279d29 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java @@ -12,10 +12,7 @@ public class PreliminaryMatchServiceImpl private final IdeaService ideaService; @Inject - public PreliminaryMatchServiceImpl( - final Provider<EntityManager> em, - final IdeaService ideaService - ) { + public PreliminaryMatchServiceImpl(final Provider<EntityManager> em, final IdeaService ideaService) { super(em, PreliminaryMatch.class, QPreliminaryMatch.preliminaryMatch); this.ideaService = ideaService; } diff --git a/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java index 549eeeef4a..926d7c6299 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java @@ -12,9 +12,7 @@ import se.su.dsv.scipro.system.Program; import se.su.dsv.scipro.system.QProgram; import se.su.dsv.scipro.system.Sort; -public class ProgramServiceImpl - extends AbstractServiceImpl<Program, Long> - implements ProgramService { +public class ProgramServiceImpl extends AbstractServiceImpl<Program, Long> implements ProgramService { @Inject public ProgramServiceImpl(Provider<EntityManager> em) { @@ -37,10 +35,7 @@ public class ProgramServiceImpl @Override public List<Program> getAutoCompletePrograms(String searchString, int limit) { - return findAll( - nameContains(searchString), - new PageRequest(0, limit, new Sort(Sort.Direction.ASC, "name")) - ); + return findAll(nameContains(searchString), new PageRequest(0, limit, new Sort(Sort.Direction.ASC, "name"))); } private BooleanExpression nameContains(String input) { diff --git a/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java b/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java index 15c5febd59..98b563df31 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java +++ b/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java @@ -13,10 +13,7 @@ public class ProjectStartNotifier { private final NotificationController notificationController; @Inject - public ProjectStartNotifier( - final EventBus eventBus, - final NotificationController notificationController - ) { + public ProjectStartNotifier(final EventBus eventBus, final NotificationController notificationController) { eventBus.register(this); this.notificationController = notificationController; } @@ -25,11 +22,7 @@ public class ProjectStartNotifier { public void projectStarted(final ProjectStartedEvent projectStartedEvent) { Idea idea = projectStartedEvent.getIdea(); NotificationSource source = source(idea.getExport().getReason()); - notificationController.notifyProject( - idea.getProject(), - ProjectEvent.Event.EXPORTED_SUCCESS, - source - ); + notificationController.notifyProject(idea.getProject(), ProjectEvent.Event.EXPORTED_SUCCESS, source); } @Subscribe diff --git a/core/src/main/java/se/su/dsv/scipro/match/TargetService.java b/core/src/main/java/se/su/dsv/scipro/match/TargetService.java index 2e4f5c47ae..1363c904bc 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/TargetService.java +++ b/core/src/main/java/se/su/dsv/scipro/match/TargetService.java @@ -9,15 +9,8 @@ import se.su.dsv.scipro.system.User; public interface TargetService extends GenericService<Target, TargetId> { Target findOne(ApplicationPeriod applicationPeriod, User supervisor, ProjectType projectType); boolean hasTargetsLeft(ApplicationPeriod applicationPeriod, User supervisor); - boolean hasTargetsLeft( - ApplicationPeriod applicationPeriod, - User supervisor, - ProjectType projectType - ); - Set<ProjectType> projectTypesWithTargetsLeft( - ApplicationPeriod applicationPeriod, - User supervisor - ); + boolean hasTargetsLeft(ApplicationPeriod applicationPeriod, User supervisor, ProjectType projectType); + Set<ProjectType> projectTypesWithTargetsLeft(ApplicationPeriod applicationPeriod, User supervisor); int ideasLeftToCreateToMeetTarget(ApplicationPeriod ap, User e, ProjectType pc); class FilterParams implements Serializable { diff --git a/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java index 04cb4d8513..68215400ad 100644 --- a/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java @@ -11,9 +11,7 @@ import se.su.dsv.scipro.system.AbstractServiceImpl; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.User; -public class TargetServiceImpl - extends AbstractServiceImpl<Target, TargetId> - implements TargetService { +public class TargetServiceImpl extends AbstractServiceImpl<Target, TargetId> implements TargetService { private final IdeaService ideaService; @@ -24,15 +22,9 @@ public class TargetServiceImpl } @Override - public Target findOne( - ApplicationPeriod applicationPeriod, - User supervisor, - ProjectType projectType - ) { + public Target findOne(ApplicationPeriod applicationPeriod, User supervisor, ProjectType projectType) { Target t = findOne( - byApplicationPeriod(applicationPeriod) - .and(bySupervisor(supervisor)) - .and(byLevel(projectType)) + byApplicationPeriod(applicationPeriod).and(bySupervisor(supervisor)).and(byLevel(projectType)) ); if (t == null) { t = new Target(supervisor, applicationPeriod, projectType); @@ -55,10 +47,7 @@ public class TargetServiceImpl while (i.hasNext()) { Target t = i.next(); ProjectType pc = t.getProjectType(); - if ( - t.getTarget() > 0 && - t.getTarget() > ideaService.countMatched(applicationPeriod, supervisor, pc) - ) { + if (t.getTarget() > 0 && t.getTarget() > ideaService.countMatched(applicationPeriod, supervisor, pc)) { return true; } } @@ -67,23 +56,15 @@ public class TargetServiceImpl } @Override - public boolean hasTargetsLeft( - ApplicationPeriod applicationPeriod, - User supervisor, - ProjectType projectType - ) { + public boolean hasTargetsLeft(ApplicationPeriod applicationPeriod, User supervisor, ProjectType projectType) { Target t = findOne(applicationPeriod, supervisor, projectType); return ( - t.getTarget() > 0 && - t.getTarget() > ideaService.countMatched(applicationPeriod, supervisor, projectType) + t.getTarget() > 0 && t.getTarget() > ideaService.countMatched(applicationPeriod, supervisor, projectType) ); } @Override - public Set<ProjectType> projectTypesWithTargetsLeft( - ApplicationPeriod applicationPeriod, - User supervisor - ) { + public Set<ProjectType> projectTypesWithTargetsLeft(ApplicationPeriod applicationPeriod, User supervisor) { Set<ProjectType> projectTypes = new HashSet<>(); TargetService.FilterParams params = new FilterParams(); params.setApplicationPeriod(applicationPeriod); @@ -93,10 +74,7 @@ public class TargetServiceImpl while (i.hasNext()) { Target t = i.next(); ProjectType pc = t.getProjectType(); - if ( - t.getTarget() > 0 && - t.getTarget() > ideaService.countMatched(applicationPeriod, supervisor, pc) - ) { + if (t.getTarget() > 0 && t.getTarget() > ideaService.countMatched(applicationPeriod, supervisor, pc)) { projectTypes.add(pc); } } @@ -105,11 +83,7 @@ public class TargetServiceImpl } @Override - public int ideasLeftToCreateToMeetTarget( - ApplicationPeriod ap, - User supervisor, - ProjectType pc - ) { + public int ideasLeftToCreateToMeetTarget(ApplicationPeriod ap, User supervisor, ProjectType pc) { IdeaService.Filter countParams = new IdeaService.Filter(); countParams.setSupervisor(supervisor); @@ -126,8 +100,7 @@ public class TargetServiceImpl int ideasLeftToCreate = findOne(ap, supervisor, pc).getTarget() - availableIdeas; ideasLeftToCreate = - ideasLeftToCreate - - SciProUtilities.safeLongToInt(ideaService.countMatched(ap, supervisor, pc)); + ideasLeftToCreate - SciProUtilities.safeLongToInt(ideaService.countMatched(ap, supervisor, pc)); if (ideasLeftToCreate > 0) { return ideasLeftToCreate; diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepository.java b/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepository.java index ad9d610c1c..c0e6bb30f1 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepository.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepository.java @@ -11,9 +11,7 @@ import se.su.dsv.scipro.system.QueryDslPredicateExecutor; @Transactional public interface MilestoneActivityTemplateRepository - extends - JpaRepository<MilestoneActivityTemplate, Long>, - QueryDslPredicateExecutor<MilestoneActivityTemplate> { + extends JpaRepository<MilestoneActivityTemplate, Long>, QueryDslPredicateExecutor<MilestoneActivityTemplate> { List<MilestoneActivityTemplate> findActivities( MilestoneActivityTemplate.Type type, ProjectType projectType, @@ -31,9 +29,7 @@ public interface MilestoneActivityTemplateRepository LocalDate projectStartDate ); - List<MilestoneActivityTemplate> findByMilestonePhase( - MilestonePhaseTemplate milestonePhaseTemplate - ); + List<MilestoneActivityTemplate> findByMilestonePhase(MilestonePhaseTemplate milestonePhaseTemplate); List<MilestoneActivityTemplate> findActiveByPhase( MilestonePhaseTemplate milestonePhaseTemplate, @@ -43,11 +39,7 @@ public interface MilestoneActivityTemplateRepository long countByMilestonePhase(MilestonePhaseTemplate milestonePhaseTemplate); - long countActivities( - MilestoneActivityTemplate.Type type, - ProjectType projectType, - LocalDate projectStartDate - ); + long countActivities(MilestoneActivityTemplate.Type type, ProjectType projectType, LocalDate projectStartDate); long countActivities(ProjectType projectType, LocalDate projectStartDate); diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java index 209d8fc834..ca1d64ac62 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java @@ -23,11 +23,7 @@ public class MilestoneActivityTemplateRepositoryImpl @Inject public MilestoneActivityTemplateRepositoryImpl(Provider<EntityManager> em) { - super( - em, - MilestoneActivityTemplate.class, - QMilestoneActivityTemplate.milestoneActivityTemplate - ); + super(em, MilestoneActivityTemplate.class, QMilestoneActivityTemplate.milestoneActivityTemplate); } @Override @@ -44,9 +40,7 @@ public class MilestoneActivityTemplateRepositoryImpl activity.projectTypes.any().eq(projectType), activity.deleted.isFalse(), activity.dateCreated.before( - java.util.Date.from( - projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant() - ) + java.util.Date.from(projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant()) ) ) ) @@ -64,11 +58,7 @@ public class MilestoneActivityTemplateRepositoryImpl } return createQuery() .where( - allOf( - activity.type.eq(type), - activity.projectTypes.any().in(projectTypes), - activity.deleted.isFalse() - ) + allOf(activity.type.eq(type), activity.projectTypes.any().in(projectTypes), activity.deleted.isFalse()) ) .orderBy(activity.milestonePhaseTemplate.sortOrder.asc(), activity.sortOrder.asc()) .fetch(); @@ -88,9 +78,7 @@ public class MilestoneActivityTemplateRepositoryImpl activity.projectTypes.any().eq(projectType), activity.deleted.isFalse(), activity.dateCreated.before( - java.util.Date.from( - projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant() - ) + java.util.Date.from(projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant()) ) ) ) @@ -99,9 +87,7 @@ public class MilestoneActivityTemplateRepositoryImpl } @Override - public List<MilestoneActivityTemplate> findByMilestonePhase( - MilestonePhaseTemplate milestonePhaseTemplate - ) { + public List<MilestoneActivityTemplate> findByMilestonePhase(MilestonePhaseTemplate milestonePhaseTemplate) { QMilestoneActivityTemplate activity = QMilestoneActivityTemplate.milestoneActivityTemplate; return createQuery() .where(activity.milestonePhaseTemplate.eq(milestonePhaseTemplate)) @@ -122,9 +108,7 @@ public class MilestoneActivityTemplateRepositoryImpl activity.milestonePhaseTemplate.eq(milestonePhaseTemplate), activity.deleted.isFalse(), activity.dateCreated.before( - java.util.Date.from( - projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant() - ) + java.util.Date.from(projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant()) ), activity.projectTypes.any().eq(projectType) ) @@ -138,9 +122,7 @@ public class MilestoneActivityTemplateRepositoryImpl return createQuery() .select(QMilestoneActivityTemplate.milestoneActivityTemplate.count()) .where( - QMilestoneActivityTemplate.milestoneActivityTemplate.milestonePhaseTemplate.eq( - milestonePhaseTemplate - ) + QMilestoneActivityTemplate.milestoneActivityTemplate.milestonePhaseTemplate.eq(milestonePhaseTemplate) ) .fetchFirst(); } @@ -191,12 +173,7 @@ public class MilestoneActivityTemplateRepositoryImpl ) { QMilestoneActivityTemplate activity = QMilestoneActivityTemplate.milestoneActivityTemplate; return createQuery() - .where( - allOf( - activity.sortOrder.eq(sortOrder), - activity.milestonePhaseTemplate.eq(milestonePhaseTemplate) - ) - ) + .where(allOf(activity.sortOrder.eq(sortOrder), activity.milestonePhaseTemplate.eq(milestonePhaseTemplate))) .fetchOne(); } } diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestoneActivityTemplate.java b/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestoneActivityTemplate.java index 8050e53857..d00861939a 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestoneActivityTemplate.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestoneActivityTemplate.java @@ -197,15 +197,13 @@ public class MilestoneActivityTemplate extends LazyDeletableDomainObject { // ---------------------------------------------------------------------------------- // Nested classes and types // ---------------------------------------------------------------------------------- - public static class BySortOrderComparator - implements Comparator<MilestoneActivityTemplate>, Serializable { + public static class BySortOrderComparator implements Comparator<MilestoneActivityTemplate>, Serializable { @Override public int compare(MilestoneActivityTemplate o1, MilestoneActivityTemplate o2) { int sortOrderResult = o1.sortOrder - o2.sortOrder; int phaseSortOrderResult = - o1.milestonePhaseTemplate.getSortOrder() - - o2.getMilestonePhaseTemplate().getSortOrder(); + o1.milestonePhaseTemplate.getSortOrder() - o2.getMilestonePhaseTemplate().getSortOrder(); if (phaseSortOrderResult == 0) { return sortOrderResult; diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestonePhaseTemplate.java b/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestonePhaseTemplate.java index a9760cbb3b..d9c978a532 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestonePhaseTemplate.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MilestonePhaseTemplate.java @@ -108,12 +108,7 @@ public class MilestonePhaseTemplate extends LazyDeletableDomainObject { @Override public int hashCode() { - return Objects.hash( - this.getId(), - this.getTitle(), - this.getDescription(), - this.getSortOrder() - ); + return Objects.hash(this.getId(), this.getTitle(), this.getDescription(), this.getSortOrder()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java index 8dd9b373f3..6607f9f701 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java @@ -51,11 +51,10 @@ public class ActivateCompletedMilestonesOnNewProjects { } private void activateOppositionMilestone(Project project, User author) { - List<FinalSeminarOpposition> opposing = - finalSeminarService.findFinalSeminarOppositionsByOpponentAndProjectType( - project.getProjectType(), - author - ); + List<FinalSeminarOpposition> opposing = finalSeminarService.findFinalSeminarOppositionsByOpponentAndProjectType( + project.getProjectType(), + author + ); for (FinalSeminarOpposition finalSeminarOpposition : opposing) { if (finalSeminarOpposition.isApproved()) { confirmMilestoneByEvent(project, author, "OppositionGradingEvent"); @@ -64,8 +63,10 @@ public class ActivateCompletedMilestonesOnNewProjects { } private void activateParticipationMilestone(Project project, User author) { - List<FinalSeminarActiveParticipation> participating = - finalSeminarService.findUserParticipating(project, author); + List<FinalSeminarActiveParticipation> participating = finalSeminarService.findUserParticipating( + project, + author + ); for (FinalSeminarActiveParticipation participation : participating) { if (participation.isApproved()) { confirmMilestoneByEvent(project, author, "ParticipationGradingEvent"); @@ -74,9 +75,7 @@ public class ActivateCompletedMilestonesOnNewProjects { } private void confirmMilestoneByEvent(Project project, User author, String event) { - MilestoneActivityTemplate milestoneActivity = milestoneActivityTemplateService.findByEvent( - event - ); + MilestoneActivityTemplate milestoneActivity = milestoneActivityTemplateService.findByEvent(event); if (milestoneActivity != null) { mileStoneService.setConfirmed(project, author, milestoneActivity, true); } diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/MileStoneService.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/MileStoneService.java index 58e925ae33..41d5477742 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/MileStoneService.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/MileStoneService.java @@ -20,12 +20,7 @@ public interface MileStoneService extends GenericService<Milestone, Long> { void setConfirmed(Project project, MilestoneActivityTemplate activity, boolean confirmed); - void setConfirmed( - Project project, - User student, - MilestoneActivityTemplate activity, - boolean confirmed - ); + void setConfirmed(Project project, User student, MilestoneActivityTemplate activity, boolean confirmed); boolean isConfirmed(Project project, MilestoneActivityTemplate activity); @@ -37,11 +32,7 @@ public interface MileStoneService extends GenericService<Milestone, Long> { long countCompletedMileStones(MilestoneActivityTemplate activity, Filter filter); - Iterable<Milestone> findCompletedMilestones( - MilestoneActivityTemplate activity, - Filter filter, - Pageable pageable - ); + Iterable<Milestone> findCompletedMilestones(MilestoneActivityTemplate activity, Filter filter, Pageable pageable); class Filter implements Serializable { diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java index 093498f274..145ee9d096 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java @@ -49,17 +49,15 @@ public class MilestoneActivator { @Subscribe public void oppositionApproved(OppositionApprovedEvent event) { - activateIndividualMilestone( - Set.of("OppositionGradingEvent"), - event.getProject(), - event.getStudent() - ); + activateIndividualMilestone(Set.of("OppositionGradingEvent"), event.getProject(), event.getStudent()); } @Subscribe public void participationApproved(ParticipationApprovedEvent event) { - List<FinalSeminarActiveParticipation> activeParticipations = - finalSeminarService.findUserParticipating(event.getProject(), event.getStudent()); + List<FinalSeminarActiveParticipation> activeParticipations = finalSeminarService.findUserParticipating( + event.getProject(), + event.getStudent() + ); long completedParticipations = activeParticipations .stream() .filter(FinalSeminarParticipation::isApproved) @@ -70,11 +68,7 @@ public class MilestoneActivator { .getProjectTypeSettings() .getMinActiveParticipationsToBeGraded(); if (completedParticipations >= minimumActiveParticipationsToBeGraded) { - activateIndividualMilestone( - Set.of("ParticipationGradingEvent"), - event.getProject(), - event.getStudent() - ); + activateIndividualMilestone(Set.of("ParticipationGradingEvent"), event.getProject(), event.getStudent()); } else { NotificationSource notificationSource = new NotificationSource(); notificationSource.setMessage(event.getFinalSeminar().getProjectTitle()); @@ -94,38 +88,22 @@ public class MilestoneActivator { @Subscribe public void respondentApproved(RespondentApprovedEvent event) { - activateIndividualMilestone( - Set.of("RespondentGradingEvent"), - event.getProject(), - event.getStudent() - ); + activateIndividualMilestone(Set.of("RespondentGradingEvent"), event.getProject(), event.getStudent()); } @Subscribe public void respondentFailed(RespondentFailedEvent event) { - deactivateIndividualMilestone( - Set.of("RespondentGradingEvent"), - event.getProject(), - event.getStudent() - ); + deactivateIndividualMilestone(Set.of("RespondentGradingEvent"), event.getProject(), event.getStudent()); } @Subscribe public void peerReviewCompleted(FirstPeerReviewCompletedEvent event) { - activateIndividualMilestone( - Set.of("FirstPeerReviewCompleted"), - event.getProject(), - event.getStudent() - ); + activateIndividualMilestone(Set.of("FirstPeerReviewCompleted"), event.getProject(), event.getStudent()); } @Subscribe public void secondPeerReviewCompleted(SecondPeerReviewCompletedEvent event) { - activateIndividualMilestone( - Set.of("SecondPeerReviewCompleted"), - event.getProject(), - event.getStudent() - ); + activateIndividualMilestone(Set.of("SecondPeerReviewCompleted"), event.getProject(), event.getStudent()); } @Subscribe @@ -140,19 +118,12 @@ public class MilestoneActivator { @Subscribe public void finalSeminarDeleted(FinalSeminarDeletedEvent event) { - deactivateProjectMilestone( - Set.of("FinalSeminarCreated", "FinalSeminarThesisUploaded"), - event.getProject() - ); + deactivateProjectMilestone(Set.of("FinalSeminarCreated", "FinalSeminarThesisUploaded"), event.getProject()); } @Subscribe public void supervisorGradingReportSubmitted(SupervisorGradingReportSubmittedEvent event) { - activateIndividualMilestone( - Set.of("SupervisorGradingReportSubmitted"), - event.getProject(), - event.getStudent() - ); + activateIndividualMilestone(Set.of("SupervisorGradingReportSubmitted"), event.getProject(), event.getStudent()); } @Subscribe @@ -167,10 +138,7 @@ public class MilestoneActivator { @Subscribe public void finalSeminarThesisDeleted(FinalSeminarThesisDeletedEvent event) { - deactivateProjectMilestone( - Set.of("FinalSeminarThesisUploaded"), - event.getFinalSeminar().getProject() - ); + deactivateProjectMilestone(Set.of("FinalSeminarThesisUploaded"), event.getFinalSeminar().getProject()); } @Subscribe @@ -190,35 +158,18 @@ public class MilestoneActivator { @Subscribe public void gradingCompleted(GradingCompletedEvent event) { - activateIndividualMilestone( - Set.of("SupervisorGradingReportSubmitted"), - event.getProject(), - event.getStudent() - ); + activateIndividualMilestone(Set.of("SupervisorGradingReportSubmitted"), event.getProject(), event.getStudent()); } - private void activateIndividualMilestone( - Set<String> eventNames, - Project project, - User student - ) { + private void activateIndividualMilestone(Set<String> eventNames, Project project, User student) { setIndividualMilestone(eventNames, project, student, true); } - private void deactivateIndividualMilestone( - Set<String> eventNames, - Project project, - User student - ) { + private void deactivateIndividualMilestone(Set<String> eventNames, Project project, User student) { setIndividualMilestone(eventNames, project, student, false); } - private void setIndividualMilestone( - Set<String> eventNames, - Project project, - User student, - boolean confirmed - ) { + private void setIndividualMilestone(Set<String> eventNames, Project project, User student, boolean confirmed) { getMilestoneActivities(eventNames).forEach(milestoneActivity -> mileStoneService.setConfirmed(project, student, milestoneActivity, confirmed) ); @@ -239,9 +190,6 @@ public class MilestoneActivator { } private Stream<MilestoneActivityTemplate> getMilestoneActivities(Set<String> eventNames) { - return eventNames - .stream() - .map(milestoneActivityTemplateService::findByEvent) - .filter(Objects::nonNull); + return eventNames.stream().map(milestoneActivityTemplateService::findByEvent).filter(Objects::nonNull); } } diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivityTemplateService.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivityTemplateService.java index 4bf1ec9354..4563ef46ac 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivityTemplateService.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivityTemplateService.java @@ -8,8 +8,7 @@ import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.springdata.SortOrderService; import se.su.dsv.scipro.system.ProjectType; -public interface MilestoneActivityTemplateService - extends SortOrderService<MilestoneActivityTemplate> { +public interface MilestoneActivityTemplateService extends SortOrderService<MilestoneActivityTemplate> { List<MilestoneActivityTemplate> findAll(); List<MilestoneActivityTemplate> getActivities( @@ -23,30 +22,15 @@ public interface MilestoneActivityTemplateService Collection<ProjectType> projectTypes ); - List<MilestoneActivityTemplate> findByMileStonePhase( - MilestonePhaseTemplate milestonePhaseTemplate - ); + List<MilestoneActivityTemplate> findByMileStonePhase(MilestonePhaseTemplate milestonePhaseTemplate); - List<MilestoneActivityTemplate> findActiveByPhase( - MilestonePhaseTemplate milestonePhaseTemplate, - Project project - ); + List<MilestoneActivityTemplate> findActiveByPhase(MilestonePhaseTemplate milestonePhaseTemplate, Project project); - List<MilestoneActivityTemplate> getActivitiesInOrder( - MilestoneActivityTemplate.Type type, - Project project - ); + List<MilestoneActivityTemplate> getActivitiesInOrder(MilestoneActivityTemplate.Type type, Project project); - Long countActivities( - MilestoneActivityTemplate.Type type, - ProjectType projectType, - LocalDate projectStartDate - ); + Long countActivities(MilestoneActivityTemplate.Type type, ProjectType projectType, LocalDate projectStartDate); - MilestoneActivityTemplate save( - MilestoneActivityTemplate activity, - MilestonePhaseTemplate currentPhase - ); + MilestoneActivityTemplate save(MilestoneActivityTemplate activity, MilestonePhaseTemplate currentPhase); long countActivities(ProjectType projectType, LocalDate projectStartDate); diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneStatisticsService.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneStatisticsService.java index 667fa5f7e2..a67117d477 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneStatisticsService.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneStatisticsService.java @@ -22,10 +22,7 @@ public interface MilestoneStatisticsService { MilestoneActivityTemplate notCompleted, Pageable pageRequest ); - long countProgressedProjects( - MilestoneActivityTemplate completed, - MilestoneActivityTemplate notCompleted - ); + long countProgressedProjects(MilestoneActivityTemplate completed, MilestoneActivityTemplate notCompleted); class Filter implements Serializable { diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java index 166d9277e5..868ffb8829 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java @@ -34,11 +34,7 @@ public class MilestoneActivityTemplateServiceImpl implements MilestoneActivityTe ProjectType projectType, LocalDate projectStartDate ) { - return milestoneActivityTemplateRepository.findActivities( - type, - projectType, - projectStartDate - ); + return milestoneActivityTemplateRepository.findActivities(type, projectType, projectStartDate); } @Override @@ -46,16 +42,11 @@ public class MilestoneActivityTemplateServiceImpl implements MilestoneActivityTe MilestoneActivityTemplate.Type type, Collection<ProjectType> projectTypes ) { - return milestoneActivityTemplateRepository.findAllActivitiesByProjectType( - type, - projectTypes - ); + return milestoneActivityTemplateRepository.findAllActivitiesByProjectType(type, projectTypes); } @Override - public List<MilestoneActivityTemplate> findByMileStonePhase( - MilestonePhaseTemplate milestonePhaseTemplate - ) { + public List<MilestoneActivityTemplate> findByMileStonePhase(MilestonePhaseTemplate milestonePhaseTemplate) { return milestoneActivityTemplateRepository.findByMilestonePhase(milestonePhaseTemplate); } @@ -72,10 +63,7 @@ public class MilestoneActivityTemplateServiceImpl implements MilestoneActivityTe } @Override - public List<MilestoneActivityTemplate> getActivitiesInOrder( - MilestoneActivityTemplate.Type type, - Project project - ) { + public List<MilestoneActivityTemplate> getActivitiesInOrder(MilestoneActivityTemplate.Type type, Project project) { return milestoneActivityTemplateRepository.findAllActivitiesInOrder( type, project.getProjectType(), @@ -89,11 +77,7 @@ public class MilestoneActivityTemplateServiceImpl implements MilestoneActivityTe ProjectType projectType, LocalDate projectStartDate ) { - return milestoneActivityTemplateRepository.countActivities( - type, - projectType, - projectStartDate - ); + return milestoneActivityTemplateRepository.countActivities(type, projectType, projectStartDate); } @Override @@ -107,9 +91,7 @@ public class MilestoneActivityTemplateServiceImpl implements MilestoneActivityTe ) { activity.setSortOrder( SciProUtilities.safeLongToInt( - milestoneActivityTemplateRepository.countByMilestonePhase( - activity.getMilestonePhaseTemplate() - ) + milestoneActivityTemplateRepository.countByMilestonePhase(activity.getMilestonePhaseTemplate()) ) ); } diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java index 4048899e21..5121d50522 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java @@ -38,9 +38,7 @@ public class MilestonePhaseTemplateServiceImpl allOf( template.deleted.isFalse(), template.dateCreated.lt( - java.util.Date.from( - projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant() - ) + java.util.Date.from(projectStartDate.atStartOfDay(ZoneId.systemDefault()).toInstant()) ) ) ) diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java index 35bf64a9de..d77e8b95cc 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java @@ -30,17 +30,12 @@ import se.su.dsv.scipro.system.ProjectModule; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.User; -public class MilestoneServiceImpl - extends AbstractServiceImpl<Milestone, Long> - implements MileStoneService { +public class MilestoneServiceImpl extends AbstractServiceImpl<Milestone, Long> implements MileStoneService { private final NotificationController notificationController; @Inject - public MilestoneServiceImpl( - final NotificationController notificationController, - Provider<EntityManager> em - ) { + public MilestoneServiceImpl(final NotificationController notificationController, Provider<EntityManager> em) { super(em, Milestone.class, QMilestone.milestone); this.notificationController = notificationController; } @@ -62,21 +57,13 @@ public class MilestoneServiceImpl public long countMileStones(Project project, User student, boolean confirmed) { QMilestone milestone = QMilestone.milestone; return count( - allOf( - milestone.project.eq(project), - milestone.confirmed.eq(confirmed), - milestone.user.eq(student) - ) + allOf(milestone.project.eq(project), milestone.confirmed.eq(confirmed), milestone.user.eq(student)) ); } @Override @Transactional - public void setConfirmed( - Project project, - MilestoneActivityTemplate activity, - boolean confirmed - ) { + public void setConfirmed(Project project, MilestoneActivityTemplate activity, boolean confirmed) { if (confirmed) { for (MilestoneActivityTemplate earlierActivity : getEarlierIncompleteProjectMilestoneActivities( project, @@ -88,9 +75,7 @@ public class MilestoneServiceImpl setConfirmed(project, null, activity, confirmed); } - private Iterable< - ? extends MilestoneActivityTemplate - > getEarlierIncompleteProjectMilestoneActivities( + private Iterable<? extends MilestoneActivityTemplate> getEarlierIncompleteProjectMilestoneActivities( final Project project, final MilestoneActivityTemplate activity ) { @@ -107,17 +92,11 @@ public class MilestoneServiceImpl q.sortOrder.lt(activity.getSortOrder()), q.milestonePhaseTemplate.eq(activity.getMilestonePhaseTemplate()) ), - q.milestonePhaseTemplate.sortOrder.lt( - activity.getMilestonePhaseTemplate().getSortOrder() - ) + q.milestonePhaseTemplate.sortOrder.lt(activity.getMilestonePhaseTemplate().getSortOrder()) ), new JPAQuery<Milestone>() .from(milestone) - .where( - milestone.activity.eq(q), - milestone.confirmed.isTrue(), - milestone.project.eq(project) - ) + .where(milestone.activity.eq(q), milestone.confirmed.isTrue(), milestone.project.eq(project)) .notExists() ) .orderBy(q.milestonePhaseTemplate.sortOrder.asc(), q.sortOrder.asc()) @@ -126,12 +105,7 @@ public class MilestoneServiceImpl @Override @Transactional - public void setConfirmed( - Project project, - User student, - MilestoneActivityTemplate activity, - boolean confirmed - ) { + public void setConfirmed(Project project, User student, MilestoneActivityTemplate activity, boolean confirmed) { if (!project.hasModule(ProjectModule.MILESTONES)) { return; } @@ -147,17 +121,13 @@ public class MilestoneServiceImpl if (student == null) { notificationController.notifyProject( project, - confirmed - ? ProjectEvent.Event.MILESTONE_CONFIRMED - : ProjectEvent.Event.MILESTONE_REVOKED, + confirmed ? ProjectEvent.Event.MILESTONE_CONFIRMED : ProjectEvent.Event.MILESTONE_REVOKED, source ); } else { notificationController.notifyMileStone( milestone, - confirmed - ? MileStoneEvent.Event.MILESTONE_CONFIRMED - : MileStoneEvent.Event.MILESTONE_REVOKED, + confirmed ? MileStoneEvent.Event.MILESTONE_CONFIRMED : MileStoneEvent.Event.MILESTONE_REVOKED, source ); } @@ -177,11 +147,7 @@ public class MilestoneServiceImpl public Milestone getMileStone(Project project, MilestoneActivityTemplate activity) { QMilestone qMilestone = QMilestone.milestone; Milestone milestone = findOne( - allOf( - qMilestone.project.eq(project), - qMilestone.activity.eq(activity), - qMilestone.user.isNull() - ) + allOf(qMilestone.project.eq(project), qMilestone.activity.eq(activity), qMilestone.user.isNull()) ); if (milestone == null) { milestone = new Milestone(project, activity); @@ -190,18 +156,10 @@ public class MilestoneServiceImpl } @Override - public Milestone getMileStone( - Project project, - User student, - MilestoneActivityTemplate activity - ) { + public Milestone getMileStone(Project project, User student, MilestoneActivityTemplate activity) { QMilestone qMilestone = QMilestone.milestone; Milestone milestone = findOne( - allOf( - qMilestone.project.eq(project), - qMilestone.activity.eq(activity), - qMilestone.user.eq(student) - ) + allOf(qMilestone.project.eq(project), qMilestone.activity.eq(activity), qMilestone.user.eq(student)) ); if (milestone == null) { milestone = new Milestone(project, student, activity); @@ -215,11 +173,7 @@ public class MilestoneServiceImpl return 0; } QMilestone mileStone = QMilestone.milestone; - return count( - mileStone.activity - .eq(activity) - .and(mileStone.confirmed.isTrue().and(toPredicate(filter))) - ); + return count(mileStone.activity.eq(activity).and(mileStone.confirmed.isTrue().and(toPredicate(filter)))); } @Override @@ -230,9 +184,7 @@ public class MilestoneServiceImpl ) { QMilestone mileStone = QMilestone.milestone; return findAll( - mileStone.activity - .eq(activity) - .and(mileStone.confirmed.isTrue().and(toPredicate(filter))), + mileStone.activity.eq(activity).and(mileStone.confirmed.isTrue().and(toPredicate(filter))), pageable ); } @@ -247,20 +199,12 @@ public class MilestoneServiceImpl return booleanBuilder; } - private static void startedBeforeFilter( - Filter filter, - QMilestone mileStone, - BooleanBuilder booleanBuilder - ) { + private static void startedBeforeFilter(Filter filter, QMilestone mileStone, BooleanBuilder booleanBuilder) { if (filter.getProjectStartedAfter() != null) { - booleanBuilder.and( - mileStone.project.dateCreated.after(filter.getProjectStartedAfter()) - ); + booleanBuilder.and(mileStone.project.dateCreated.after(filter.getProjectStartedAfter())); } if (filter.getProjectStartedBefore() != null) { - booleanBuilder.and( - mileStone.project.dateCreated.before(filter.getProjectStartedBefore()) - ); + booleanBuilder.and(mileStone.project.dateCreated.before(filter.getProjectStartedBefore())); } } diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java index 8e2dcd7dac..a1f8847676 100644 --- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java @@ -98,9 +98,7 @@ public class MilestoneStatisticsServiceImpl implements MilestoneStatisticsServic final MilestoneActivityTemplate completed, final MilestoneActivityTemplate notCompleted ) { - return progressedProjects(completed, notCompleted) - .select(QProject.project.count()) - .fetchFirst(); + return progressedProjects(completed, notCompleted).select(QProject.project.count()).fetchFirst(); } @Override @@ -121,13 +119,7 @@ public class MilestoneStatisticsServiceImpl implements MilestoneStatisticsServic QMilestone secondMilestone = new QMilestone("secondMilestone"); List<MyClass> dates = completedBothQuery(filter, firstMilestone, secondMilestone) - .select( - Projections.constructor( - MyClass.class, - firstMilestone.lastModified, - secondMilestone.lastModified - ) - ) + .select(Projections.constructor(MyClass.class, firstMilestone.lastModified, secondMilestone.lastModified)) .fetch(); List<Long> differences = new ArrayList<>(); @@ -159,11 +151,7 @@ public class MilestoneStatisticsServiceImpl implements MilestoneStatisticsServic if (filter.getFirstMilestone() == null || filter.getSecondMilestone() == null) { return null; } - return completedBothQuery( - filter, - new QMilestone("firstMilestone"), - new QMilestone("secondMilestone") - ) + return completedBothQuery(filter, new QMilestone("firstMilestone"), new QMilestone("secondMilestone")) .select(QProject.project.count()) .fetchFirst(); } @@ -219,11 +207,7 @@ public class MilestoneStatisticsServiceImpl implements MilestoneStatisticsServic } } - private JPAQuery<Object> completedBothQuery( - Filter filter, - QMilestone firstMilestone, - QMilestone secondMilestone - ) { + private JPAQuery<Object> completedBothQuery(Filter filter, QMilestone firstMilestone, QMilestone secondMilestone) { return new JPAQuery<>(entityManagerProvider.get()) .from(QProject.project, firstMilestone, secondMilestone) .where(toPredicate(filter)) @@ -277,10 +261,7 @@ public class MilestoneStatisticsServiceImpl implements MilestoneStatisticsServic ) { return new JPAQuery<Project>(entityManagerProvider.get()) .from(QProject.project) - .where( - milestoneIsComplete(completed).exists(), - milestoneIsComplete(notCompleted).notExists() - ); + .where(milestoneIsComplete(completed).exists(), milestoneIsComplete(notCompleted).notExists()); } private JPAQuery<Milestone> milestoneIsComplete(final MilestoneActivityTemplate completed) { diff --git a/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java index 4f7dc29ec0..1890dbde43 100644 --- a/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java @@ -25,10 +25,7 @@ public class DaysServiceImpl implements DaysService { java.time.Instant instant = date == null ? Instant.now() : date.toInstant(); while (days > 0) { instant = instant.plus(ONE_DAY); - final java.time.LocalDate localDate = java.time.LocalDate.ofInstant( - instant, - ZoneId.systemDefault() - ); + final java.time.LocalDate localDate = java.time.LocalDate.ofInstant(instant, ZoneId.systemDefault()); if (isWorkDay(localDate)) { days--; } @@ -41,10 +38,7 @@ public class DaysServiceImpl implements DaysService { java.time.Instant instant = date == null ? Instant.now() : date.toInstant(); while (days > 0) { instant = instant.minus(ONE_DAY); - final java.time.LocalDate localDate = java.time.LocalDate.ofInstant( - instant, - ZoneId.systemDefault() - ); + final java.time.LocalDate localDate = java.time.LocalDate.ofInstant(instant, ZoneId.systemDefault()); if (isWorkDay(localDate)) { days--; } @@ -54,14 +48,8 @@ public class DaysServiceImpl implements DaysService { @Override public int workDaysBetween(final Date startDate, final Date endDate) { - final java.time.LocalDate start = java.time.LocalDate.ofInstant( - startDate.toInstant(), - ZoneId.systemDefault() - ); - final java.time.LocalDate end = java.time.LocalDate.ofInstant( - endDate.toInstant(), - ZoneId.systemDefault() - ); + final java.time.LocalDate start = java.time.LocalDate.ofInstant(startDate.toInstant(), ZoneId.systemDefault()); + final java.time.LocalDate end = java.time.LocalDate.ofInstant(endDate.toInstant(), ZoneId.systemDefault()); return (int) start.datesUntil(end).filter(this::isWorkDay).count(); } diff --git a/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriod.java b/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriod.java index 97364092ac..b0507b2664 100755 --- a/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriod.java +++ b/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriod.java @@ -97,11 +97,6 @@ public class NonWorkDayPeriod extends DomainObject { @Override public int hashCode() { - return Objects.hash( - this.getId(), - this.getStartDate(), - this.getEndDate(), - this.getComment() - ); + return Objects.hash(this.getId(), this.getStartDate(), this.getEndDate(), this.getComment()); } } diff --git a/core/src/main/java/se/su/dsv/scipro/notes/Note.java b/core/src/main/java/se/su/dsv/scipro/notes/Note.java index ee5f395b97..de63976084 100644 --- a/core/src/main/java/se/su/dsv/scipro/notes/Note.java +++ b/core/src/main/java/se/su/dsv/scipro/notes/Note.java @@ -48,15 +48,7 @@ public class Note extends DomainObject { @Override public String toString() { - return ( - "Note(id=" + - this.getId() + - ", user=" + - this.getUser() + - ", content=" + - this.getContent() + - ")" - ); + return ("Note(id=" + this.getId() + ", user=" + this.getUser() + ", content=" + this.getContent() + ")"); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationController.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationController.java index 19ecade19e..6b6e6ce0f9 100755 --- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationController.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationController.java @@ -20,11 +20,7 @@ public interface NotificationController { User user ); - void notifyProject( - final Project project, - final ProjectEvent.Event event, - final NotificationSource source - ); + void notifyProject(final Project project, final ProjectEvent.Event event, final NotificationSource source); void notifyCustomProject( final Project project, @@ -46,11 +42,7 @@ public interface NotificationController { User user ); - void notifySeminar( - final FinalSeminar seminar, - final SeminarEvent.Event event, - final NotificationSource source - ); + void notifySeminar(final FinalSeminar seminar, final SeminarEvent.Event event, final NotificationSource source); void notifyCustomSeminar( final FinalSeminar seminar, @@ -59,17 +51,9 @@ public interface NotificationController { Set<Member> recipients ); - void notifyPeer( - final PeerReview review, - final PeerEvent.Event event, - final NotificationSource source - ); + void notifyPeer(final PeerReview review, final PeerEvent.Event event, final NotificationSource source); - void notifyPeer( - final PeerRequest request, - final PeerEvent.Event event, - final NotificationSource source - ); + void notifyPeer(final PeerRequest request, final PeerEvent.Event event, final NotificationSource source); void notifyIdea(final Idea idea, final IdeaEvent.Event event, final NotificationSource source); @@ -80,11 +64,7 @@ public interface NotificationController { final Set<Member> recipients ); - void notifyMileStone( - final Milestone milestone, - MileStoneEvent.Event event, - final NotificationSource source - ); + void notifyMileStone(final Milestone milestone, MileStoneEvent.Event event, final NotificationSource source); void notifyCustom(CustomEvent.Event event, NotificationSource source, Set<Member> recipients); } diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java index fdd5ff9f14..80b62008fb 100755 --- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java @@ -118,12 +118,7 @@ public class NotificationControllerImpl implements NotificationController { data.setSource(source.getMessage()); data.setAdditionalSource(source.getAdditionalMessage()); - Set<Member> recipients = getRecipients( - Notification.Type.IDEA, - event, - idea.getMembers(), - source - ); + Set<Member> recipients = getRecipients(Notification.Type.IDEA, event, idea.getMembers(), source); notify(recipients, data); } @@ -144,69 +139,39 @@ public class NotificationControllerImpl implements NotificationController { // Have to make sure the custom set participants are actually set to receive final Set<Member> filteredRecipients = recipients .stream() - .filter(m -> - receiverConfiguration.isReceiving(Notification.Type.IDEA, event, m.getType()) - ) + .filter(m -> receiverConfiguration.isReceiving(Notification.Type.IDEA, event, m.getType())) .collect(Collectors.toSet()); notify(filteredRecipients, data); } @Override - public void notifyMileStone( - Milestone milestone, - MileStoneEvent.Event event, - NotificationSource source - ) { + public void notifyMileStone(Milestone milestone, MileStoneEvent.Event event, NotificationSource source) { MileStoneEvent mileStoneEvent = new MileStoneEvent(); mileStoneEvent.setSource(source.getMessage()); mileStoneEvent.setMilestone(milestone); mileStoneEvent.setEvent(event); - Set<Member> recipients = getRecipients( - Notification.Type.MILESTONE, - event, - milestone.getMembers(), - source - ); + Set<Member> recipients = getRecipients(Notification.Type.MILESTONE, event, milestone.getMembers(), source); notify(recipients, mileStoneEvent); } @Override - public Set<Notification> notifyGroup( - Group group, - GroupEvent.Event event, - NotificationSource source, - User user - ) { + public Set<Notification> notifyGroup(Group group, GroupEvent.Event event, NotificationSource source, User user) { GroupEvent data = new GroupEvent(); data.setGroup(group); data.setEvent(event); data.setSource(source.getMessage()); data.setAdditionalSource(source.getAdditionalMessage()); data.setCausedBy(user); - Set<Member> recipients = getRecipients( - Notification.Type.GROUP, - event, - group.getMembers(), - source - ); + Set<Member> recipients = getRecipients(Notification.Type.GROUP, event, group.getMembers(), source); return notify(recipients, data); } @Override - public void notifyProject( - Project project, - ProjectEvent.Event event, - NotificationSource source - ) { - Set<Member> recipients = getRecipients( - Notification.Type.PROJECT, - event, - project.getMembers(), - source - ); + public void notifyProject(Project project, ProjectEvent.Event event, NotificationSource source) { + Set<Member> recipients = getRecipients(Notification.Type.PROJECT, event, project.getMembers(), source); notifyCustomProject(project, event, source, recipients); } @@ -249,29 +214,15 @@ public class NotificationControllerImpl implements NotificationController { data.setSource(source.getMessage()); data.setAdditionalSource(source.getAdditionalMessage()); data.setCausedBy(user); - Set<Member> recipients = getRecipients( - Notification.Type.FORUM, - event, - project.getMembers(), - source - ); + Set<Member> recipients = getRecipients(Notification.Type.FORUM, event, project.getMembers(), source); return notify(recipients, data); } @Override - public void notifySeminar( - FinalSeminar seminar, - SeminarEvent.Event event, - NotificationSource source - ) { + public void notifySeminar(FinalSeminar seminar, SeminarEvent.Event event, NotificationSource source) { Set<Member> recipients; - recipients = getRecipients( - Notification.Type.FINAL_SEMINAR, - event, - seminar.getMembers(), - source - ); + recipients = getRecipients(Notification.Type.FINAL_SEMINAR, event, seminar.getMembers(), source); notifyCustomSeminar(seminar, event, source, recipients); } @@ -297,12 +248,7 @@ public class NotificationControllerImpl implements NotificationController { data.setEvent(event); data.setSource(source.getMessage()); - Set<Member> recipients = getRecipients( - Notification.Type.PEER, - event, - review.getMembers(), - source - ); + Set<Member> recipients = getRecipients(Notification.Type.PEER, event, review.getMembers(), source); notify(recipients, data); } @@ -314,22 +260,13 @@ public class NotificationControllerImpl implements NotificationController { data.setEvent(event); data.setSource(source.getMessage()); - Set<Member> recipients = getRecipients( - Notification.Type.PEER, - event, - request.getMembers(), - source - ); + Set<Member> recipients = getRecipients(Notification.Type.PEER, event, request.getMembers(), source); notify(recipients, data); } @Override - public void notifyCustom( - CustomEvent.Event event, - NotificationSource source, - Set<Member> recipients - ) { + public void notifyCustom(CustomEvent.Event event, NotificationSource source, Set<Member> recipients) { final CustomEvent data = new CustomEvent(); data.setEvent(event); data.setSource(source.getMessage()); diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java index 471809581a..544ac8a59a 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java @@ -9,9 +9,7 @@ public class NotificationEventServiceImpl implements NotificationEventService { private final NotificationEventRepository notificationEventRepository; @Inject - public NotificationEventServiceImpl( - final NotificationEventRepository notificationEventRepository - ) { + public NotificationEventServiceImpl(final NotificationEventRepository notificationEventRepository) { this.notificationEventRepository = notificationEventRepository; } diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationService.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationService.java index f312500dd6..9b8d5b16ec 100755 --- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationService.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationService.java @@ -12,9 +12,7 @@ import se.su.dsv.scipro.system.GenericService; import se.su.dsv.scipro.system.User; public interface NotificationService - extends - GenericService<Notification, Long>, - FilteredService<Notification, Long, NotificationService.Filter> { + extends GenericService<Notification, Long>, FilteredService<Notification, Long, NotificationService.Filter> { long countUnread(User user); void markRead(User user); void setRead(User user, NotificationEvent notificationEvent, boolean read); diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java index 13efaadeee..a675451301 100755 --- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java @@ -18,9 +18,7 @@ import se.su.dsv.scipro.system.AbstractServiceImpl; import se.su.dsv.scipro.system.Pageable; import se.su.dsv.scipro.system.User; -public class NotificationServiceImpl - extends AbstractServiceImpl<Notification, Long> - implements NotificationService { +public class NotificationServiceImpl extends AbstractServiceImpl<Notification, Long> implements NotificationService { public static final int EMPTY = 0; @@ -34,9 +32,7 @@ public class NotificationServiceImpl if (user == null) { return EMPTY; } - return count( - QNotification.notification.user.eq(user).and(QNotification.notification.unread.isTrue()) - ); + return count(QNotification.notification.user.eq(user).and(QNotification.notification.unread.isTrue())); } @Override @@ -89,11 +85,7 @@ public class NotificationServiceImpl if (users.isEmpty()) { return new ArrayList<>(); } - return findAll( - QNotification.notification.unread - .isTrue() - .and(QNotification.notification.user.in(users)) - ); + return findAll(QNotification.notification.unread.isTrue().and(QNotification.notification.user.in(users))); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java b/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java index 236d325c37..00cbe6b0da 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java @@ -40,10 +40,7 @@ public class Notifications { eventBus.register(this); } - Notifications( - NotificationController notificationController, - NotificationService notificationService - ) { + Notifications(NotificationController notificationController, NotificationService notificationService) { this.notificationController = notificationController; this.notificationService = notificationService; } @@ -70,22 +67,14 @@ public class Notifications { public void finalSeminarCancelled(FinalSeminarCancelledEvent event) { NotificationSource source = new NotificationSource(); source.setMessage(event.getFinalSeminar().getProject().getTitle()); - notificationController.notifySeminar( - event.getFinalSeminar(), - SeminarEvent.Event.CANCELLED, - source - ); + notificationController.notifySeminar(event.getFinalSeminar(), SeminarEvent.Event.CANCELLED, source); } @Subscribe public void finalSeminarDeleted(FinalSeminarDeletedEvent event) { NotificationSource source = new NotificationSource(); source.setMessage(event.getFinalSeminar().getProject().getTitle()); - notificationController.notifySeminar( - event.getFinalSeminar(), - SeminarEvent.Event.CANCELLED, - source - ); + notificationController.notifySeminar(event.getFinalSeminar(), SeminarEvent.Event.CANCELLED, source); } @Subscribe diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/dataobject/MileStoneEvent.java b/core/src/main/java/se/su/dsv/scipro/notifications/dataobject/MileStoneEvent.java index e2748a94fc..97bfc74146 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/dataobject/MileStoneEvent.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/dataobject/MileStoneEvent.java @@ -70,9 +70,7 @@ public class MileStoneEvent extends NotificationEvent { @Override public String toString() { - return ( - "MileStoneEvent(milestone=" + this.getMilestone() + ", event=" + this.getEvent() + ")" - ); + return ("MileStoneEvent(milestone=" + this.getMilestone() + ", event=" + this.getEvent() + ")"); } protected boolean canEqual(final Object other) { diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/GroupEventFormatter.java b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/GroupEventFormatter.java index 09b34243b9..a0f19c795d 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/GroupEventFormatter.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/GroupEventFormatter.java @@ -16,10 +16,7 @@ public class GroupEventFormatter extends AbstractEventFormatter<GroupEvent> { public String format(GroupEvent event) { String title = event.getGroup().getTitle(); Set<Project> projects = event.getGroup().getProjects(); - String projectTitles = projects - .stream() - .map(Project::getTitle) - .collect(Collectors.joining(", ")); + String projectTitles = projects.stream().map(Project::getTitle).collect(Collectors.joining(", ")); String format = getProperty(event.getType().name()); return MessageFormat.format(format, title, projectTitles); } diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java index 4e15f6f57f..78d2591ea4 100755 --- a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java @@ -22,9 +22,7 @@ import se.su.dsv.scipro.util.PropsUtils; public class NotificationMailFormatterImpl implements NotificationMailFormatter { private static final int TITLE_TRUNCATION_LENGTH = 25; - private static final Logger LOGGER = LoggerFactory.getLogger( - NotificationMailFormatterImpl.class - ); + private static final Logger LOGGER = LoggerFactory.getLogger(NotificationMailFormatterImpl.class); @Inject GeneralSystemSettingsService systemSettingsService; @@ -47,10 +45,7 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter Provider<FinalSeminarService> finalSeminarService; protected String getFinalSeminarDeadline(FinalSeminar finalSeminar) { - return dateService.format( - finalSeminarService.get().thesisUploadDeadline(finalSeminar), - DateStyle.DATETIME - ); + return dateService.format(finalSeminarService.get().thesisUploadDeadline(finalSeminar), DateStyle.DATETIME); } protected String getFinalSeminarUploadedOnString(FinalSeminar finalSeminar) { @@ -62,19 +57,15 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter } } - private Map< - Class<? extends NotificationEvent>, - EventFormatter<? extends NotificationEvent> - > formatters = new HashMap<>(); + private Map<Class<? extends NotificationEvent>, EventFormatter<? extends NotificationEvent>> formatters = + new HashMap<>(); private Properties properties; public NotificationMailFormatterImpl() { Properties webProperties = null; try { - webProperties = PropsUtils.load( - "se/su/dsv/scipro/notifications/notifications.properties" - ); + webProperties = PropsUtils.load("se/su/dsv/scipro/notifications/notifications.properties"); } catch (IOException ex) { LOGGER.warn("Could not read web notification properties", ex); } @@ -111,11 +102,7 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter title = (project != null) ? project.getTitle() : ""; } - String subjectProperty = makeProperty( - notification.getType().name(), - notification.getEvent().name(), - "title" - ); + String subjectProperty = makeProperty(notification.getType().name(), notification.getEvent().name(), "title"); String subject = MessageFormat.format( getProperty(subjectProperty), title, @@ -123,11 +110,7 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter notification.getAdditionalSource() ); - String bodyProperty = makeProperty( - notification.getType().name(), - notification.getEvent().name(), - "body" - ); + String bodyProperty = makeProperty(notification.getType().name(), notification.getEvent().name(), "body"); String body = MessageFormat.format( getProperty(bodyProperty), notification.getSource(), @@ -138,22 +121,16 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter String details = ""; if (notification.getNotificationEvent().hasEntity()) { try { - Class<? extends NotificationEvent> eventClass = notification - .getNotificationEvent() - .getClass(); + Class<? extends NotificationEvent> eventClass = notification.getNotificationEvent().getClass(); @SuppressWarnings("unchecked") - EventFormatter<NotificationEvent> formatter = (EventFormatter< - NotificationEvent - >) formatters.get(eventClass); + EventFormatter<NotificationEvent> formatter = (EventFormatter<NotificationEvent>) formatters.get( + eventClass + ); details = formatter.format(notification.getNotificationEvent()); } catch (Exception ex) { details = ""; - LOGGER.error( - "Could not format event of type: " + - notification.getNotificationEvent().getClass(), - ex - ); + LOGGER.error("Could not format event of type: " + notification.getNotificationEvent().getClass(), ex); } } @@ -166,25 +143,16 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter @Override public NotificationMail compile(Collection<Notification> notifications) { - String subject = MessageFormat.format( - getProperty("compilation.subject"), - notifications.size() - ); + String subject = MessageFormat.format(getProperty("compilation.subject"), notifications.size()); StringBuilder contents = new StringBuilder(); - contents.append( - MessageFormat.format(getProperty("compilation.body"), notifications.size()) - ); + contents.append(MessageFormat.format(getProperty("compilation.body"), notifications.size())); contents.append(getProperty("compilation.list.begin")); MessageFormat format = new MessageFormat(getProperty("compilation.list.each")); for (Notification notification : notifications) { - String titleProperty = makeProperty( - notification.getType(), - notification.getEvent(), - "title" - ); + String titleProperty = makeProperty(notification.getType(), notification.getEvent(), "title"); String suffixProperty = makeProperty(notification.getType(), "compilationSuffix"); String causedByName = notification.getCausedBy() != null ? "by " + notification.getCausedBy().getFullName() @@ -211,9 +179,7 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter } private String getAbsoluteURL(final Notification notification) { - final String baseUrl = systemSettingsService - .getGeneralSystemSettingsInstance() - .getSciproURL(); + final String baseUrl = systemSettingsService.getGeneralSystemSettingsInstance().getSciproURL(); long id = notification.getNotificationEvent().getId(); return baseUrl + "/" + "notification" + "?id=" + id; } @@ -235,8 +201,7 @@ public class NotificationMailFormatterImpl implements NotificationMailFormatter } private void addAffixes(StringBuilder builder) { - GeneralSystemSettings systemSettings = - systemSettingsService.getGeneralSystemSettingsInstance(); + GeneralSystemSettings systemSettings = systemSettingsService.getGeneralSystemSettingsInstance(); String baseUrl = systemSettings.getSciproURL(); baseUrl = baseUrl + (!baseUrl.endsWith("/") ? "/" : "") + "notifications"; diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/ProjectEventFormatter.java b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/ProjectEventFormatter.java index bea2c987c6..1c6b6d3fe4 100755 --- a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/ProjectEventFormatter.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/ProjectEventFormatter.java @@ -27,14 +27,6 @@ class ProjectEventFormatter extends AbstractEventFormatter<ProjectEvent> { String reviewers = formatUserList(project.getReviewers(), Function.identity()); String format = getProperty(event.getType().name()); - return MessageFormat.format( - format, - title, - level, - authors, - supervisor, - coSupervisors, - reviewers - ); + return MessageFormat.format(format, title, level, authors, supervisor, coSupervisors, reviewers); } } diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/SeminarEventFormatter.java b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/SeminarEventFormatter.java index 793e45ba5d..8d0f770e90 100755 --- a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/SeminarEventFormatter.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/SeminarEventFormatter.java @@ -27,14 +27,8 @@ public class SeminarEventFormatter extends AbstractEventFormatter<SeminarEvent> String supervisor = formatUser(project.getHeadSupervisor()); String coSupervisors = formatUserList(project.getCoSupervisors(), Function.identity()); String reviewers = formatUserList(project.getReviewers(), Function.identity()); - String participants = formatUserList( - seminar.getActiveParticipations(), - FinalSeminarParticipation::getUser - ); - String oppositions = formatUserList( - seminar.getOppositions(), - FinalSeminarParticipation::getUser - ); + String participants = formatUserList(seminar.getActiveParticipations(), FinalSeminarParticipation::getUser); + String oppositions = formatUserList(seminar.getOppositions(), FinalSeminarParticipation::getUser); String format = getProperty(event.getType().name()); return MessageFormat.format( diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/DeliveryConfiguration.java b/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/DeliveryConfiguration.java index ffefe41f26..6831759f79 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/DeliveryConfiguration.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/DeliveryConfiguration.java @@ -15,10 +15,7 @@ import se.su.dsv.scipro.system.User; @Table( name = "notification_delivery_configuration", uniqueConstraints = { - @UniqueConstraint( - name = "uk_one_setting_per_user", - columnNames = { "type", "event", "method", "user_id" } - ), + @UniqueConstraint(name = "uk_one_setting_per_user", columnNames = { "type", "event", "method", "user_id" }), } ) public class DeliveryConfiguration extends Configuration { @@ -36,12 +33,7 @@ public class DeliveryConfiguration extends Configuration { public DeliveryConfiguration() {} - public DeliveryConfiguration( - Notification.Type type, - String event, - DeliveryMethod method, - User user - ) { + public DeliveryConfiguration(Notification.Type type, String event, DeliveryMethod method, User user) { super(type, event); this.method = method; this.user = user; diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/ReceiverConfiguration.java b/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/ReceiverConfiguration.java index 18f59b6b15..1c0227972d 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/ReceiverConfiguration.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/settings/entities/ReceiverConfiguration.java @@ -8,10 +8,7 @@ import se.su.dsv.scipro.notifications.dataobject.Notification; @Table( name = "notification_receiver_configuration", uniqueConstraints = { - @UniqueConstraint( - name = "one_setting_per_role", - columnNames = { "type", "event", "member" } - ), + @UniqueConstraint(name = "one_setting_per_role", columnNames = { "type", "event", "member" }), } ) public class ReceiverConfiguration extends Configuration { diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationService.java b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationService.java index c27ae3a1af..061b4a2bc0 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationService.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationService.java @@ -14,12 +14,7 @@ public interface DeliveryConfigurationService { Optional<User> user ); - boolean isDelivery( - Notification.Type type, - Enum event, - DeliveryMethod method, - Optional<User> user - ); + boolean isDelivery(Notification.Type type, Enum event, DeliveryMethod method, Optional<User> user); boolean isMailCompilation(User user); } diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java index 9fbb613fc6..63c8a2e277 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java @@ -23,10 +23,7 @@ public class DeliveryConfigurationServiceImpl private final UserProfileService profileService; @Inject - public DeliveryConfigurationServiceImpl( - Provider<EntityManager> em, - UserProfileService profileService - ) { + public DeliveryConfigurationServiceImpl(Provider<EntityManager> em, UserProfileService profileService) { super(em, DeliveryConfiguration.class, QDeliveryConfiguration.deliveryConfiguration); this.profileService = profileService; } @@ -58,17 +55,8 @@ public class DeliveryConfigurationServiceImpl final DeliveryMethod method, final User user ) { - final DeliveryConfiguration systemConfiguration = getSystemConfiguration( - type, - event, - method - ); - final DeliveryConfiguration userConfiguration = new DeliveryConfiguration( - type, - event.name(), - method, - user - ); + final DeliveryConfiguration systemConfiguration = getSystemConfiguration(type, event, method); + final DeliveryConfiguration userConfiguration = new DeliveryConfiguration(type, event.name(), method, user); userConfiguration.setEnabled(systemConfiguration.isEnabled()); return userConfiguration; } @@ -99,14 +87,7 @@ public class DeliveryConfigurationServiceImpl ) { QDeliveryConfiguration q = QDeliveryConfiguration.deliveryConfiguration; return Optional.ofNullable( - findOne( - allOf( - q.type.eq(type), - q.event.eq(event.name()), - q.method.eq(method), - q.user.eq(user) - ) - ) + findOne(allOf(q.type.eq(type), q.event.eq(event.name()), q.method.eq(method), q.user.eq(user))) ); } diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java index 1e646ff494..24b86eff29 100644 --- a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java @@ -23,12 +23,7 @@ public class ReceiverConfigurationServiceImpl @Override @Transactional - public boolean setReceiving( - Notification.Type type, - Enum event, - Member.Type member, - boolean receives - ) { + public boolean setReceiving(Notification.Type type, Enum event, Member.Type member, boolean receives) { ReceiverConfiguration configuration = getConfigurationEntity(type, event, member); configuration.setEnabled(receives); configuration = save(configuration); @@ -41,18 +36,10 @@ public class ReceiverConfigurationServiceImpl return configuration.isEnabled(); } - private ReceiverConfiguration getConfigurationEntity( - Notification.Type type, - Enum event, - Member.Type member - ) { + private ReceiverConfiguration getConfigurationEntity(Notification.Type type, Enum event, Member.Type member) { QReceiverConfiguration qConfiguration = QReceiverConfiguration.receiverConfiguration; ReceiverConfiguration configuration = findOne( - allOf( - qConfiguration.type.eq(type), - qConfiguration.event.eq(event.name()), - qConfiguration.member.eq(member) - ) + allOf(qConfiguration.type.eq(type), qConfiguration.event.eq(event.name()), qConfiguration.member.eq(member)) ); if (configuration == null) { configuration = new ReceiverConfiguration(type, event, member); diff --git a/core/src/main/java/se/su/dsv/scipro/peer/Comment.java b/core/src/main/java/se/su/dsv/scipro/peer/Comment.java index 84396bc1dc..637fae5ab1 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/Comment.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/Comment.java @@ -77,13 +77,7 @@ public class Comment extends DomainObject { @Override public String toString() { return ( - "Comment(id=" + - this.getId() + - ", creator=" + - this.getCreator() + - ", comment=" + - this.getComment() + - ")" + "Comment(id=" + this.getId() + ", creator=" + this.getCreator() + ", comment=" + this.getComment() + ")" ); } diff --git a/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java index 80ce830a9b..fc07b334d6 100644 --- a/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java @@ -6,9 +6,7 @@ import jakarta.persistence.EntityManager; import java.util.List; import se.su.dsv.scipro.system.AbstractServiceImpl; -public class CommentServiceImpl - extends AbstractServiceImpl<Comment, Long> - implements CommentService { +public class CommentServiceImpl extends AbstractServiceImpl<Comment, Long> implements CommentService { @Inject public CommentServiceImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/peer/CommentThread.java b/core/src/main/java/se/su/dsv/scipro/peer/CommentThread.java index b38af6bbfc..7e44829aae 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/CommentThread.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/CommentThread.java @@ -10,10 +10,7 @@ import se.su.dsv.scipro.system.DomainObject; @Table( name = "comment_thread", uniqueConstraints = { - @UniqueConstraint( - name = "uk_comment_thread_id_key", - columnNames = { "commentable_key", "commentable_id" } - ), + @UniqueConstraint(name = "uk_comment_thread_id_key", columnNames = { "commentable_key", "commentable_id" }), } ) @Cacheable(true) diff --git a/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java index 621bc4049c..9f59b20459 100644 --- a/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java @@ -7,9 +7,7 @@ import jakarta.inject.Provider; import jakarta.persistence.EntityManager; import se.su.dsv.scipro.system.GenericRepo; -public class CommentThreadRepoImpl - extends GenericRepo<CommentThread, Long> - implements CommentThreadRepo { +public class CommentThreadRepoImpl extends GenericRepo<CommentThread, Long> implements CommentThreadRepo { @Inject public CommentThreadRepoImpl(Provider<EntityManager> em) { @@ -19,8 +17,6 @@ public class CommentThreadRepoImpl @Override public CommentThread getCommentThread(String commentableKey, long commentableId) { QCommentThread thread = QCommentThread.commentThread; - return findOne( - allOf(thread.commentableKey.eq(commentableKey), thread.commentableId.eq(commentableId)) - ); + return findOne(allOf(thread.commentableKey.eq(commentableKey), thread.commentableId.eq(commentableId))); } } diff --git a/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java b/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java index 4d02cc8383..1eb0f8193e 100644 --- a/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java @@ -28,10 +28,7 @@ public class ExpiredRequestWorker extends AbstractWorker { final Instant now = Instant.now(); for (PeerRequest request : requests) { - ProjectTypeSettings settings = request - .getProject() - .getProjectType() - .getProjectTypeSettings(); + ProjectTypeSettings settings = request.getProject().getProjectType().getProjectTypeSettings(); Date expirationDate = Date.from( now.minus(Duration.ofDays(settings.getNumDaysBeforePeerGetsCancelled())) ); diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java index e238e80e34..17b8612a80 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java @@ -104,11 +104,7 @@ public class PeerPortalImpl implements PeerPortal, PerformReviewService { } } - private boolean recentlyReviewedProject( - Project requestingProject, - User student, - Project activeProject - ) { + private boolean recentlyReviewedProject(Project requestingProject, User student, Project activeProject) { ProjectTypeSettings settings = requestingProject.getProjectType().getProjectTypeSettings(); int daysBetweenReviewsOnSameProject = settings.getNumDaysBetweenPeerReviewsOnSameProject(); @@ -120,11 +116,7 @@ public class PeerPortalImpl implements PeerPortal, PerformReviewService { Iterable<PeerReview> performedReviews = peerReviewRepository.findAll( qReview.reviewer .eq(student) - .and( - qReview.project - .eq(activeProject) - .and(qReview.status.eq(PeerReview.ReviewStatus.EXPIRED).not()) - ) + .and(qReview.project.eq(activeProject).and(qReview.status.eq(PeerReview.ReviewStatus.EXPIRED).not())) ); for (PeerReview pr : performedReviews) { boolean sameProject = pr.getPeerRequest().getProject().equals(requestingProject); @@ -152,11 +144,7 @@ public class PeerPortalImpl implements PeerPortal, PerformReviewService { public PeerReview getInProgressReview(User peerReviewer, Project project) { QPeerReview q = QPeerReview.peerReview; return peerReviewRepository.findOne( - allOf( - q.reviewer.eq(peerReviewer), - q.status.eq(PeerReview.ReviewStatus.IN_PROGRESS), - q.project.eq(project) - ) + allOf(q.reviewer.eq(peerReviewer), q.status.eq(PeerReview.ReviewStatus.IN_PROGRESS), q.project.eq(project)) ); } @@ -167,17 +155,13 @@ public class PeerPortalImpl implements PeerPortal, PerformReviewService { } @Override - @Transactional( - dontRollbackOn = { TooShortCommentException.class, MissingAnswerException.class } - ) + @Transactional(dontRollbackOn = { TooShortCommentException.class, MissingAnswerException.class }) public void submit(PeerReview review, Optional<FileUpload> upload) { review.submit(); final Optional<FileReference> fileDescription = storePeerReviewFileUpload(upload); fileDescription.ifPresent(review::setFile); fileDescription.ifPresent(storeInFiles(review.getProject(), FileSource.PEER_REVIEW)); - fileDescription.ifPresent( - storeInFiles(review.getPeerRequest().getProject(), FileSource.PEER_REQUEST) - ); + fileDescription.ifPresent(storeInFiles(review.getPeerRequest().getProject(), FileSource.PEER_REQUEST)); PeerRequest request = review.getPeerRequest(); request.setStatus(review.isLate() ? RequestStatus.WAITING : RequestStatus.FINISHED); peerRequestRepository.save(request); @@ -188,12 +172,8 @@ public class PeerPortalImpl implements PeerPortal, PerformReviewService { } } - private Consumer<? super FileReference> storeInFiles( - final Project project, - final FileSource fileSource - ) { - return reference -> - projectFileService.promote(reference.getFileDescription(), project, fileSource); + private Consumer<? super FileReference> storeInFiles(final Project project, final FileSource fileSource) { + return reference -> projectFileService.promote(reference.getFileDescription(), project, fileSource); } private void postCompletionEvent(PeerReview peerReview) { diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequest.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequest.java index d7d692cfbc..37353ad555 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequest.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequest.java @@ -158,9 +158,7 @@ public class PeerRequest extends DomainObject { public List<Member> getMembers() { List<Member> members = project.getMembers(); - members.removeIf( - member -> member.getType() == Member.Type.AUTHOR && member.getUser().equals(requester) - ); + members.removeIf(member -> member.getType() == Member.Type.AUTHOR && member.getUser().equals(requester)); members.add(new Member(requester, Member.Type.PEER_REQUESTER)); return members; diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java index 8aa67ec09b..b237a4fb4f 100644 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java @@ -5,9 +5,7 @@ import jakarta.inject.Provider; import jakarta.persistence.EntityManager; import se.su.dsv.scipro.system.GenericRepo; -public class PeerRequestRepositoryImpl - extends GenericRepo<PeerRequest, Long> - implements PeerRequestRepository { +public class PeerRequestRepositoryImpl extends GenericRepo<PeerRequest, Long> implements PeerRequestRepository { @Inject public PeerRequestRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestService.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestService.java index 344f8c1e6b..17e9cea674 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestService.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestService.java @@ -9,15 +9,8 @@ import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.Pageable; public interface PeerRequestService - extends - GenericService<PeerRequest, Long>, - FilteredService<PeerRequest, Long, PeerRequestService.Filter> { - List<PeerRequest> findAvailableRequests( - User user, - RequestStatus status, - ProjectType pc, - Pageable pageable - ); + extends GenericService<PeerRequest, Long>, FilteredService<PeerRequest, Long, PeerRequestService.Filter> { + List<PeerRequest> findAvailableRequests(User user, RequestStatus status, ProjectType pc, Pageable pageable); List<PeerRequest> findByStatus(RequestStatus status); diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java index 2c19b39a66..16938e1036 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java @@ -20,19 +20,13 @@ import se.su.dsv.scipro.system.Pageable; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.User; -public class PeerRequestServiceImpl - extends AbstractServiceImpl<PeerRequest, Long> - implements PeerRequestService { +public class PeerRequestServiceImpl extends AbstractServiceImpl<PeerRequest, Long> implements PeerRequestService { private final EventBus eventBus; private final FileService fileService; @Inject - public PeerRequestServiceImpl( - Provider<EntityManager> em, - final EventBus eventBus, - final FileService fileService - ) { + public PeerRequestServiceImpl(Provider<EntityManager> em, final EventBus eventBus, final FileService fileService) { super(em, PeerRequest.class, QPeerRequest.peerRequest); this.eventBus = eventBus; this.fileService = fileService; @@ -128,20 +122,11 @@ public class PeerRequestServiceImpl } @Override - public List<PeerRequest> findAvailableRequests( - User user, - RequestStatus status, - ProjectType pc, - Pageable pageable - ) { + public List<PeerRequest> findAvailableRequests(User user, RequestStatus status, ProjectType pc, Pageable pageable) { if (status != null && pc != null) { return findAll( hasStatus(status) - .and( - projectTypeIs(pc).and( - QPeerRequest.peerRequest.project.projectStatus.eq(ProjectStatus.ACTIVE) - ) - ) + .and(projectTypeIs(pc).and(QPeerRequest.peerRequest.project.projectStatus.eq(ProjectStatus.ACTIVE))) .and(QPeerRequest.peerRequest.project.projectParticipants.any().eq(user).not()), pageable ); diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepository.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepository.java index fd96ba7f16..8579206a4c 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepository.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepository.java @@ -6,7 +6,6 @@ import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.QueryDslPredicateExecutor; import se.su.dsv.scipro.system.User; -public interface PeerReviewRepository - extends JpaRepository<PeerReview, Long>, QueryDslPredicateExecutor<PeerReview> { +public interface PeerReviewRepository extends JpaRepository<PeerReview, Long>, QueryDslPredicateExecutor<PeerReview> { List<PeerReview> findNonExpiredReviewsByProjectAuthor(User student, ProjectType projectType); } diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java index 43a04a0145..fda28be6e8 100644 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java @@ -8,9 +8,7 @@ import se.su.dsv.scipro.system.GenericRepo; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.User; -public class PeerReviewRepositoryImpl - extends GenericRepo<PeerReview, Long> - implements PeerReviewRepository { +public class PeerReviewRepositoryImpl extends GenericRepo<PeerReview, Long> implements PeerReviewRepository { @Inject public PeerReviewRepositoryImpl(Provider<EntityManager> em) { @@ -18,10 +16,7 @@ public class PeerReviewRepositoryImpl } @Override - public List<PeerReview> findNonExpiredReviewsByProjectAuthor( - User student, - ProjectType projectType - ) { + public List<PeerReview> findNonExpiredReviewsByProjectAuthor(User student, ProjectType projectType) { return createQuery() .where(QPeerReview.peerReview.reviewer.eq(student)) .where(QPeerReview.peerReview.project.projectType.eq(projectType)) diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java index 556cfc0c00..13e1eae730 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java @@ -9,9 +9,7 @@ import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.Pageable; public interface PeerReviewService - extends - GenericService<PeerReview, Long>, - FilteredService<PeerReview, Long, PeerReviewService.Filter> { + extends GenericService<PeerReview, Long>, FilteredService<PeerReview, Long, PeerReviewService.Filter> { List<PeerReview> findNonExpiredReviewsByProjectAuthor(User student, Project project); List<PeerReview> findAllCompleted(Pageable pageable); List<PeerReview> findInProgressReviews(User student, Project project); diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java index 8d268fd286..8758af46c6 100755 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java @@ -14,18 +14,13 @@ import se.su.dsv.scipro.system.Pageable; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.User; -public class PeerReviewServiceImpl - extends AbstractServiceImpl<PeerReview, Long> - implements PeerReviewService { +public class PeerReviewServiceImpl extends AbstractServiceImpl<PeerReview, Long> implements PeerReviewService { public static final long EMPTY_RESULT = 0L; private final PeerReviewRepository peerReviewRepository; @Inject - public PeerReviewServiceImpl( - Provider<EntityManager> em, - PeerReviewRepository peerReviewRepository - ) { + public PeerReviewServiceImpl(Provider<EntityManager> em, PeerReviewRepository peerReviewRepository) { super(em, PeerReview.class, QPeerReview.peerReview); this.peerReviewRepository = peerReviewRepository; } @@ -42,10 +37,7 @@ public class PeerReviewServiceImpl @Override public List<PeerReview> findNonExpiredReviewsByProjectAuthor(User student, Project project) { - return peerReviewRepository.findNonExpiredReviewsByProjectAuthor( - student, - project.getProjectType() - ); + return peerReviewRepository.findNonExpiredReviewsByProjectAuthor(student, project.getProjectType()); } private BooleanBuilder fromParams(Filter params) { @@ -105,9 +97,7 @@ public class PeerReviewServiceImpl @Override public List<PeerReview> findInProgressReviews(User student, Project project) { return findAll( - reviewerIs(student).and( - reviewProjectIs(project).and(hasStatus(PeerReview.ReviewStatus.IN_PROGRESS)) - ) + reviewerIs(student).and(reviewProjectIs(project).and(hasStatus(PeerReview.ReviewStatus.IN_PROGRESS))) ); } diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java index 03ea2eab70..f9a400c702 100644 --- a/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java +++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java @@ -27,14 +27,8 @@ public class PeerWorkerSchedules implements Lifecycle { @Override public void start() { - scheduler - .schedule("Peer request-expiration worker") - .runBy(expiredRequestWorker) - .dailyAt(23, 0); - scheduler - .schedule("Peer review-expiration worker") - .runBy(expiredReviewResetWorker) - .every(10, TimeUnit.MINUTES); + scheduler.schedule("Peer request-expiration worker").runBy(expiredRequestWorker).dailyAt(23, 0); + scheduler.schedule("Peer review-expiration worker").runBy(expiredReviewResetWorker).every(10, TimeUnit.MINUTES); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java index 960e31d692..137c4aacaf 100755 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java @@ -43,9 +43,7 @@ public class PlagiarismControlImpl implements PlagiarismControl { @Override public Status getStatus(final FileDescription file) { - Optional<UrkundSubmission> optionalUrkundSubmission = urkundSubmissionRepository.findByFile( - file - ); + Optional<UrkundSubmission> optionalUrkundSubmission = urkundSubmissionRepository.findByFile(file); if (optionalUrkundSubmission.isPresent()) { UrkundSubmission urkundSubmission = optionalUrkundSubmission.get(); return switch (urkundSubmission.getState()) { @@ -60,8 +58,7 @@ public class PlagiarismControlImpl implements PlagiarismControl { }; } - Optional<PlagiarismRequest> submissionRequested = - plagiarismRequestRepository.findByFileDescription(file); + Optional<PlagiarismRequest> submissionRequested = plagiarismRequestRepository.findByFileDescription(file); if (submissionRequested.isPresent()) { return new Status.Submitted(); } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/DocumentInfo.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/DocumentInfo.java index 065831462f..9e4b5793ad 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/DocumentInfo.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/DocumentInfo.java @@ -54,12 +54,7 @@ final class DocumentInfo { @Override public int hashCode() { - return Objects.hash( - this.getId(), - this.getAccepted(), - this.getDownloadUrl(), - this.getOptOutInfo() - ); + return Objects.hash(this.getId(), this.getAccepted(), this.getDownloadUrl(), this.getOptOutInfo()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/ErrorInfo.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/ErrorInfo.java index 455ed7a98c..0cbf97e3c6 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/ErrorInfo.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/ErrorInfo.java @@ -18,10 +18,7 @@ final class ErrorInfo implements UrkundResponse { } @Override - public <X> X fold( - final Function<ErrorInfo, X> ifError, - final Function<SubmissionInfo, X> ifSubmission - ) { + public <X> X fold(final Function<ErrorInfo, X> ifError, final Function<SubmissionInfo, X> ifSubmission) { return ifError.apply(this); } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/OptOutInfo.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/OptOutInfo.java index 01c7bc6cc1..7425a4c0cd 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/OptOutInfo.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/OptOutInfo.java @@ -26,10 +26,7 @@ final class OptOutInfo { if (o == this) return true; if (!(o instanceof OptOutInfo)) return false; final OptOutInfo other = (OptOutInfo) o; - return ( - Objects.equals(this.getUrl(), other.getUrl()) && - Objects.equals(this.getPurpose(), other.getPurpose()) - ); + return (Objects.equals(this.getUrl(), other.getUrl()) && Objects.equals(this.getPurpose(), other.getPurpose())); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusInfo.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusInfo.java index b2c91b44c8..2b20d6a3b0 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusInfo.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusInfo.java @@ -16,10 +16,7 @@ final class StatusInfo { private final State state; private final String userFriendlyMessage; - public StatusInfo( - @JsonProperty("State") State state, - @JsonProperty("Message") String userFriendlyMessage - ) { + public StatusInfo(@JsonProperty("State") State state, @JsonProperty("Message") String userFriendlyMessage) { this.state = state; this.userFriendlyMessage = userFriendlyMessage; } @@ -50,12 +47,6 @@ final class StatusInfo { @Override public String toString() { - return ( - "StatusInfo(state=" + - this.getState() + - ", userFriendlyMessage=" + - this.getUserFriendlyMessage() + - ")" - ); + return ("StatusInfo(state=" + this.getState() + ", userFriendlyMessage=" + this.getUserFriendlyMessage() + ")"); } } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java index 2126eeba19..320d3323db 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java @@ -44,14 +44,10 @@ public class StatusPollingWorker extends AbstractWorker { final boolean updated = urkundResponse.fold( errorInfo -> Boolean.FALSE, submissionInfo -> { - final UrkundSubmission.State state = Util.getState( - submissionInfo.getStatus().getState() - ); + final UrkundSubmission.State state = Util.getState(submissionInfo.getStatus().getState()); if (state != submission.getState()) { submission.setState(state); - submission.setMessage( - submissionInfo.getStatus().getUserFriendlyMessage() - ); + submission.setMessage(submissionInfo.getStatus().getUserFriendlyMessage()); submissionInfo .getReport() .map(ReportInfo::getReportUrl) @@ -71,11 +67,7 @@ public class StatusPollingWorker extends AbstractWorker { submission.setNextPoll(nextPoll); if (updated) { if (submission.getState().isFinal()) { - LOG.info( - "{} reached the final state {}", - submission, - submission.getState() - ); + LOG.info("{} reached the final state {}", submission, submission.getState()); } else { LOG.info( "{} reached {} state, will poll again in {}", diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/SubmissionInfo.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/SubmissionInfo.java index b5275f937f..f9c73ba306 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/SubmissionInfo.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/SubmissionInfo.java @@ -49,10 +49,7 @@ final class SubmissionInfo implements UrkundResponse { } @Override - public <X> X fold( - final Function<ErrorInfo, X> ifError, - final Function<SubmissionInfo, X> ifSubmission - ) { + public <X> X fold(final Function<ErrorInfo, X> ifError, final Function<SubmissionInfo, X> ifSubmission) { return ifSubmission.apply(this); } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java index 3b61fdfb34..3d78a715c7 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java @@ -34,10 +34,7 @@ public class UrkundApiImpl implements UrkundApi { private final FileService fileService; @Inject - public UrkundApiImpl( - final UrkundSettingsRepository urkundSettingsRepository, - FileService fileService - ) { + public UrkundApiImpl(final UrkundSettingsRepository urkundSettingsRepository, FileService fileService) { this.urkundSettingsRepository = urkundSettingsRepository; this.fileService = fileService; objectMapper = new ObjectMapper(); @@ -54,14 +51,7 @@ public class UrkundApiImpl implements UrkundApi { file.getSize() ) ) - .uri( - URI.create( - "https://secure.urkund.com/api/rest/submissions/" + - receiver + - "/" + - file.getId() - ) - ) + .uri(URI.create("https://secure.urkund.com/api/rest/submissions/" + receiver + "/" + file.getId())) .header("x-urkund-filename", urkundFilename(file)) .header("x-urkund-submitter", file.getUploader().getEmailAddress()) .header("Accept", "application/json") @@ -82,14 +72,7 @@ public class UrkundApiImpl implements UrkundApi { final String analysisAddress = analysisAddress(receiver).orElse(receiver); final HttpRequest httpPost = HttpRequest.newBuilder() .GET() - .uri( - URI.create( - "https://secure.urkund.com/api/rest/submissions/" + - analysisAddress + - "/" + - file.getId() - ) - ) + .uri(URI.create("https://secure.urkund.com/api/rest/submissions/" + analysisAddress + "/" + file.getId())) .header("Accept", "application/json") .build(); @@ -106,9 +89,7 @@ public class UrkundApiImpl implements UrkundApi { final List<ReceiverInfo> receiverInfos = sendToUrkund_(httpGet, response -> objectMapper.readValue( response.body(), - objectMapper - .getTypeFactory() - .constructCollectionType(List.class, ReceiverInfo.class) + objectMapper.getTypeFactory().constructCollectionType(List.class, ReceiverInfo.class) ) ); return receiverInfos @@ -122,19 +103,11 @@ public class UrkundApiImpl implements UrkundApi { B apply(A a) throws IOException; } - private <A> A sendToUrkund_( - final HttpRequest request, - final FailingFunction<HttpResponse<InputStream>, A> f - ) { + private <A> A sendToUrkund_(final HttpRequest request, final FailingFunction<HttpResponse<InputStream>, A> f) { UrkundSettings urkundSettings = urkundSettingsRepository.getSettings(); - HttpClient client = HttpClient.newBuilder() - .authenticator(new UrkundAuthenticator(urkundSettings)) - .build(); + HttpClient client = HttpClient.newBuilder().authenticator(new UrkundAuthenticator(urkundSettings)).build(); try { - final HttpResponse<InputStream> response = client.send( - request, - HttpResponse.BodyHandlers.ofInputStream() - ); + final HttpResponse<InputStream> response = client.send(request, HttpResponse.BodyHandlers.ofInputStream()); return f.apply(response); } catch (IOException e) { throw new UncheckedIOException(e); @@ -150,9 +123,7 @@ public class UrkundApiImpl implements UrkundApi { case 200: final List<SubmissionInfo> submissionInfos = objectMapper.readValue( response.body(), - objectMapper - .getTypeFactory() - .constructCollectionType(List.class, SubmissionInfo.class) + objectMapper.getTypeFactory().constructCollectionType(List.class, SubmissionInfo.class) ); return submissionInfos.get(0); case 202: @@ -163,13 +134,8 @@ public class UrkundApiImpl implements UrkundApi { case 413: return objectMapper.readValue(response.body(), ErrorInfo.class); default: - final String body = new String( - response.body().readAllBytes(), - StandardCharsets.UTF_8 - ); - throw new RuntimeException( - "Unknown response from URKUND: " + response.statusCode() + ": " + body - ); + final String body = new String(response.body().readAllBytes(), StandardCharsets.UTF_8); + throw new RuntimeException("Unknown response from URKUND: " + response.statusCode() + ": " + body); } }); } @@ -184,10 +150,7 @@ public class UrkundApiImpl implements UrkundApi { @Override protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication( - settings.getUsername(), - settings.getPassword().toCharArray() - ); + return new PasswordAuthentication(settings.getUsername(), settings.getPassword().toCharArray()); } } @@ -196,10 +159,7 @@ public class UrkundApiImpl implements UrkundApi { private final HttpRequest.BodyPublisher bodyPublisher; private final long size; - public FixedSizeBodyPublisher( - final HttpRequest.BodyPublisher bodyPublisher, - final long size - ) { + public FixedSizeBodyPublisher(final HttpRequest.BodyPublisher bodyPublisher, final long size) { this.bodyPublisher = bodyPublisher; this.size = size; } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundResponse.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundResponse.java index 4f88dfd6a4..09e28f1e99 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundResponse.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundResponse.java @@ -6,7 +6,6 @@ interface UrkundResponse { <X> X fold(Function<ErrorInfo, X> ifError, Function<SubmissionInfo, X> ifSubmission); default String getUserFriendlyMessage() { - return fold(ErrorInfo::getUserFriendlyMessage, si -> si.getStatus().getUserFriendlyMessage() - ); + return fold(ErrorInfo::getUserFriendlyMessage, si -> si.getStatus().getUserFriendlyMessage()); } } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java index f7908cc8df..187af3a1bc 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java @@ -54,10 +54,7 @@ public class UrkundServiceImpl implements UrkundService { .orElseGet(() -> missingAnalysisAddress(file, receiver)); } - private UrkundSubmission missingAnalysisAddress( - final FileDescription file, - final User receiver - ) { + private UrkundSubmission missingAnalysisAddress(final FileDescription file, final User receiver) { final FileReference reference = fileService.createReference(file); final UrkundSubmission submission = new UrkundSubmission(); submission.setMessage(receiver.getFullName() + " has no analysis address for URKUND"); @@ -102,9 +99,7 @@ public class UrkundServiceImpl implements UrkundService { submissionInfo -> submissionInfo.getSubmitted().toInstant(ZoneOffset.UTC) ) ); - submission.setNextPoll( - submission.getSubmitted().plus(submission.getPollingDelay().getDuration()) - ); + submission.setNextPoll(submission.getSubmitted().plus(submission.getPollingDelay().getDuration())); return urkundSubmissionRepository.save(submission); } } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java index e7c6548bfa..e140ef1d99 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java @@ -16,9 +16,7 @@ public class UrkundSettingsRepositoryImpl implements UrkundSettingsRepository { @Override public UrkundSettings getSettings() { - final UrkundSettings urkundSettings = entityManagerProvider - .get() - .find(UrkundSettings.class, UrkundSettings.ID); + final UrkundSettings urkundSettings = entityManagerProvider.get().find(UrkundSettings.class, UrkundSettings.ID); return Optional.ofNullable(urkundSettings).orElse(new UrkundSettings()); } diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java index 949543a15f..3077c38905 100644 --- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java @@ -19,9 +19,7 @@ public class UrkundSubmissionRepositoryImpl implements UrkundSubmissionRepositor @Override public Optional<UrkundSubmission> findByFile(final FileDescription file) { - final UrkundSubmission urkundSubmission = new JPAQuery<UrkundSubmission>( - entityManagerProvider.get() - ) + final UrkundSubmission urkundSubmission = new JPAQuery<UrkundSubmission>(entityManagerProvider.get()) .from(QUrkundSubmission.urkundSubmission) .where(QUrkundSubmission.urkundSubmission.document.fileDescription.eq(file)) .fetchOne(); diff --git a/core/src/main/java/se/su/dsv/scipro/project/Author.java b/core/src/main/java/se/su/dsv/scipro/project/Author.java index 5f733cd8ef..73eff81e1d 100644 --- a/core/src/main/java/se/su/dsv/scipro/project/Author.java +++ b/core/src/main/java/se/su/dsv/scipro/project/Author.java @@ -88,9 +88,7 @@ public class Author { return subscribedToFinalSeminarNotifications; } - public void setSubscribedToFinalSeminarNotifications( - boolean subscribedToFinalSeminarNotifications - ) { + public void setSubscribedToFinalSeminarNotifications(boolean subscribedToFinalSeminarNotifications) { this.subscribedToFinalSeminarNotifications = subscribedToFinalSeminarNotifications; } @@ -134,10 +132,7 @@ public class Author { return false; } AuthorPK authorPK = (AuthorPK) o; - return ( - Objects.equals(projectId, authorPK.projectId) && - Objects.equals(userId, authorPK.userId) - ); + return (Objects.equals(projectId, authorPK.projectId) && Objects.equals(userId, authorPK.userId)); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/project/Project.java b/core/src/main/java/se/su/dsv/scipro/project/Project.java index 995cb4b06f..82f8400f9c 100755 --- a/core/src/main/java/se/su/dsv/scipro/project/Project.java +++ b/core/src/main/java/se/su/dsv/scipro/project/Project.java @@ -472,10 +472,7 @@ public class Project extends DomainObject { } public String getAuthorNames() { - return getProjectParticipants() - .stream() - .map(User::getFullName) - .collect(Collectors.joining(", ")); + return getProjectParticipants().stream().map(User::getFullName).collect(Collectors.joining(", ")); } public boolean hasExternalOrganization() { diff --git a/core/src/main/java/se/su/dsv/scipro/project/ProjectRepo.java b/core/src/main/java/se/su/dsv/scipro/project/ProjectRepo.java index 3eeebbbb4b..72647b772b 100755 --- a/core/src/main/java/se/su/dsv/scipro/project/ProjectRepo.java +++ b/core/src/main/java/se/su/dsv/scipro/project/ProjectRepo.java @@ -8,8 +8,7 @@ import se.su.dsv.scipro.system.QueryDslPredicateExecutor; import se.su.dsv.scipro.system.User; @Transactional -public interface ProjectRepo - extends JpaRepository<Project, Long>, QueryDslPredicateExecutor<Project> { +public interface ProjectRepo extends JpaRepository<Project, Long>, QueryDslPredicateExecutor<Project> { List<User> findMultipleAuthors(Collection<Project> projects); String getUserNoteForProject(Project project, User user); diff --git a/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java index 8b538659a8..b6da36a842 100755 --- a/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java @@ -31,12 +31,7 @@ public class ProjectServiceImpl private final EventBus eventBus; @Inject - public ProjectServiceImpl( - ProjectRepo projectRepo, - Clock clock, - EventBus eventBus, - Provider<EntityManager> em - ) { + public ProjectServiceImpl(ProjectRepo projectRepo, Clock clock, EventBus eventBus, Provider<EntityManager> em) { super(em, Project.class, QProject.project); this.projectRepo = projectRepo; this.clock = clock; @@ -136,9 +131,7 @@ public class ProjectServiceImpl @Override public List<Project> getActiveProjectsByUserAndProjectType(User author, ProjectType pc) { - return findAll( - hasStatus(ProjectStatus.ACTIVE).and(hasProjectType(pc)).and(isAuthor(author)) - ); + return findAll(hasStatus(ProjectStatus.ACTIVE).and(hasProjectType(pc)).and(isAuthor(author))); } @Override @@ -228,10 +221,7 @@ public class ProjectServiceImpl predicate.and(QProject.project.reviewers.any().eq(filter.getReviewer())); } - if ( - filter.getTitleContains() != null && - filter.getTitleContains().length() >= MIN_TITLE_LENGTH - ) { + if (filter.getTitleContains() != null && filter.getTitleContains().length() >= MIN_TITLE_LENGTH) { predicate.and(titleContains(filter.getTitleContains())); } if (filter.getCreatedAfter() != null) { diff --git a/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java index fb50962cb9..fc657c02c6 100644 --- a/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java @@ -7,9 +7,7 @@ import jakarta.transaction.Transactional; import java.util.Collection; import se.su.dsv.scipro.system.AbstractRepository; -public class ProjectPartnerRepositoryImpl - extends AbstractRepository - implements ProjectPartnerRepository { +public class ProjectPartnerRepositoryImpl extends AbstractRepository implements ProjectPartnerRepository { @Inject public ProjectPartnerRepositoryImpl(Provider<EntityManager> em) { @@ -18,9 +16,7 @@ public class ProjectPartnerRepositoryImpl @Override public Collection<ProjectPartner> getActive() { - return from(QProjectPartner.projectPartner) - .where(QProjectPartner.projectPartner.active.isTrue()) - .fetch(); + return from(QProjectPartner.projectPartner).where(QProjectPartner.projectPartner.active.isTrue()).fetch(); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java b/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java index 647c4d51e8..4e3e38d937 100644 --- a/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java @@ -14,10 +14,7 @@ public class RemoveFulfilledPartnerAdsWorker extends AbstractWorker { private final ProjectPartnerRepository projectPartnerRepository; @Inject - public RemoveFulfilledPartnerAdsWorker( - IdeaService ideaService, - ProjectPartnerRepository projectPartnerRepository - ) { + public RemoveFulfilledPartnerAdsWorker(IdeaService ideaService, ProjectPartnerRepository projectPartnerRepository) { this.ideaService = ideaService; this.projectPartnerRepository = projectPartnerRepository; } diff --git a/core/src/main/java/se/su/dsv/scipro/reflection/Reflection.java b/core/src/main/java/se/su/dsv/scipro/reflection/Reflection.java index 7dc2ebb2df..965c5b3aaf 100644 --- a/core/src/main/java/se/su/dsv/scipro/reflection/Reflection.java +++ b/core/src/main/java/se/su/dsv/scipro/reflection/Reflection.java @@ -17,8 +17,7 @@ public sealed interface Reflection { } } - record ImprovementsNeeded(String oldReflection, String commentBySupervisor) - implements Reflection { + record ImprovementsNeeded(String oldReflection, String commentBySupervisor) implements Reflection { @Override public boolean isSubmittable() { return true; diff --git a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsRequestedEvent.java b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsRequestedEvent.java index 32359d46d4..bb2725cf31 100644 --- a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsRequestedEvent.java +++ b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsRequestedEvent.java @@ -3,8 +3,4 @@ package se.su.dsv.scipro.reflection; import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.system.User; -public record ReflectionImprovementsRequestedEvent( - Project project, - User author, - String supervisorComment -) {} +public record ReflectionImprovementsRequestedEvent(Project project, User author, String supervisorComment) {} diff --git a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsSubmittedEvent.java b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsSubmittedEvent.java index 488c103f2f..ab4e11b853 100644 --- a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsSubmittedEvent.java +++ b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionImprovementsSubmittedEvent.java @@ -6,8 +6,4 @@ import se.su.dsv.scipro.system.User; /** * This event may be triggered by the supervisor if they edit the reflection after requesting improvements. */ -public record ReflectionImprovementsSubmittedEvent( - Project project, - User author, - String reflection -) {} +public record ReflectionImprovementsSubmittedEvent(Project project, User author, String reflection) {} diff --git a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java index 7d5b8584cc..66805248f9 100644 --- a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java @@ -51,9 +51,7 @@ public class ReflectionServiceImpl implements ReflectionService { .findByProjectAndUser(project, user) .ifPresent(author -> { if (author.getReflectionStatus() == ReflectionStatus.IMPROVEMENTS_NEEDED) { - eventBus.post( - new ReflectionImprovementsSubmittedEvent(project, user, reflection) - ); + eventBus.post(new ReflectionImprovementsSubmittedEvent(project, user, reflection)); } author.setReflection(reflection); author.setReflectionStatus(ReflectionStatus.SUBMITTED); @@ -62,10 +60,7 @@ public class ReflectionServiceImpl implements ReflectionService { @Override public String getSubmittedReflection(Project project, User author) { - return authorRepository - .findByProjectAndUser(project, author) - .map(Author::getReflection) - .orElse(null); + return authorRepository.findByProjectAndUser(project, author).map(Author::getReflection).orElse(null); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/report/AbstractCriterion.java b/core/src/main/java/se/su/dsv/scipro/report/AbstractCriterion.java index d14354eabd..095b7d8ad7 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/AbstractCriterion.java +++ b/core/src/main/java/se/su/dsv/scipro/report/AbstractCriterion.java @@ -117,8 +117,7 @@ public abstract class AbstractCriterion extends DomainObject { // ---------------------------------------------------------------------------------- // Embedded class // ---------------------------------------------------------------------------------- - public static class BySortOrderComparator - implements Comparator<AbstractCriterion>, Serializable { + public static class BySortOrderComparator implements Comparator<AbstractCriterion>, Serializable { @Override public int compare(AbstractCriterion o1, AbstractCriterion o2) { diff --git a/core/src/main/java/se/su/dsv/scipro/report/AbstractGradingCriterion.java b/core/src/main/java/se/su/dsv/scipro/report/AbstractGradingCriterion.java index d47fe5d940..0a9d2e92b1 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/AbstractGradingCriterion.java +++ b/core/src/main/java/se/su/dsv/scipro/report/AbstractGradingCriterion.java @@ -30,12 +30,7 @@ public abstract class AbstractGradingCriterion extends AbstractCriterion { // ---------------------------------------------------------------------------------- protected AbstractGradingCriterion() {} - protected AbstractGradingCriterion( - String title, - String titleEn, - int sortOrder, - int pointsRequiredToPass - ) { + protected AbstractGradingCriterion(String title, String titleEn, int sortOrder, int pointsRequiredToPass) { super(title, titleEn, sortOrder); this.pointsRequiredToPass = pointsRequiredToPass; } diff --git a/core/src/main/java/se/su/dsv/scipro/report/AttachmentReport.java b/core/src/main/java/se/su/dsv/scipro/report/AttachmentReport.java index a6f89352ce..2eaee3a6cf 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/AttachmentReport.java +++ b/core/src/main/java/se/su/dsv/scipro/report/AttachmentReport.java @@ -37,11 +37,7 @@ public abstract class AttachmentReport extends Report { if (o == this) return true; if (!(o instanceof AttachmentReport)) return false; final AttachmentReport other = (AttachmentReport) o; - return ( - other.canEqual(this) && - super.equals(o) && - Objects.equals(this.attachment, other.attachment) - ); + return (other.canEqual(this) && super.equals(o) && Objects.equals(this.attachment, other.attachment)); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/report/Criterion.java b/core/src/main/java/se/su/dsv/scipro/report/Criterion.java index 91974275cd..78d2d37981 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/Criterion.java +++ b/core/src/main/java/se/su/dsv/scipro/report/Criterion.java @@ -42,14 +42,7 @@ public class Criterion extends AbstractCriterion { // ---------------------------------------------------------------------------------- protected Criterion() {} - Criterion( - Report report, - String title, - String titleEn, - String description, - String descriptionEn, - int sortOrder - ) { + Criterion(Report report, String title, String titleEn, String description, String descriptionEn, int sortOrder) { super(title, titleEn, sortOrder); this.description = description; this.descriptionEn = descriptionEn; @@ -110,12 +103,7 @@ public class Criterion extends AbstractCriterion { @Override public int hashCode() { - return Objects.hash( - this.getReport(), - this.getFeedback(), - this.getDescription(), - this.getDescriptionEn() - ); + return Objects.hash(this.getReport(), this.getFeedback(), this.getDescription(), this.getDescriptionEn()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingCriterion.java b/core/src/main/java/se/su/dsv/scipro/report/GradingCriterion.java index db1376b970..f6eaa540ea 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingCriterion.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingCriterion.java @@ -56,10 +56,7 @@ public abstract class GradingCriterion extends AbstractGradingCriterion { // JPA } - GradingCriterion( - GradingReport gradingReport, - GradingCriterionTemplate gradingCriterionTemplate - ) { + GradingCriterion(GradingReport gradingReport, GradingCriterionTemplate gradingCriterionTemplate) { super( gradingCriterionTemplate.getTitle(), gradingCriterionTemplate.getTitleEn(), @@ -126,12 +123,7 @@ public abstract class GradingCriterion extends AbstractGradingCriterion { @Override public int hashCode() { - return Objects.hash( - super.hashCode(), - this.getGradingReport(), - this.getPoints(), - this.getFeedback() - ); + return Objects.hash(super.hashCode(), this.getGradingReport(), this.getPoints(), this.getFeedback()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionPointTemplate.java b/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionPointTemplate.java index 24df856a9e..eba6059798 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionPointTemplate.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionPointTemplate.java @@ -29,11 +29,7 @@ public class GradingCriterionPointTemplate extends AbstractGradingCriterionPoint @Override public String toString() { - return ( - "GradingCriterionPointTemplate(gradingCriterionTemplate=" + - this.getGradingCriterionTemplate() + - ")" - ); + return ("GradingCriterionPointTemplate(gradingCriterionTemplate=" + this.getGradingCriterionTemplate() + ")"); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionTemplate.java b/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionTemplate.java index 75531b9842..2ba8dfcc4b 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionTemplate.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingCriterionTemplate.java @@ -26,11 +26,7 @@ public abstract class GradingCriterionTemplate extends AbstractGradingCriterion @JoinColumn(name = "grading_report_template_id") private GradingReportTemplate gradingReportTemplate; - @OneToMany( - mappedBy = "gradingCriterionTemplate", - orphanRemoval = true, - cascade = CascadeType.ALL - ) + @OneToMany(mappedBy = "gradingCriterionTemplate", orphanRemoval = true, cascade = CascadeType.ALL) private List<GradingCriterionPointTemplate> gradingCriterionPointTemplates = new ArrayList<>(); protected GradingCriterionTemplate() {} @@ -77,11 +73,7 @@ public abstract class GradingCriterionTemplate extends AbstractGradingCriterion ? criterionPointTemplate.getDescription() : criterionPointTemplate.getDescriptionEn(); if (description != null && !description.equals("")) { - desc - .append(criterionPointTemplate.getPoint()) - .append(" p - ") - .append(description) - .append(separator); + desc.append(criterionPointTemplate.getPoint()).append(" p - ").append(description).append(separator); } } return desc.toString(); @@ -99,9 +91,7 @@ public abstract class GradingCriterionTemplate extends AbstractGradingCriterion this.gradingReportTemplate = gradingReportTemplate; } - public void setGradingCriterionPointTemplates( - List<GradingCriterionPointTemplate> gradingCriterionPointTemplates - ) { + public void setGradingCriterionPointTemplates(List<GradingCriterionPointTemplate> gradingCriterionPointTemplates) { this.gradingCriterionPointTemplates = gradingCriterionPointTemplates; } @@ -129,10 +119,6 @@ public abstract class GradingCriterionTemplate extends AbstractGradingCriterion @Override public String toString() { - return ( - "GradingCriterionTemplate(gradingReportTemplate=" + - this.getGradingReportTemplate() + - ")" - ); + return ("GradingCriterionTemplate(gradingReportTemplate=" + this.getGradingReportTemplate() + ")"); } } diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReport.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReport.java index 2074335b8d..c67a952048 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingReport.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReport.java @@ -123,11 +123,7 @@ public abstract class GradingReport extends Report { } public String getAuthorNames() { - return getProject() - .getProjectParticipants() - .stream() - .map(User::getFullName) - .collect(Collectors.joining(", ")); + return getProject().getProjectParticipants().stream().map(User::getFullName).collect(Collectors.joining(", ")); } public ProjectType getProjectType() { diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReportService.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReportService.java index 66af0850b7..1c38af9b44 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingReportService.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReportService.java @@ -19,10 +19,7 @@ public interface GradingReportService { SupervisorGradingReport supervisorGradingReport ); - boolean updateOppositionCriteria( - SupervisorGradingReport report, - FinalSeminarOpposition opposition - ); + boolean updateOppositionCriteria(SupervisorGradingReport report, FinalSeminarOpposition opposition); GradingBasis getGradingBasis(Project project); diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java index 293d88c85b..bc945b6443 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java @@ -20,8 +20,7 @@ import se.su.dsv.scipro.system.ProjectTypeService; import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.util.Either; -public class GradingReportServiceImpl - implements GradingReportTemplateService, GradingReportService { +public class GradingReportServiceImpl implements GradingReportTemplateService, GradingReportService { private final EventBus eventBus; private final ThesisSubmissionHistoryService thesisSubmissionHistoryService; @@ -49,16 +48,11 @@ public class GradingReportServiceImpl @Override @Transactional - public boolean updateOppositionCriteria( - SupervisorGradingReport report, - FinalSeminarOpposition opposition - ) { + public boolean updateOppositionCriteria(SupervisorGradingReport report, FinalSeminarOpposition opposition) { for (GradingCriterion gradingCriterion : report.getIndividualCriteria()) { - boolean isOppositionCriterion = - gradingCriterion.getFlag() == GradingCriterion.Flag.OPPOSITION; + boolean isOppositionCriterion = gradingCriterion.getFlag() == GradingCriterion.Flag.OPPOSITION; boolean betterGrade = - gradingCriterion.getPoints() == null || - opposition.getPoints() > gradingCriterion.getPoints(); + gradingCriterion.getPoints() == null || opposition.getPoints() > gradingCriterion.getPoints(); if (isOppositionCriterion && betterGrade) { gradingCriterion.setFeedback(opposition.getFeedback()); gradingCriterion.setPoints(opposition.getPoints()); @@ -71,9 +65,7 @@ public class GradingReportServiceImpl @Override public GradingBasis getGradingBasis(Project project) { - SupervisorGradingReport supervisorGradingReport = getSupervisorGradingReports(project).get( - 0 - ); + SupervisorGradingReport supervisorGradingReport = getSupervisorGradingReports(project).get(0); List<GradingBasis.Assessment> assessment = supervisorGradingReport .getProjectCriteria() .stream() @@ -92,24 +84,18 @@ public class GradingReportServiceImpl @Override @Transactional public GradingBasis updateGradingBasis(Project project, GradingBasis gradingBasis) { - List<SupervisorGradingReport> supervisorGradingReports = getSupervisorGradingReports( - project - ); + List<SupervisorGradingReport> supervisorGradingReports = getSupervisorGradingReports(project); for (SupervisorGradingReport supervisorGradingReport : supervisorGradingReports) { for (GradingCriterion projectCriterion : supervisorGradingReport.getProjectCriteria()) { for (GradingBasis.Assessment assessment : gradingBasis.criteria()) { - String title = projectCriterion.getTitle( - supervisorGradingReport.getReportLanguage() - ); + String title = projectCriterion.getTitle(supervisorGradingReport.getReportLanguage()); if (Objects.equals(assessment.criterion().title(), title)) { projectCriterion.setPoints(assessment.getPoints()); } } } supervisorGradingReport.setMotivation(gradingBasis.getOverallMotivation()); - supervisorGradingReport.setRejectionCommentFeedback( - gradingBasis.getRejectionCommentFeedback() - ); + supervisorGradingReport.setRejectionCommentFeedback(gradingBasis.getRejectionCommentFeedback()); supervisorGradingReportRepository.save(supervisorGradingReport); } return getGradingBasis(project); @@ -141,10 +127,7 @@ public class GradingReportServiceImpl return new GradingBasis.Assessment(criterion, gc.getPoints()); } - private GradingBasis.Criterion.Requirement toRequirement( - Language language, - GradingCriterionPoint gcp - ) { + private GradingBasis.Criterion.Requirement toRequirement(Language language, GradingCriterionPoint gcp) { String description = gcp.getDescription(language); return new GradingBasis.Criterion.Requirement(gcp.getPoint(), description); } @@ -162,14 +145,10 @@ public class GradingReportServiceImpl @Override @Transactional public SupervisorGradingReport getSupervisorGradingReport(Project project, User user) { - SupervisorGradingReport supervisorGradingReport = - supervisorGradingReportRepository.getReport(project, user); + SupervisorGradingReport supervisorGradingReport = supervisorGradingReportRepository.getReport(project, user); if (supervisorGradingReport == null) { GradingReportTemplate template = getTemplate(project); - SupervisorGradingReport supervisorReport = template.createSupervisorReport( - project, - user - ); + SupervisorGradingReport supervisorReport = template.createSupervisorReport(project, user); supervisorGradingReport = supervisorGradingReportRepository.save(supervisorReport); } return supervisorGradingReport; @@ -193,10 +172,7 @@ public class GradingReportServiceImpl } String rejectionCommentFeedback = supervisorGradingReport.getRejectionCommentFeedback(); - if ( - !isBlank(supervisorGradingReport.getRejectionComment()) && - isBlank(rejectionCommentFeedback) - ) { + if (!isBlank(supervisorGradingReport.getRejectionComment()) && isBlank(rejectionCommentFeedback)) { errors.add(new SubmissionError.NoRejectionCommentFeedback()); } @@ -247,9 +223,7 @@ public class GradingReportServiceImpl @Override public LocalDate getEndDate(GradingReportTemplate gradingReportTemplate) { - GradingReportTemplate next = gradingReportTemplateRepo.getNextTemplate( - gradingReportTemplate - ); + GradingReportTemplate next = gradingReportTemplateRepo.getNextTemplate(gradingReportTemplate); if (next == null) { return null; } else { @@ -261,15 +235,9 @@ public class GradingReportServiceImpl public List<GradingReportTemplate> getUpcomingTemplates(ProjectType projectType) { GradingReportTemplate current = getCurrentTemplate(projectType); if (current == null) { - return gradingReportTemplateRepo.getTemplatesValidAfter( - projectType, - LocalDate.now(clock) - ); + return gradingReportTemplateRepo.getTemplatesValidAfter(projectType, LocalDate.now(clock)); } else { - return gradingReportTemplateRepo.getTemplatesValidAfter( - projectType, - current.getValidFrom() - ); + return gradingReportTemplateRepo.getTemplatesValidAfter(projectType, current.getValidFrom()); } } @@ -291,8 +259,7 @@ public class GradingReportServiceImpl update.validFrom() ); if ( - currentTemplate.getId() != templateId && - Objects.equals(currentTemplate.getValidFrom(), update.validFrom()) + currentTemplate.getId() != templateId && Objects.equals(currentTemplate.getValidFrom(), update.validFrom()) ) { throw new DuplicateDateException(update.validFrom(), template.getProjectType()); } @@ -305,10 +272,8 @@ public class GradingReportServiceImpl } @Override - public GradingReportTemplate create( - ProjectType projectType, - GradingReportTemplateUpdate update - ) throws ValidDateMustBeInTheFutureException, DuplicateDateException { + public GradingReportTemplate create(ProjectType projectType, GradingReportTemplateUpdate update) + throws ValidDateMustBeInTheFutureException, DuplicateDateException { LocalDate today = LocalDate.now(clock); if (!update.validFrom().isAfter(today)) { throw new ValidDateMustBeInTheFutureException(update.validFrom(), today.plusDays(1)); @@ -318,10 +283,7 @@ public class GradingReportServiceImpl projectType, update.validFrom() ); - if ( - currentTemplate != null && - Objects.equals(currentTemplate.getValidFrom(), update.validFrom()) - ) { + if (currentTemplate != null && Objects.equals(currentTemplate.getValidFrom(), update.validFrom())) { throw new DuplicateDateException(update.validFrom(), projectType); } diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplate.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplate.java index 4f7171773a..76ebe71687 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplate.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplate.java @@ -60,11 +60,7 @@ public class GradingReportTemplate extends DomainObject { // ---------------------------------------------------------------------------------- // JPA-mappings of other tables referencing to this table "grading_report_template" // ---------------------------------------------------------------------------------- - @OneToMany( - mappedBy = "gradingReportTemplate", - cascade = { CascadeType.ALL }, - orphanRemoval = true - ) + @OneToMany(mappedBy = "gradingReportTemplate", cascade = { CascadeType.ALL }, orphanRemoval = true) @OrderBy("sortOrder ASC") private List<GradingCriterionTemplate> criteria = new ArrayList<>(); @@ -171,9 +167,7 @@ public class GradingReportTemplate extends DomainObject { // ---------------------------------------------------------------------------------- public SupervisorGradingReport createSupervisorReport(Project project, User student) { if (!this.projectType.equals(project.getProjectType())) { - throw new IllegalArgumentException( - "Project has a different project class than this template" - ); + throw new IllegalArgumentException("Project has a different project class than this template"); } return new SupervisorGradingReportFactory().using(criteria).create(project, student); } @@ -188,13 +182,7 @@ public class GradingReportTemplate extends DomainObject { int pointsRequiredToPass, List<GradingCriterionPointTemplate> gradingCriterionPointTemplates ) { - return addProjectCriterion( - title, - titleEn, - pointsRequiredToPass, - gradingCriterionPointTemplates, - null - ); + return addProjectCriterion(title, titleEn, pointsRequiredToPass, gradingCriterionPointTemplates, null); } public GradingCriterionTemplate addProjectCriterion( @@ -223,13 +211,7 @@ public class GradingReportTemplate extends DomainObject { int pointsRequiredToPass, List<GradingCriterionPointTemplate> gradingCriterionPointTemplates ) { - return addIndividualCriterion( - title, - titleEn, - pointsRequiredToPass, - gradingCriterionPointTemplates, - null - ); + return addIndividualCriterion(title, titleEn, pointsRequiredToPass, gradingCriterionPointTemplates, null); } public GradingCriterionTemplate addIndividualCriterion( diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepo.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepo.java index 8066e097b7..27b2e650ce 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepo.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepo.java @@ -20,8 +20,5 @@ public interface GradingReportTemplateRepo extends JpaRepository<GradingReportTe GradingReportTemplate updateTemplate(long templateId, GradingReportTemplateUpdate update); - GradingReportTemplate createTemplate( - ProjectType projectType, - GradingReportTemplateUpdate update - ); + GradingReportTemplate createTemplate(ProjectType projectType, GradingReportTemplateUpdate update); } diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java index 27666416e1..8702aec340 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java @@ -49,17 +49,12 @@ public class GradingReportTemplateRepoImpl .and(template.validFrom.gt(gradingReportTemplate.getValidFrom())) ); return findOne( - template.projectType - .eq(gradingReportTemplate.getProjectType()) - .and(template.validFrom.eq(validFrom)) + template.projectType.eq(gradingReportTemplate.getProjectType()).and(template.validFrom.eq(validFrom)) ); } @Override - public List<GradingReportTemplate> getTemplatesValidAfter( - ProjectType projectType, - LocalDate date - ) { + public List<GradingReportTemplate> getTemplatesValidAfter(ProjectType projectType, LocalDate date) { return findAll( QGradingReportTemplate.gradingReportTemplate.projectType .eq(projectType) @@ -74,10 +69,7 @@ public class GradingReportTemplateRepoImpl @Override @Transactional - public GradingReportTemplate updateTemplate( - long templateId, - GradingReportTemplateUpdate update - ) { + public GradingReportTemplate updateTemplate(long templateId, GradingReportTemplateUpdate update) { GradingReportTemplate gradingReportTemplate = findOne(templateId); return updateTemplate(gradingReportTemplate, update); } @@ -139,14 +131,8 @@ public class GradingReportTemplateRepoImpl @Override @Transactional - public GradingReportTemplate createTemplate( - ProjectType projectType, - GradingReportTemplateUpdate update - ) { - GradingReportTemplate gradingReportTemplate = new GradingReportTemplate( - projectType, - update.validFrom() - ); + public GradingReportTemplate createTemplate(ProjectType projectType, GradingReportTemplateUpdate update) { + GradingReportTemplate gradingReportTemplate = new GradingReportTemplate(projectType, update.validFrom()); return updateTemplate(gradingReportTemplate, update); } diff --git a/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterion.java b/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterion.java index 7f757d9fed..273a4e59bd 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterion.java +++ b/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterion.java @@ -7,10 +7,7 @@ public class IndividualGradingCriterion extends GradingCriterion { protected IndividualGradingCriterion() {} - IndividualGradingCriterion( - GradingReport gradingReport, - GradingCriterionTemplate gradingCriterionTemplate - ) { + IndividualGradingCriterion(GradingReport gradingReport, GradingCriterionTemplate gradingCriterionTemplate) { super(gradingReport, gradingCriterionTemplate); } diff --git a/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterionTemplate.java b/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterionTemplate.java index e0fc30efc7..05d30e9e00 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterionTemplate.java +++ b/core/src/main/java/se/su/dsv/scipro/report/IndividualGradingCriterionTemplate.java @@ -16,14 +16,7 @@ public class IndividualGradingCriterionTemplate extends GradingCriterionTemplate int pointsRequiredToPass, List<GradingCriterionPointTemplate> gradingCriterionPointTemplates ) { - super( - gradingReportTemplate, - sortOrder, - title, - titleEn, - pointsRequiredToPass, - gradingCriterionPointTemplates - ); + super(gradingReportTemplate, sortOrder, title, titleEn, pointsRequiredToPass, gradingCriterionPointTemplates); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java index 2fac025900..e8246cc24c 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java @@ -6,9 +6,7 @@ import jakarta.persistence.EntityManager; import se.su.dsv.scipro.finalseminar.FinalSeminarOpposition; import se.su.dsv.scipro.system.GenericRepo; -public class OppositionReportRepoImpl - extends GenericRepo<OppositionReport, Long> - implements OppositionReportRepo { +public class OppositionReportRepoImpl extends GenericRepo<OppositionReport, Long> implements OppositionReportRepo { @Inject public OppositionReportRepoImpl(Provider<EntityManager> em) { @@ -16,11 +14,7 @@ public class OppositionReportRepoImpl } @Override - public OppositionReport findByFinalSeminarOpposition( - FinalSeminarOpposition finalSeminarOpposition - ) { - return findOne( - QOppositionReport.oppositionReport.finalSeminarOpposition.eq(finalSeminarOpposition) - ); + public OppositionReport findByFinalSeminarOpposition(FinalSeminarOpposition finalSeminarOpposition) { + return findOne(QOppositionReport.oppositionReport.finalSeminarOpposition.eq(finalSeminarOpposition)); } } diff --git a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java index 17bf8e0a0a..f993503d09 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java @@ -32,9 +32,7 @@ public class OppositionReportServiceImpl implements OppositionReportService { @Override @Transactional public OppositionReport findOrCreateReport(FinalSeminarOpposition finalSeminarOpposition) { - OppositionReport oppositionReport = oppositionReportRepo.findByFinalSeminarOpposition( - finalSeminarOpposition - ); + OppositionReport oppositionReport = oppositionReportRepo.findByFinalSeminarOpposition(finalSeminarOpposition); if (oppositionReport != null) { return oppositionReport; } else { diff --git a/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterion.java b/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterion.java index 518e0d747f..ee7a336217 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterion.java +++ b/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterion.java @@ -7,10 +7,7 @@ public class ProjectGradingCriterion extends GradingCriterion { protected ProjectGradingCriterion() {} - ProjectGradingCriterion( - GradingReport gradingReport, - GradingCriterionTemplate gradingCriterionTemplate - ) { + ProjectGradingCriterion(GradingReport gradingReport, GradingCriterionTemplate gradingCriterionTemplate) { super(gradingReport, gradingCriterionTemplate); } diff --git a/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterionTemplate.java b/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterionTemplate.java index 006c9d2e38..1fad29aedb 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterionTemplate.java +++ b/core/src/main/java/se/su/dsv/scipro/report/ProjectGradingCriterionTemplate.java @@ -16,14 +16,7 @@ public class ProjectGradingCriterionTemplate extends GradingCriterionTemplate { int pointsRequiredToPass, List<GradingCriterionPointTemplate> gradingCriterionPointTemplates ) { - super( - gradingReportTemplate, - sortOrder, - title, - titleEn, - pointsRequiredToPass, - gradingCriterionPointTemplates - ); + super(gradingReportTemplate, sortOrder, title, titleEn, pointsRequiredToPass, gradingCriterionPointTemplates); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReport.java b/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReport.java index a713876668..333cb28c03 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReport.java +++ b/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReport.java @@ -113,10 +113,7 @@ public class SupervisorGradingReport extends GradingReport { } public boolean hasProvidedRejectionFeedback() { - return ( - rejectionComment == null || - (rejectionCommentFeedback != null && !rejectionCommentFeedback.isBlank()) - ); + return (rejectionComment == null || (rejectionCommentFeedback != null && !rejectionCommentFeedback.isBlank())); } private boolean allCriteriaAssessed() { diff --git a/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReportFactory.java b/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReportFactory.java index bad96169d3..572178355a 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReportFactory.java +++ b/core/src/main/java/se/su/dsv/scipro/report/SupervisorGradingReportFactory.java @@ -28,14 +28,9 @@ public class SupervisorGradingReportFactory implements GradingCriterionTemplateV } public SupervisorGradingReport create(Project project, User student) { - SupervisorGradingReport supervisorGradingReport = new SupervisorGradingReport( - project, - student - ); + SupervisorGradingReport supervisorGradingReport = new SupervisorGradingReport(project, student); for (GradingCriterionTemplate gradingCriterionTemplate : gradingCriterionTemplates) { - supervisorGradingReport.addCriterion( - gradingCriterionTemplate.createFor(supervisorGradingReport) - ); + supervisorGradingReport.addCriterion(gradingCriterionTemplate.createFor(supervisorGradingReport)); } return supervisorGradingReport; } diff --git a/core/src/main/java/se/su/dsv/scipro/report/ValidDateMustBeInTheFutureException.java b/core/src/main/java/se/su/dsv/scipro/report/ValidDateMustBeInTheFutureException.java index ac60f1c7b5..a52ada1cb8 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/ValidDateMustBeInTheFutureException.java +++ b/core/src/main/java/se/su/dsv/scipro/report/ValidDateMustBeInTheFutureException.java @@ -7,10 +7,7 @@ public class ValidDateMustBeInTheFutureException extends Exception { private final LocalDate validFrom; private final LocalDate earliestAllowedValidFrom; - public ValidDateMustBeInTheFutureException( - LocalDate validFrom, - LocalDate earliestAllowedValidFrom - ) { + public ValidDateMustBeInTheFutureException(LocalDate validFrom, LocalDate earliestAllowedValidFrom) { this.validFrom = validFrom; this.earliestAllowedValidFrom = earliestAllowedValidFrom; } diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractBachelorGradeCalculator.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractBachelorGradeCalculator.java index 6003ddef8d..5390287449 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractBachelorGradeCalculator.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractBachelorGradeCalculator.java @@ -23,9 +23,7 @@ public abstract class AbstractBachelorGradeCalculator implements GradeCalculator return new BachelorCalculation(getGradingCriteria(gradingReport)).calculateTotalPoints(); } - public abstract Iterable<? extends GradingCriterion> getGradingCriteria( - GradingReport gradingReport - ); + public abstract Iterable<? extends GradingCriterion> getGradingCriteria(GradingReport gradingReport); private static class BachelorCalculation extends Calculation { diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster15GradeCalculator.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster15GradeCalculator.java index 346f1ddf20..2429b39c80 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster15GradeCalculator.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster15GradeCalculator.java @@ -23,9 +23,7 @@ public abstract class AbstractMaster15GradeCalculator implements GradeCalculator return new Master15Calculation(getGradingCriteria(gradingReport)).getGrade(); } - public abstract Iterable<? extends GradingCriterion> getGradingCriteria( - GradingReport gradingReport - ); + public abstract Iterable<? extends GradingCriterion> getGradingCriteria(GradingReport gradingReport); private static final class Master15Calculation extends Calculation { @@ -57,10 +55,7 @@ public abstract class AbstractMaster15GradeCalculator implements GradeCalculator private boolean hasPointsForDeadlineCriterion() { for (GradingCriterion gradingCriterion : gradingCriteria) { - if ( - gradingCriterion.getTitle().equals("Ö4 Deadlines") && - gradingCriterion.getPoints() == 1 - ) { + if (gradingCriterion.getTitle().equals("Ö4 Deadlines") && gradingCriterion.getPoints() == 1) { return true; } } diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster30GradeCalculator.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster30GradeCalculator.java index d4a0d102de..d41d20afd9 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster30GradeCalculator.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/AbstractMaster30GradeCalculator.java @@ -23,9 +23,7 @@ public abstract class AbstractMaster30GradeCalculator implements GradeCalculator return new Master30Calculation(getGradingCriteria(gradingReport)).getGrade(); } - public abstract Iterable<? extends GradingCriterion> getGradingCriteria( - GradingReport gradingReport - ); + public abstract Iterable<? extends GradingCriterion> getGradingCriteria(GradingReport gradingReport); private static class Master30Calculation extends Calculation { @@ -73,10 +71,7 @@ public abstract class AbstractMaster30GradeCalculator implements GradeCalculator private boolean hasPointsForDeadlineCriterion() { for (GradingCriterion gradingCriterion : gradingCriteria) { - if ( - gradingCriterion.getTitle().equals("Ö4 Deadlines") && - gradingCriterion.getPoints() == 1 - ) { + if (gradingCriterion.getTitle().equals("Ö4 Deadlines") && gradingCriterion.getPoints() == 1) { return true; } } diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/Calculation.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/Calculation.java index 585fb3b560..25c3251229 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/original/Calculation.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/original/Calculation.java @@ -21,10 +21,8 @@ public abstract class Calculation { protected boolean fulfilledFxRequirements() { return ( - countFxFlaggedProjectCriteriaWithAtLeastOnePoint() >= - getNumberOfProjectCriteriaRequiredToGetFx() && - countFxFlaggedIndividualCriteriaWithAtLeastOnePoint() >= - getNumberOfIndividualCriteriaRequiredToGetFx() + countFxFlaggedProjectCriteriaWithAtLeastOnePoint() >= getNumberOfProjectCriteriaRequiredToGetFx() && + countFxFlaggedIndividualCriteriaWithAtLeastOnePoint() >= getNumberOfIndividualCriteriaRequiredToGetFx() ); } @@ -65,11 +63,7 @@ public abstract class Calculation { protected int countFxFlaggedProjectCriteriaWithAtLeastOnePoint() { int completed = 0; for (GradingCriterion gradingCriterion : getGradingCriteria()) { - if ( - gradingCriterion.isFx() && - gradingCriterion.getPoints() > 0 && - gradingCriterion.isProjectCriterion() - ) { + if (gradingCriterion.isFx() && gradingCriterion.getPoints() > 0 && gradingCriterion.isProjectCriterion()) { completed++; } } @@ -80,9 +74,7 @@ public abstract class Calculation { int completed = 0; for (GradingCriterion gradingCriterion : getGradingCriteria()) { if ( - gradingCriterion.isFx() && - gradingCriterion.getPoints() > 0 && - gradingCriterion.isIndividualCriterion() + gradingCriterion.isFx() && gradingCriterion.getPoints() > 0 && gradingCriterion.isIndividualCriterion() ) { completed++; } diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractBachelorGradeCalculator.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractBachelorGradeCalculator.java index e82b6dbe45..20db21dd21 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractBachelorGradeCalculator.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractBachelorGradeCalculator.java @@ -23,9 +23,7 @@ public abstract class AbstractBachelorGradeCalculator implements GradeCalculator return new BachelorCalculation(getGradingCriteria(gradingReport)).calculateTotalPoints(); } - public abstract Iterable<? extends GradingCriterion> getGradingCriteria( - GradingReport gradingReport - ); + public abstract Iterable<? extends GradingCriterion> getGradingCriteria(GradingReport gradingReport); private static class BachelorCalculation extends Calculation { @@ -58,10 +56,7 @@ public abstract class AbstractBachelorGradeCalculator implements GradeCalculator private boolean hasPointsForDeadlineCriterion() { for (GradingCriterion gradingCriterion : gradingCriteria) { - if ( - gradingCriterion.getTitle().equals("Ö4 Deadlines") && - gradingCriterion.getPoints() == 1 - ) { + if (gradingCriterion.getTitle().equals("Ö4 Deadlines") && gradingCriterion.getPoints() == 1) { return true; } } diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMagisterGradeCalculator.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMagisterGradeCalculator.java index 213bc533b3..fc9bae2299 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMagisterGradeCalculator.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMagisterGradeCalculator.java @@ -23,9 +23,7 @@ public abstract class AbstractMagisterGradeCalculator implements GradeCalculator return new Master15Calculation(getGradingCriteria(gradingReport)).getGrade(); } - public abstract Iterable<? extends GradingCriterion> getGradingCriteria( - GradingReport gradingReport - ); + public abstract Iterable<? extends GradingCriterion> getGradingCriteria(GradingReport gradingReport); private static final class Master15Calculation extends Calculation { @@ -57,10 +55,7 @@ public abstract class AbstractMagisterGradeCalculator implements GradeCalculator private boolean hasPointsForDeadlineCriterion() { for (GradingCriterion gradingCriterion : gradingCriteria) { - if ( - gradingCriterion.getTitle().equals("Ö4 Deadlines") && - gradingCriterion.getPoints() >= 1 - ) { + if (gradingCriterion.getTitle().equals("Ö4 Deadlines") && gradingCriterion.getPoints() >= 1) { return true; } } diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMasterGradeCalculator.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMasterGradeCalculator.java index 5e5b6be5b4..e8bad8944f 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMasterGradeCalculator.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/AbstractMasterGradeCalculator.java @@ -23,9 +23,7 @@ public abstract class AbstractMasterGradeCalculator implements GradeCalculator { return new Master30Calculation(getGradingCriteria(gradingReport)).getGrade(); } - public abstract Iterable<? extends GradingCriterion> getGradingCriteria( - GradingReport gradingReport - ); + public abstract Iterable<? extends GradingCriterion> getGradingCriteria(GradingReport gradingReport); private static class Master30Calculation extends Calculation { @@ -73,10 +71,7 @@ public abstract class AbstractMasterGradeCalculator implements GradeCalculator { private boolean hasPointsForDeadlineCriterion() { for (GradingCriterion gradingCriterion : gradingCriteria) { - if ( - gradingCriterion.getTitle().equals("Ö4 Deadlines") && - gradingCriterion.getPoints() == 1 - ) { + if (gradingCriterion.getTitle().equals("Ö4 Deadlines") && gradingCriterion.getPoints() == 1) { return true; } } diff --git a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/Calculation.java b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/Calculation.java index 96396e20cb..667acc6cbe 100644 --- a/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/Calculation.java +++ b/core/src/main/java/se/su/dsv/scipro/report/calculators/vt17/Calculation.java @@ -21,10 +21,8 @@ public abstract class Calculation { protected boolean fulfilledFxRequirements() { return ( - countFxFlaggedProjectCriteriaWithAtLeastOnePoint() >= - getNumberOfProjectCriteriaRequiredToGetFx() && - countFxFlaggedIndividualCriteriaWithAtLeastOnePoint() >= - getIndividualCriteriaPointsRequiredToGetFx() + countFxFlaggedProjectCriteriaWithAtLeastOnePoint() >= getNumberOfProjectCriteriaRequiredToGetFx() && + countFxFlaggedIndividualCriteriaWithAtLeastOnePoint() >= getIndividualCriteriaPointsRequiredToGetFx() ); } @@ -65,11 +63,7 @@ public abstract class Calculation { protected int countFxFlaggedProjectCriteriaWithAtLeastOnePoint() { int completed = 0; for (GradingCriterion gradingCriterion : getGradingCriteria()) { - if ( - gradingCriterion.isFx() && - gradingCriterion.getPoints() > 0 && - gradingCriterion.isProjectCriterion() - ) { + if (gradingCriterion.isFx() && gradingCriterion.getPoints() > 0 && gradingCriterion.isProjectCriterion()) { completed++; } } @@ -80,9 +74,7 @@ public abstract class Calculation { int points = 0; for (GradingCriterion gradingCriterion : getGradingCriteria()) { if ( - gradingCriterion.isFx() && - gradingCriterion.getPoints() > 0 && - gradingCriterion.isIndividualCriterion() + gradingCriterion.isFx() && gradingCriterion.getPoints() > 0 && gradingCriterion.isIndividualCriterion() ) { points += gradingCriterion.getPoints(); } diff --git a/core/src/main/java/se/su/dsv/scipro/reusable/SciProUtilities.java b/core/src/main/java/se/su/dsv/scipro/reusable/SciProUtilities.java index df9d10e673..0ed066a174 100755 --- a/core/src/main/java/se/su/dsv/scipro/reusable/SciProUtilities.java +++ b/core/src/main/java/se/su/dsv/scipro/reusable/SciProUtilities.java @@ -43,9 +43,7 @@ public final class SciProUtilities { */ public static int safeLongToInt(long l) { if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) { - throw new IllegalArgumentException( - l + " cannot be cast to int without changing its value." - ); + throw new IllegalArgumentException(l + " cannot be cast to int without changing its value."); } return (int) l; } @@ -84,11 +82,7 @@ public final class SciProUtilities { } else { final Calendar calendar = Calendar.getInstance(); calendar.clear(); - calendar.set( - localDate.getYear(), - localDate.getMonthValue() - 1, - localDate.getDayOfMonth() - ); + calendar.set(localDate.getYear(), localDate.getMonthValue() - 1, localDate.getDayOfMonth()); return calendar; } } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/Decision.java b/core/src/main/java/se/su/dsv/scipro/reviewing/Decision.java index 63df02e133..67d701cdc9 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/Decision.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/Decision.java @@ -88,12 +88,7 @@ public class Decision { // ---------------------------------------------------------------------------------- protected Decision() {} // JPA - Decision( - ReviewerApproval reviewerApproval, - final FileReference thesis, - final String comment, - final Date deadline - ) { + Decision(ReviewerApproval reviewerApproval, final FileReference thesis, final String comment, final Date deadline) { this(reviewerApproval, thesis, Instant.now(), comment, deadline); } @@ -197,11 +192,7 @@ public class Decision { return decisionDate == null ? new Date() : decisionDate; } - private void decide( - Status status, - final String reason, - final Optional<FileReference> attachment - ) { + private void decide(Status status, final String reason, final Optional<FileReference> attachment) { decideWithDecisionDate(status, reason, attachment, Instant.now()); } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java index 13b7a072f6..5843cf3335 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java @@ -17,11 +17,7 @@ public class DecisionRepositoryImpl extends AbstractRepository implements Decisi } @Override - public int countUniqueProjectsWithDecision( - User reviewer, - LocalDate fromDate, - LocalDate toDate - ) { + public int countUniqueProjectsWithDecision(User reviewer, LocalDate fromDate, LocalDate toDate) { return (int) from(QDecision.decision) .select(QDecision.decision.reviewerApproval.id) .where( @@ -36,8 +32,6 @@ public class DecisionRepositoryImpl extends AbstractRepository implements Decisi @Override public List<Decision> findBy(Project project) { - return from(QDecision.decision) - .where(QDecision.decision.reviewerApproval.project.eq(project)) - .fetch(); + return from(QDecision.decision).where(QDecision.decision.reviewerApproval.project.eq(project)).fetch(); } } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java index 66731fb26b..05190c4e4a 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java @@ -53,37 +53,25 @@ public class FinalSeminarApprovalServiceImpl .map(earlier -> addNewRequest(comment, storedThesis, earlier)) .orElseGet(() -> Either.right(newApproval(project, storedThesis, comment))); - final Either<AlreadyRequested, FinalSeminarApproval> persisted = finalSeminarApproval.map( - this::save - ); + final Either<AlreadyRequested, FinalSeminarApproval> persisted = finalSeminarApproval.map(this::save); persisted.foreach(fsa -> eventBus.post(new FinalSeminarApprovalRequestEvent(fsa))); return persisted; } - private FinalSeminarApproval newApproval( - Project project, - FileReference storedThesis, - String comment - ) { + private FinalSeminarApproval newApproval(Project project, FileReference storedThesis, String comment) { final Date deadline = getDeadline(new Date()); return new FinalSeminarApproval(project, storedThesis, comment, deadline); } @Override protected Date getDeadline(final Date requested) { - final ReviewerDeadlineSettings reviewerDeadlineSettings = - reviewerDeadlineSettingsService.getInstance(); - return daysService.workDaysAfter( - requested, - reviewerDeadlineSettings.getFinalSeminarApproval() - ); + final ReviewerDeadlineSettings reviewerDeadlineSettings = reviewerDeadlineSettingsService.getInstance(); + return daysService.workDaysAfter(requested, reviewerDeadlineSettings.getFinalSeminarApproval()); } @Override public Optional<FinalSeminarApproval> findBy(final Project project) { - return Optional.ofNullable( - findOne(QFinalSeminarApproval.finalSeminarApproval.project.eq(project)) - ); + return Optional.ofNullable(findOne(QFinalSeminarApproval.finalSeminarApproval.project.eq(project))); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsService.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsService.java index 3a2f2a1b3d..96de74e37d 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsService.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsService.java @@ -12,16 +12,12 @@ import se.su.dsv.scipro.system.ProjectType; public interface ProjectFinalSeminarStatisticsService extends GenericService<Project, Long> { Long countFinalSeminarStatistics(ProjectFinalSeminarStatisticsService.Filter filter); - Long countFinalSeminarStatisticsOkFromReviewer( - ProjectFinalSeminarStatisticsService.Filter filter - ); + Long countFinalSeminarStatisticsOkFromReviewer(ProjectFinalSeminarStatisticsService.Filter filter); Iterable<Project> finalSeminarStatisticsNoOkFromReviewer( ProjectFinalSeminarStatisticsService.Filter filter, Pageable pageable ); - Long countFinalSeminarStatisticsNoOkFromReviewer( - ProjectFinalSeminarStatisticsService.Filter filter - ); + Long countFinalSeminarStatisticsNoOkFromReviewer(ProjectFinalSeminarStatisticsService.Filter filter); class Filter implements Serializable { @@ -91,14 +87,8 @@ public interface ProjectFinalSeminarStatisticsService extends GenericService<Pro Objects.equals(this.getCreatedAfter(), other.getCreatedAfter()) && Objects.equals(this.getCreatedBefore(), other.getCreatedBefore()) && Objects.equals(this.getStatuses(), other.getStatuses()) && - Objects.equals( - this.getFinalSeminarCreatedAfter(), - other.getFinalSeminarCreatedAfter() - ) && - Objects.equals( - this.getFinalSeminarCreatedBefore(), - other.getFinalSeminarCreatedBefore() - ) + Objects.equals(this.getFinalSeminarCreatedAfter(), other.getFinalSeminarCreatedAfter()) && + Objects.equals(this.getFinalSeminarCreatedBefore(), other.getFinalSeminarCreatedBefore()) ); } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java index 83aaed7565..6f67254169 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java @@ -43,24 +43,16 @@ public class ProjectFinalSeminarStatisticsServiceImpl } @Override - public Long countFinalSeminarStatisticsOkFromReviewer( - ProjectFinalSeminarStatisticsService.Filter filter - ) { + public Long countFinalSeminarStatisticsOkFromReviewer(ProjectFinalSeminarStatisticsService.Filter filter) { return new JPAQuery<>(em()) .select(QProject.project.count()) - .from( - QProject.project, - QFinalSeminar.finalSeminar, - QFinalSeminarApproval.finalSeminarApproval - ) + .from(QProject.project, QFinalSeminar.finalSeminar, QFinalSeminarApproval.finalSeminarApproval) .where(toPredicate(filter)) .where(QFinalSeminar.finalSeminar.project.eq(QProject.project)) .where( QFinalSeminarApproval.finalSeminarApproval.project.eq(QProject.project), QFinalSeminarApproval.finalSeminarApproval.instanceOf(FinalSeminarApproval.class), - QFinalSeminarApproval.finalSeminarApproval.decisions - .any() - .status.eq(Status.APPROVED) + QFinalSeminarApproval.finalSeminarApproval.decisions.any().status.eq(Status.APPROVED) ) .fetchFirst(); } @@ -70,10 +62,7 @@ public class ProjectFinalSeminarStatisticsServiceImpl ProjectFinalSeminarStatisticsService.Filter filter, Pageable pageable ) { - StringPath sort = Expressions.stringPath( - QProject.project, - pageable.getSort().getProperty() - ); + StringPath sort = Expressions.stringPath(QProject.project, pageable.getSort().getProperty()); return new JPAQuery<>(em()) .select(QProject.project) .from(QProject.project, QFinalSeminar.finalSeminar) @@ -91,11 +80,7 @@ public class ProjectFinalSeminarStatisticsServiceImpl QProject.project.notIn( JPAExpressions.select(QFinalSeminarApproval.finalSeminarApproval.project) .from(QFinalSeminarApproval.finalSeminarApproval) - .where( - QFinalSeminarApproval.finalSeminarApproval.decisions - .any() - .status.eq(Status.APPROVED) - ) + .where(QFinalSeminarApproval.finalSeminarApproval.decisions.any().status.eq(Status.APPROVED)) ), JPAExpressions.selectFrom(QFinalSeminarApproval.finalSeminarApproval) .where(QFinalSeminarApproval.finalSeminarApproval.project.eq(QProject.project)) @@ -104,9 +89,7 @@ public class ProjectFinalSeminarStatisticsServiceImpl } @Override - public Long countFinalSeminarStatisticsNoOkFromReviewer( - ProjectFinalSeminarStatisticsService.Filter filter - ) { + public Long countFinalSeminarStatisticsNoOkFromReviewer(ProjectFinalSeminarStatisticsService.Filter filter) { return new JPAQuery<>(em()) .select(QProject.project.count()) .from(QProject.project, QFinalSeminar.finalSeminar) @@ -130,12 +113,8 @@ public class ProjectFinalSeminarStatisticsServiceImpl if (filter.getStatuses() != null) { predicate.and(hasAnyStatus(filter.getStatuses())); } - predicate.and( - QFinalSeminar.finalSeminar.dateCreated.before(filter.getFinalSeminarCreatedBefore()) - ); - predicate.and( - QFinalSeminar.finalSeminar.dateCreated.after(filter.getFinalSeminarCreatedAfter()) - ); + predicate.and(QFinalSeminar.finalSeminar.dateCreated.before(filter.getFinalSeminarCreatedBefore())); + predicate.and(QFinalSeminar.finalSeminar.dateCreated.after(filter.getFinalSeminarCreatedAfter())); return predicate; } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerApproval.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerApproval.java index 2abf17ff41..9e91d2fca1 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerApproval.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerApproval.java @@ -96,11 +96,7 @@ public abstract class ReviewerApproval extends DomainObject { getCurrentDecision().reject(reason, attachment); } - public void addNewThesis( - final FileReference thesis, - final String comment, - final Date deadline - ) { + public void addNewThesis(final FileReference thesis, final String comment, final Date deadline) { if (getCurrentStatus() != Status.REJECTED) { throw new IllegalStateException(); } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerAssignedDeadline.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerAssignedDeadline.java index 2bf534a40a..f45c8bbb55 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerAssignedDeadline.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerAssignedDeadline.java @@ -107,9 +107,7 @@ public class ReviewerAssignedDeadline { @Subscribe public void roughDraftRequestedWithExistingReviewer(RoughDraftApprovalRequestedEvent event) { if (event.getProject().getReviewer() != null) { - Date deadline = getDeadline( - reviewerDeadlineSettingsService.getInstance().getRoughDraftApproval() - ); + Date deadline = getDeadline(reviewerDeadlineSettingsService.getInstance().getRoughDraftApproval()); Decision currentDecision = event.getRoughDraftApproval().getCurrentDecision(); currentDecision.setDeadline(deadline); currentDecision.setAssignedReviewer(event.getProject().getReviewer()); diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityService.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityService.java index 2cd9d26348..70064e2a95 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityService.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityService.java @@ -27,13 +27,7 @@ public interface ReviewerCapacityService { */ List<TargetHistory> getTargetHistory(User reviewer, Year year); - record TargetHistory( - Year year, - int springTarget, - int autumnTarget, - int completedInSpring, - int completedInAutumn - ) {} + record TargetHistory(Year year, int springTarget, int autumnTarget, int completedInSpring, int completedInAutumn) {} /** * Remaining targets are the set target by the administrators minus the number of assigned and completed reviews. diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java index 440a55cd4f..627ff612a5 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java @@ -24,8 +24,7 @@ import se.su.dsv.scipro.system.Unit; import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.UserService; -public class ReviewerCapacityServiceImpl - implements ReviewerCapacityService, ReviewerAssignmentService { +public class ReviewerCapacityServiceImpl implements ReviewerCapacityService, ReviewerAssignmentService { private final ReviewerTargetRepository reviewerTargetRepository; private final DecisionRepository decisionRepository; @@ -50,10 +49,7 @@ public class ReviewerCapacityServiceImpl @Override public void assignTarget(User reviewer, Target target) { - Optional<ReviewerTarget> reviewerTarget = reviewerTargetRepository.getReviewerTarget( - reviewer, - target.year() - ); + Optional<ReviewerTarget> reviewerTarget = reviewerTargetRepository.getReviewerTarget(reviewer, target.year()); if (reviewerTarget.isPresent()) { ReviewerTarget targetToUpdate = reviewerTarget.get(); targetToUpdate.setSpring(target.spring()); @@ -101,12 +97,7 @@ public class ReviewerCapacityServiceImpl return reviewerTargetRepository .getReviewerTarget(reviewer, year) .map(reviewerTarget -> - new Target( - year, - reviewerTarget.getSpring(), - reviewerTarget.getAutumn(), - reviewerTarget.getNote() - ) + new Target(year, reviewerTarget.getSpring(), reviewerTarget.getAutumn(), reviewerTarget.getNote()) ) .orElse(new Target(year, 0, 0, "")); } @@ -117,8 +108,10 @@ public class ReviewerCapacityServiceImpl .skip(1) // skip given year .limit(3) // get three years .map(historicYear -> { - Optional<ReviewerTarget> reviewerTarget = - reviewerTargetRepository.getReviewerTarget(reviewer, historicYear); + Optional<ReviewerTarget> reviewerTarget = reviewerTargetRepository.getReviewerTarget( + reviewer, + historicYear + ); int completedInSpring = countSpringReviews(reviewer, historicYear); int completedInAutumn = countAutumnReviews(reviewer, historicYear); return new TargetHistory( @@ -138,10 +131,7 @@ public class ReviewerCapacityServiceImpl Target target = getTarget(reviewer, year); int springDecisions = countSpringReviews(reviewer, year); int autumnReviews = countAutumnReviews(reviewer, year); - return new RemainingTargets( - target.spring() - springDecisions, - target.autumn() - autumnReviews - ); + return new RemainingTargets(target.spring() - springDecisions, target.autumn() - autumnReviews); } private int countSpringReviews(User reviewer, Year year) { @@ -176,24 +166,14 @@ public class ReviewerCapacityServiceImpl int target = reviewerPeriodTarget.map(rt -> getPeriodTarget(rt, date)).orElse(0); int assigned = countAssignedReviews(reviewer, date); String note = reviewerPeriodTarget.map(ReviewerTarget::getNote).orElse(""); - ReviewerCandidates.Candidate candidate = new ReviewerCandidates.Candidate( - reviewer, - target, - assigned, - note - ); + ReviewerCandidates.Candidate candidate = new ReviewerCandidates.Candidate(reviewer, target, assigned, note); if (target > 0) { if (assigned < target) { - boolean canReviewAllLanguages = reviewer - .getLanguages() - .containsAll(EnumSet.allOf(Language.class)); + boolean canReviewAllLanguages = reviewer.getLanguages().containsAll(EnumSet.allOf(Language.class)); boolean canSuperviseProjectsLanguage = - canReviewAllLanguages || - reviewer.getLanguages().contains(project.getLanguage()); - boolean matchingResearchArea = reviewer - .getResearchAreas() - .contains(project.getResearchArea()); + canReviewAllLanguages || reviewer.getLanguages().contains(project.getLanguage()); + boolean matchingResearchArea = reviewer.getResearchAreas().contains(project.getResearchArea()); if (canSuperviseProjectsLanguage && matchingResearchArea) { good.add(candidate); } else if (!canSuperviseProjectsLanguage) { @@ -213,19 +193,14 @@ public class ReviewerCapacityServiceImpl ReviewerCandidates.Candidate::reviewer, Comparator.comparing(User::getLastName) ); - Comparator<ReviewerCandidates.Candidate> byNumberOfResearchAreas = Comparator.comparing( - candidate -> candidate.reviewer().getResearchAreas().size() + Comparator<ReviewerCandidates.Candidate> byNumberOfResearchAreas = Comparator.comparing(candidate -> + candidate.reviewer().getResearchAreas().size() ); Comparator<ReviewerCandidates.Candidate> byRemainingTargets = Comparator.comparing( ReviewerCandidates.Candidate::remainingTargets ); - good.sort( - byRemainingTargets - .reversed() - .thenComparing(byNumberOfResearchAreas) - .thenComparing(byLastName) - ); + good.sort(byRemainingTargets.reversed().thenComparing(byNumberOfResearchAreas).thenComparing(byLastName)); wrongResearchArea.sort(byRemainingTargets.reversed().thenComparing(byLastName)); busy.sort(byLastName); unavailable.sort(byLastName); @@ -235,20 +210,11 @@ public class ReviewerCapacityServiceImpl ? new ReviewPeriod(Year.of(date.getYear()), ReviewPeriod.Part.SPRING) : new ReviewPeriod(Year.of(date.getYear()), ReviewPeriod.Part.AUTUMN); - return new ReviewerCandidates( - reviewPeriod, - good, - wrongResearchArea, - wrongLanguage, - busy, - unavailable - ); + return new ReviewerCandidates(reviewPeriod, good, wrongResearchArea, wrongLanguage, busy, unavailable); } private int getPeriodTarget(ReviewerTarget reviewerTarget, LocalDate date) { - return date.getMonthValue() <= Month.JUNE.getValue() - ? reviewerTarget.getSpring() - : reviewerTarget.getAutumn(); + return date.getMonthValue() <= Month.JUNE.getValue() ? reviewerTarget.getSpring() : reviewerTarget.getAutumn(); } @Override @@ -283,25 +249,15 @@ public class ReviewerCapacityServiceImpl @Override public CurrentTarget getCurrentTarget(User reviewer, LocalDate date) { int assignedReviews = countAssignedReviews(reviewer, date); - int currentTarget = getTarget(reviewer, date) - .map(rt -> getPeriodTarget(rt, date)) - .orElse(0); + int currentTarget = getTarget(reviewer, date).map(rt -> getPeriodTarget(rt, date)).orElse(0); return new CurrentTarget(currentTarget, assignedReviews); } private int countAssignedReviews(User reviewer, LocalDate fromDate) { if (fromDate.getMonthValue() <= Month.JUNE.getValue()) { - return countReviews( - reviewer, - startOfSpring(fromDate.getYear()), - endOfSpring(fromDate.getYear()) - ); + return countReviews(reviewer, startOfSpring(fromDate.getYear()), endOfSpring(fromDate.getYear())); } else { - return countReviews( - reviewer, - startOfAutumn(fromDate.getYear()), - endOfAutumn(fromDate.getYear()) - ); + return countReviews(reviewer, startOfAutumn(fromDate.getYear()), endOfAutumn(fromDate.getYear())); } } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java index 57e434161f..74b7f28b09 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java @@ -14,9 +14,7 @@ import java.util.List; import se.su.dsv.scipro.system.AbstractRepository; import se.su.dsv.scipro.util.Pair; -public class ReviewerDeadlineFollowupServiceImpl - extends AbstractRepository - implements ReviewerDeadlineFollowupService { +public class ReviewerDeadlineFollowupServiceImpl extends AbstractRepository implements ReviewerDeadlineFollowupService { @Inject public ReviewerDeadlineFollowupServiceImpl(final Provider<EntityManager> em) { @@ -37,10 +35,7 @@ public class ReviewerDeadlineFollowupServiceImpl QDecision.decision.requested.before(endDate), QDecision.decision.reviewerApproval.id.in(getSubQueryList(step)), anyOf( - allOf( - QDecision.decision.deadline.before(now), - QDecision.decision.decisionDate.isNull() - ), + allOf(QDecision.decision.deadline.before(now), QDecision.decision.decisionDate.isNull()), QDecision.decision.decisionDate.after(QDecision.decision.deadline) ) ) @@ -58,9 +53,7 @@ public class ReviewerDeadlineFollowupServiceImpl ); } - private List<Pair<? extends ReviewerApproval, Decision>> getLateDecisions( - final List<Decision> decisions - ) { + private List<Pair<? extends ReviewerApproval, Decision>> getLateDecisions(final List<Decision> decisions) { final List<Pair<? extends ReviewerApproval, Decision>> late = new ArrayList<>(); for (final Decision decision : decisions) { boolean isLate = decision.isLate(); diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java index 1ced5bd355..58dfa5fc64 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java @@ -57,9 +57,7 @@ public class ReviewerDecisionReminderWorker extends AbstractWorker { @Override protected void doWork() { - List<ReviewerApproval> reviewerRoughDraftApprovals = myReviewService.findAllApprovals( - roughDraftApprovalFilter - ); + List<ReviewerApproval> reviewerRoughDraftApprovals = myReviewService.findAllApprovals(roughDraftApprovalFilter); List<ReviewerApproval> reviewerFinalSeminarApprovals = myReviewService.findAllApprovals( finalSeminarApprovalFilter ); @@ -72,9 +70,7 @@ public class ReviewerDecisionReminderWorker extends AbstractWorker { reviewerRoughDraftApprovals .stream() .filter(needRemindingToday) - .collect( - Collectors.groupingBy(ra -> Optional.ofNullable(ra.getProject().getReviewer())) - ) + .collect(Collectors.groupingBy(ra -> Optional.ofNullable(ra.getProject().getReviewer()))) .forEach((reviewer, approvals) -> { final MailEvent mailEvent = generateRoughDraftReminder(reviewer, approvals); mailEventService.save(mailEvent); @@ -82,9 +78,7 @@ public class ReviewerDecisionReminderWorker extends AbstractWorker { reviewerFinalSeminarApprovals .stream() .filter(needRemindingToday) - .collect( - Collectors.groupingBy(ra -> Optional.ofNullable(ra.getProject().getReviewer())) - ) + .collect(Collectors.groupingBy(ra -> Optional.ofNullable(ra.getProject().getReviewer()))) .forEach((reviewer, approvals) -> { final MailEvent mailEvent = generateFinalSeminarReminder(reviewer, approvals); mailEventService.save(mailEvent); @@ -99,10 +93,7 @@ public class ReviewerDecisionReminderWorker extends AbstractWorker { .collect(Collectors.toSet()); } - static Predicate<ReviewerApproval> needReminding( - Date today, - Function<Date, Set<Date>> getReminderDays - ) { + static Predicate<ReviewerApproval> needReminding(Date today, Function<Date, Set<Date>> getReminderDays) { return reviewerApproval -> { final Date deadline = reviewerApproval.getCurrentDeadline(); final Set<Date> reminderDates = getReminderDays.apply(deadline); @@ -118,17 +109,11 @@ public class ReviewerDecisionReminderWorker extends AbstractWorker { return date.toInstant().truncatedTo(ChronoUnit.DAYS); } - static MailEvent generateRoughDraftReminder( - Optional<User> reviewer, - List<ReviewerApproval> reviewerApprovals - ) { + static MailEvent generateRoughDraftReminder(Optional<User> reviewer, List<ReviewerApproval> reviewerApprovals) { return generateReminder(reviewer, reviewerApprovals, "rough draft"); } - private MailEvent generateFinalSeminarReminder( - Optional<User> reviewer, - List<ReviewerApproval> reviewerApprovals - ) { + private MailEvent generateFinalSeminarReminder(Optional<User> reviewer, List<ReviewerApproval> reviewerApprovals) { return generateReminder(reviewer, reviewerApprovals, "final seminar"); } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionService.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionService.java index ad3a259f82..ec1042048b 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionService.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionService.java @@ -4,14 +4,6 @@ import java.util.*; import se.su.dsv.scipro.file.FileUpload; public interface ReviewerDecisionService { - void reject( - ReviewerApproval finalSeminarApproval, - String reason, - Optional<FileUpload> feedback - ); - void approve( - ReviewerApproval finalSeminarApproval, - String reason, - Optional<FileUpload> feedback - ); + void reject(ReviewerApproval finalSeminarApproval, String reason, Optional<FileUpload> feedback); + void approve(ReviewerApproval finalSeminarApproval, String reason, Optional<FileUpload> feedback); } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java index 86c2150bd4..53022565bd 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java @@ -32,9 +32,7 @@ public class ReviewerInteractionServiceImpl implements ReviewerInteractionServic @Override @Transactional public ReviewerThread getReviewerThread(final Project project) { - Optional<ReviewerThread> optReviewerThread = reviewerThreadRepository.findByProject( - project - ); + Optional<ReviewerThread> optReviewerThread = reviewerThreadRepository.findByProject(project); return optReviewerThread.orElseGet(() -> createNew(project)); } @@ -62,12 +60,7 @@ public class ReviewerInteractionServiceImpl implements ReviewerInteractionServic final Set<Attachment> attachments ) { ReviewerThread reviewerThread = getReviewerThread(project); - ForumPost reply = forumService.createReply( - reviewerThread.getForumThread(), - user, - content, - attachments - ); + ForumPost reply = forumService.createReply(reviewerThread.getForumThread(), user, content, attachments); eventBus.post(new NewReviewerInteractionMessage(project, reply)); return reply; } diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java index 06b7dddf80..7f68858057 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java @@ -10,9 +10,7 @@ import java.util.Optional; import se.su.dsv.scipro.system.AbstractRepository; import se.su.dsv.scipro.system.User; -public class ReviewerTargetRepositoryImpl - extends AbstractRepository - implements ReviewerTargetRepository { +public class ReviewerTargetRepositoryImpl extends AbstractRepository implements ReviewerTargetRepository { @Inject public ReviewerTargetRepositoryImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java index 9565dcb77e..0666993786 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java @@ -84,11 +84,7 @@ public class ReviewingServiceImpl public long countUndecidedRoughDraft(final User reviewer) { return from(QDecision.decision) .join(QDecision.decision.reviewerApproval, QReviewerApproval.reviewerApproval) - .where( - forReviewer(reviewer) - .and(isUndecided()) - .and(forStep(ReviewerApproval.Step.ROUGH_DRAFT_APPROVAL)) - ) + .where(forReviewer(reviewer).and(isUndecided()).and(forStep(ReviewerApproval.Step.ROUGH_DRAFT_APPROVAL))) .select(QDecision.decision.count()) .fetchFirst(); } @@ -122,11 +118,7 @@ public class ReviewingServiceImpl @Override @Transactional - public void approve( - final ReviewerApproval process, - final String reason, - final Optional<FileUpload> feedback - ) { + public void approve(final ReviewerApproval process, final String reason, final Optional<FileUpload> feedback) { Optional<FileReference> feedbackFile = store(feedback); process.approve(reason, feedbackFile); save(process); diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java index ca3141bab0..e0bb356aad 100644 --- a/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java @@ -29,13 +29,7 @@ public class RoughDraftApprovalServiceImpl final DaysService daysService, final ReviewerDeadlineSettingsService reviewerDeadlineSettingsService ) { - super( - em, - RoughDraftApproval.class, - QRoughDraftApproval.roughDraftApproval, - eventBus, - fileDescriptionService - ); + super(em, RoughDraftApproval.class, QRoughDraftApproval.roughDraftApproval, eventBus, fileDescriptionService); this.daysService = daysService; this.reviewerDeadlineSettingsService = reviewerDeadlineSettingsService; } @@ -53,18 +47,12 @@ public class RoughDraftApprovalServiceImpl .map(earlier -> addNewRequest(comment, storedThesis, earlier)) .orElseGet(() -> Either.right(newApproval(project, storedThesis, comment))); - final Either<AlreadyRequested, RoughDraftApproval> persisted = roughDraftApproval.map( - this::save - ); + final Either<AlreadyRequested, RoughDraftApproval> persisted = roughDraftApproval.map(this::save); persisted.foreach(rda -> eventBus.post(new RoughDraftApprovalRequestedEvent(rda))); return persisted; } - private RoughDraftApproval newApproval( - Project project, - FileReference storedThesis, - String comment - ) { + private RoughDraftApproval newApproval(Project project, FileReference storedThesis, String comment) { Date deadline = getDeadline(new Date()); if (project.getReviewer() == null) { // Ugly hack to stop sending reminders before a reviewer is assigned @@ -75,18 +63,12 @@ public class RoughDraftApprovalServiceImpl @Override protected Date getDeadline(final Date requested) { - final ReviewerDeadlineSettings reviewerDeadlineSettings = - reviewerDeadlineSettingsService.getInstance(); - return daysService.workDaysAfter( - requested, - reviewerDeadlineSettings.getRoughDraftApproval() - ); + final ReviewerDeadlineSettings reviewerDeadlineSettings = reviewerDeadlineSettingsService.getInstance(); + return daysService.workDaysAfter(requested, reviewerDeadlineSettings.getRoughDraftApproval()); } @Override public Optional<RoughDraftApproval> findBy(Project project) { - return Optional.ofNullable( - findOne(QRoughDraftApproval.roughDraftApproval.project.eq(project)) - ); + return Optional.ofNullable(findOne(QRoughDraftApproval.roughDraftApproval.project.eq(project))); } } diff --git a/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java b/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java index 3cef9e5aab..e0ca834721 100644 --- a/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java +++ b/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java @@ -9,10 +9,7 @@ public class LocalAuthentication implements AuthenticationProvider { private final PasswordService passwordService; @Inject - public LocalAuthentication( - final UserService userService, - final PasswordService passwordService - ) { + public LocalAuthentication(final UserService userService, final PasswordService passwordService) { this.userService = userService; this.passwordService = passwordService; } diff --git a/core/src/main/java/se/su/dsv/scipro/settings/dataobjects/UserProfile.java b/core/src/main/java/se/su/dsv/scipro/settings/dataobjects/UserProfile.java index a9d66260a8..c0e1b3b588 100644 --- a/core/src/main/java/se/su/dsv/scipro/settings/dataobjects/UserProfile.java +++ b/core/src/main/java/se/su/dsv/scipro/settings/dataobjects/UserProfile.java @@ -87,8 +87,7 @@ public class UserProfile extends DomainObject { @Basic @Enumerated(EnumType.STRING) @Column(name = "supervisor_project_note_display") - private SupervisorProjectNoteDisplay supervisorProjectNoteDisplay = - SupervisorProjectNoteDisplay.COMPACT; + private SupervisorProjectNoteDisplay supervisorProjectNoteDisplay = SupervisorProjectNoteDisplay.COMPACT; @Override public Long getId() { @@ -159,9 +158,7 @@ public class UserProfile extends DomainObject { this.mailCompilation = mailCompilation; } - public void setDefaultProjectStatusFilter( - Collection<ProjectStatus> defaultProjectStatusFilter - ) { + public void setDefaultProjectStatusFilter(Collection<ProjectStatus> defaultProjectStatusFilter) { this.defaultProjectStatusFilter = defaultProjectStatusFilter; } @@ -187,9 +184,7 @@ public class UserProfile extends DomainObject { return supervisorProjectNoteDisplay; } - public void setSupervisorProjectNoteDisplay( - SupervisorProjectNoteDisplay supervisorProjectNoteDisplay - ) { + public void setSupervisorProjectNoteDisplay(SupervisorProjectNoteDisplay supervisorProjectNoteDisplay) { this.supervisorProjectNoteDisplay = supervisorProjectNoteDisplay; } diff --git a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java index c29453adc6..bd853a63e9 100755 --- a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java @@ -15,9 +15,7 @@ import se.su.dsv.scipro.springdata.services.SupervisorService; import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.Pageable; -public class SupervisorServiceImpl - extends AbstractServiceImpl<User, Long> - implements SupervisorService { +public class SupervisorServiceImpl extends AbstractServiceImpl<User, Long> implements SupervisorService { @Inject public SupervisorServiceImpl(Provider<EntityManager> em) { @@ -27,10 +25,7 @@ public class SupervisorServiceImpl @Override public List<User> findAll(FilterParams params, Pageable pageable) { if (params != null) { - return findAll( - QUser.user.roles.any().eq(Roles.SUPERVISOR).and(fromParams(params)), - pageable - ); + return findAll(QUser.user.roles.any().eq(Roles.SUPERVISOR).and(fromParams(params)), pageable); } else { return findAll(QUser.user.roles.any().eq(Roles.SUPERVISOR), pageable); } @@ -106,11 +101,7 @@ public class SupervisorServiceImpl return QUser.user.in( JPAExpressions.select(QTarget.target1.user) .from(QTarget.target1) - .where( - QTarget.target1.applicationPeriod - .eq(applicationPeriod) - .and(QTarget.target1.target.notIn(0)) - ) + .where(QTarget.target1.applicationPeriod.eq(applicationPeriod).and(QTarget.target1.target.notIn(0))) ); } } diff --git a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java index 6a4764c987..3d339c5905 100644 --- a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java @@ -11,9 +11,7 @@ import se.su.dsv.scipro.settings.dataobjects.UserProfile; import se.su.dsv.scipro.springdata.services.UserProfileService; import se.su.dsv.scipro.system.*; -public class UserProfileServiceImpl - extends AbstractServiceImpl<UserProfile, Long> - implements UserProfileService { +public class UserProfileServiceImpl extends AbstractServiceImpl<UserProfile, Long> implements UserProfileService { @Inject public UserProfileServiceImpl(Provider<EntityManager> em) { @@ -58,11 +56,7 @@ public class UserProfileServiceImpl private List<ProjectType> getDefaultProjectTypes() { QProjectType projectType = QProjectType.projectType; return from(projectType) - .where( - projectType.degreeType.in( - List.of(DegreeType.BACHELOR, DegreeType.MASTER, DegreeType.MAGISTER) - ) - ) + .where(projectType.degreeType.in(List.of(DegreeType.BACHELOR, DegreeType.MASTER, DegreeType.MAGISTER))) .fetch(); } } diff --git a/core/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java b/core/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java index ed79e0aabe..2484984c0d 100755 --- a/core/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java +++ b/core/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java @@ -6,8 +6,7 @@ import se.su.dsv.scipro.match.ApplicationPeriod; import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.Pageable; -public interface SupervisorService - extends FilteredService<User, Long, SupervisorService.FilterParams> { +public interface SupervisorService extends FilteredService<User, Long, SupervisorService.FilterParams> { Iterable<User> findByResearchArea(ResearchArea area, Pageable pageable); Long countByResearchArea(ResearchArea area); @@ -56,9 +55,7 @@ public interface SupervisorService this.languages = languages; } - public void setHasTargetsInApplicationPeriod( - ApplicationPeriod hasTargetsInApplicationPeriod - ) { + public void setHasTargetsInApplicationPeriod(ApplicationPeriod hasTargetsInApplicationPeriod) { this.hasTargetsInApplicationPeriod = hasTargetsInApplicationPeriod; } diff --git a/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java index 27b2f62f1c..8c71eaea97 100644 --- a/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java @@ -5,9 +5,7 @@ import jakarta.inject.Provider; import jakarta.persistence.EntityManager; import se.su.dsv.scipro.system.GenericRepo; -public class QuestionRepositoryImpl - extends GenericRepo<Question, Long> - implements QuestionRepository { +public class QuestionRepositoryImpl extends GenericRepo<Question, Long> implements QuestionRepository { @Inject public QuestionRepositoryImpl(final Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java index fca0164a22..fec6ff6687 100644 --- a/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java @@ -17,9 +17,7 @@ public class SurveyRepositoryImpl extends GenericRepo<Survey, Long> implements S @Override public Optional<Survey> getSurvey(final Project project, final User author) { - final Survey survey = findOne( - QSurvey.survey.project.eq(project).and(QSurvey.survey.user.eq(author)) - ); + final Survey survey = findOne(QSurvey.survey.project.eq(project).and(QSurvey.survey.user.eq(author))); return Optional.ofNullable(survey); } } diff --git a/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java index 99205c9c0c..da11f93cb2 100644 --- a/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java @@ -50,9 +50,7 @@ public class SurveyServiceImpl implements SurveyService { @Override public Survey getSurvey(final Project project, final User author) { - return surveyRepository - .getSurvey(project, author) - .orElseGet(() -> generateSurvey(project, author)); + return surveyRepository.getSurvey(project, author).orElseGet(() -> generateSurvey(project, author)); } @Override @@ -66,11 +64,7 @@ public class SurveyServiceImpl implements SurveyService { .getGeneralSystemSettingsInstance() .isFinalSurveyAvailable(); return ( - surveyAvailable && - hasFinalThesis && - !submittedSurvey && - !questions.isEmpty() && - !hasToFillInReflection + surveyAvailable && hasFinalThesis && !submittedSurvey && !questions.isEmpty() && !hasToFillInReflection ); } @@ -86,12 +80,7 @@ public class SurveyServiceImpl implements SurveyService { public void saveQuestion(final Question question) { if (question.getOrder() == 0) { // New question - final int order = questionRepository - .findAll() - .stream() - .mapToInt(Question::getOrder) - .max() - .orElse(0); + final int order = questionRepository.findAll().stream().mapToInt(Question::getOrder).max().orElse(0); question.setOrder(order + 1); // Move last / 1-index } questionRepository.save(question); @@ -146,9 +135,7 @@ public class SurveyServiceImpl implements SurveyService { @Override public boolean isAvailable() { - return generalSystemSettingsService - .getGeneralSystemSettingsInstance() - .isFinalSurveyAvailable(); + return generalSystemSettingsService.getGeneralSystemSettingsInstance().isFinalSurveyAvailable(); } @Override @@ -162,11 +149,7 @@ public class SurveyServiceImpl implements SurveyService { @Override public SurveyStatistics getStatistics(Filter filter) { - List<Survey> surveys = surveyRepository - .findAll() - .stream() - .filter(applyFilter(filter)) - .toList(); + List<Survey> surveys = surveyRepository.findAll().stream().filter(applyFilter(filter)).toList(); List<Question> questions = getQuestions(); Map<Question, List<SurveyAnswer>> m = surveys .stream() @@ -185,9 +168,7 @@ public class SurveyServiceImpl implements SurveyService { .filter(Objects::nonNull) .filter(Predicate.not(String::isBlank)) .toList(); - questionStatistics.add( - new SurveyStatistics.Question.Text(question.getText(), answers) - ); + questionStatistics.add(new SurveyStatistics.Question.Text(question.getText(), answers)); } case SINGLE_CHOICE -> { ArrayList<SurveyStatistics.Question.Choice> choices = new ArrayList<>(); @@ -199,9 +180,7 @@ public class SurveyServiceImpl implements SurveyService { .count(); choices.add(new SurveyStatistics.Question.Choice(choice, answers)); } - questionStatistics.add( - new SurveyStatistics.Question.Single(question.getText(), choices) - ); + questionStatistics.add(new SurveyStatistics.Question.Single(question.getText(), choices)); } case MULTIPLE_CHOICE -> { ArrayList<SurveyStatistics.Question.Choice> choices = new ArrayList<>(); @@ -213,9 +192,7 @@ public class SurveyServiceImpl implements SurveyService { .count(); choices.add(new SurveyStatistics.Question.Choice(choice, answers)); } - questionStatistics.add( - new SurveyStatistics.Question.Multi(question.getText(), choices) - ); + questionStatistics.add(new SurveyStatistics.Question.Multi(question.getText(), choices)); } case GROUP_HEADING -> {} } diff --git a/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java index 08714ea3f5..4f7cbf6db5 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java @@ -18,11 +18,7 @@ public class AbstractServiceImpl<T, ID extends Serializable> private final Class<T> clazz; private final EntityPathBase<T> path; - protected AbstractServiceImpl( - Provider<EntityManager> em, - Class<T> clazz, - EntityPathBase<T> path - ) { + protected AbstractServiceImpl(Provider<EntityManager> em, Class<T> clazz, EntityPathBase<T> path) { super(em); this.clazz = clazz; this.path = path; diff --git a/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java b/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java index 1b32e9ba7f..907cef2e18 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java +++ b/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java @@ -12,10 +12,7 @@ public class AggregateUserSearch implements UserSearchService { private final UserService userService; @Inject - public AggregateUserSearch( - Set<UserSearchProvider> userSearchProviders, - UserService userService - ) { + public AggregateUserSearch(Set<UserSearchProvider> userSearchProviders, UserService userService) { this.userSearchProviders = userSearchProviders; this.userService = userService; } diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterAddress.java b/core/src/main/java/se/su/dsv/scipro/system/FooterAddress.java index 498876f1e8..96d0bb83eb 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/FooterAddress.java +++ b/core/src/main/java/se/su/dsv/scipro/system/FooterAddress.java @@ -46,13 +46,7 @@ public class FooterAddress extends DomainObject { @Override public String toString() { return ( - "FooterAddress(id=" + - this.getId() + - ", title=" + - this.getTitle() + - ", address=" + - this.getAddress() + - ")" + "FooterAddress(id=" + this.getId() + ", title=" + this.getTitle() + ", address=" + this.getAddress() + ")" ); } diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java index 61465f6479..6925c06f26 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java @@ -4,9 +4,7 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; import jakarta.persistence.EntityManager; -public class FooterAddressRepoImpl - extends GenericRepo<FooterAddress, Long> - implements FooterAddressRepo { +public class FooterAddressRepoImpl extends GenericRepo<FooterAddress, Long> implements FooterAddressRepo { @Inject public FooterAddressRepoImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepo.java b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepo.java index 0907028c9f..c236e49890 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepo.java +++ b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepo.java @@ -5,8 +5,7 @@ import java.util.List; import java.util.Optional; @Transactional -public interface FooterLinkRepo - extends JpaRepository<FooterLink, Long>, QueryDslPredicateExecutor<FooterLink> { +public interface FooterLinkRepo extends JpaRepository<FooterLink, Long>, QueryDslPredicateExecutor<FooterLink> { List<FooterLink> getLinks(FooterColumn column); Optional<FooterLink> findByColumnAndOrder(FooterColumn column, int order); } diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java index 3e3b885a1d..e319e8d1c1 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java @@ -24,11 +24,7 @@ public class FooterLinkRepoImpl extends GenericRepo<FooterLink, Long> implements @Override public Optional<FooterLink> findByColumnAndOrder(final FooterColumn column, final int order) { return Optional.ofNullable( - findOne( - QFooterLink.footerLink.footerColumn - .eq(column) - .and(QFooterLink.footerLink.order.eq(order)) - ) + findOne(QFooterLink.footerLink.footerColumn.eq(column).and(QFooterLink.footerLink.order.eq(order))) ); } } diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java index 398db0bc4a..23ecad256c 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java @@ -26,9 +26,7 @@ public class FooterLinkServiceImpl implements FooterLinkService { } private void swapToOrder(FooterLink link, int targetOrder) { - repository - .findByColumnAndOrder(link.getFooterColumn(), targetOrder) - .ifPresent(other -> swap(link, other)); + repository.findByColumnAndOrder(link.getFooterColumn(), targetOrder).ifPresent(other -> swap(link, other)); } private void swap(FooterLink link, FooterLink other) { diff --git a/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java b/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java index 6e5d99d164..71676486e8 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java +++ b/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java @@ -11,8 +11,7 @@ import jakarta.transaction.Transactional; import java.io.Serializable; import java.util.List; -public class GenericRepo<T, ID extends Serializable> - implements QueryDslPredicateExecutor<T>, JpaRepository<T, ID> { +public class GenericRepo<T, ID extends Serializable> implements QueryDslPredicateExecutor<T>, JpaRepository<T, ID> { private final Provider<EntityManager> em; private final Class<T> clazz; diff --git a/core/src/main/java/se/su/dsv/scipro/system/PasswordRepo.java b/core/src/main/java/se/su/dsv/scipro/system/PasswordRepo.java index e848ba9f2c..bbd1d88a80 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/PasswordRepo.java +++ b/core/src/main/java/se/su/dsv/scipro/system/PasswordRepo.java @@ -3,7 +3,6 @@ package se.su.dsv.scipro.system; import jakarta.transaction.Transactional; @Transactional -public interface PasswordRepo - extends JpaRepository<Password, Long>, QueryDslPredicateExecutor<Password> { +public interface PasswordRepo extends JpaRepository<Password, Long>, QueryDslPredicateExecutor<Password> { Password findByUser(User user); } diff --git a/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java index dc55169d82..1691b55e85 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java @@ -18,9 +18,7 @@ public class PasswordServiceImpl implements PasswordService { if (!passwordInput.isEmpty()) { Password password = passwordRepo.findByUser(user); password.setSalt(PasswordHandler.generateSalt()); - password.setHash( - PasswordHandler.generateHash(passwordInput.toCharArray(), password.getSalt()) - ); + password.setHash(PasswordHandler.generateHash(passwordInput.toCharArray(), password.getSalt())); passwordRepo.save(password); } } diff --git a/core/src/main/java/se/su/dsv/scipro/system/Program.java b/core/src/main/java/se/su/dsv/scipro/system/Program.java index 2ff23ac76a..8a30933658 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/Program.java +++ b/core/src/main/java/se/su/dsv/scipro/system/Program.java @@ -92,9 +92,7 @@ public class Program extends DomainObject { if (o == this) return true; if (!(o instanceof Program)) return false; final Program other = (Program) o; - return ( - other.canEqual(this) && Objects.equals(this.getExternalId(), other.getExternalId()) - ); + return (other.canEqual(this) && Objects.equals(this.getExternalId(), other.getExternalId())); } protected boolean canEqual(final Object other) { diff --git a/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java index db3a6016c6..7152e11d3a 100644 --- a/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java @@ -11,9 +11,7 @@ import java.util.Collection; import java.util.List; import se.su.dsv.scipro.project.QProject; -public class ProjectTypeServiceImpl - extends AbstractServiceImpl<ProjectType, Long> - implements ProjectTypeService { +public class ProjectTypeServiceImpl extends AbstractServiceImpl<ProjectType, Long> implements ProjectTypeService { @Inject public ProjectTypeServiceImpl(Provider<EntityManager> em) { @@ -37,9 +35,7 @@ public class ProjectTypeServiceImpl @Override public List<ProjectType> findWithModule(ProjectModule projectModule) { - return findAll( - allOf(QProjectType.projectType.projectModules.any().eq(projectModule), notDeleted()) - ); + return findAll(allOf(QProjectType.projectType.projectModules.any().eq(projectModule), notDeleted())); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeSettings.java b/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeSettings.java index fbeea2e1a3..bcf67d378a 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeSettings.java +++ b/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeSettings.java @@ -32,8 +32,7 @@ public class ProjectTypeSettings extends DomainObject { * Defines the time span between reviews on the same project */ @Column(name = "num_days_between_peer_reviews_on_same_project", nullable = false) - private int numDaysBetweenPeerReviewsOnSameProject = - DEFAULT_NUM_DAYS_BETWEEN_REVIEWS_ON_SAME_PROJECT; + private int numDaysBetweenPeerReviewsOnSameProject = DEFAULT_NUM_DAYS_BETWEEN_REVIEWS_ON_SAME_PROJECT; /* * Defines the number of days between accepting a review and the deadline for review submission @@ -157,9 +156,7 @@ public class ProjectTypeSettings extends DomainObject { this.minOpponentsOnFinalSeminar = minOpponentsOnFinalSeminar; } - public void setNumDaysBetweenPeerReviewsOnSameProject( - int numDaysBetweenPeerReviewsOnSameProject - ) { + public void setNumDaysBetweenPeerReviewsOnSameProject(int numDaysBetweenPeerReviewsOnSameProject) { this.numDaysBetweenPeerReviewsOnSameProject = numDaysBetweenPeerReviewsOnSameProject; } diff --git a/core/src/main/java/se/su/dsv/scipro/system/ResearchArea.java b/core/src/main/java/se/su/dsv/scipro/system/ResearchArea.java index c258572aa9..2376a281d2 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/ResearchArea.java +++ b/core/src/main/java/se/su/dsv/scipro/system/ResearchArea.java @@ -71,9 +71,7 @@ public class ResearchArea extends LazyDeletableDomainObject { if (o == this) return true; if (!(o instanceof ResearchArea)) return false; final ResearchArea other = (ResearchArea) o; - return ( - other.canEqual(this) && Objects.equals(this.getIdentifier(), other.getIdentifier()) - ); + return (other.canEqual(this) && Objects.equals(this.getIdentifier(), other.getIdentifier())); } protected boolean canEqual(final Object other) { diff --git a/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java index 74ecc93720..76bc207cdd 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java @@ -7,9 +7,7 @@ import jakarta.transaction.Transactional; import java.util.Comparator; import java.util.List; -public class ResearchAreaServiceImpl - extends AbstractServiceImpl<ResearchArea, Long> - implements ResearchAreaService { +public class ResearchAreaServiceImpl extends AbstractServiceImpl<ResearchArea, Long> implements ResearchAreaService { @Inject public ResearchAreaServiceImpl(Provider<EntityManager> em) { @@ -18,11 +16,7 @@ public class ResearchAreaServiceImpl @Override @Transactional - public ResearchArea updateExternalResearchArea( - Long identifier, - String name, - final boolean active - ) { + public ResearchArea updateExternalResearchArea(Long identifier, String name, final boolean active) { ResearchArea ra = new ResearchArea(); if (identifier != null) { ResearchArea existing = findOne(QResearchArea.researchArea.identifier.eq(identifier)); diff --git a/core/src/main/java/se/su/dsv/scipro/system/Unit.java b/core/src/main/java/se/su/dsv/scipro/system/Unit.java index f634ae45ef..d0022fc4a5 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/Unit.java +++ b/core/src/main/java/se/su/dsv/scipro/system/Unit.java @@ -82,9 +82,7 @@ public class Unit extends DomainObject { if (o == this) return true; if (!(o instanceof Unit)) return false; final Unit other = (Unit) o; - return ( - other.canEqual(this) && Objects.equals(this.getIdentifier(), other.getIdentifier()) - ); + return (other.canEqual(this) && Objects.equals(this.getIdentifier(), other.getIdentifier())); } protected boolean canEqual(final Object other) { diff --git a/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java index 83cec21f1d..33314571b1 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java @@ -4,9 +4,7 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; import jakarta.persistence.EntityManager; -public class UserNameServiceImpl - extends AbstractServiceImpl<Username, Long> - implements UserNameService { +public class UserNameServiceImpl extends AbstractServiceImpl<Username, Long> implements UserNameService { @Inject public UserNameServiceImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/system/UserService.java b/core/src/main/java/se/su/dsv/scipro/system/UserService.java index 1ce66e1255..f2a2d9ee8c 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/UserService.java +++ b/core/src/main/java/se/su/dsv/scipro/system/UserService.java @@ -8,8 +8,7 @@ import java.util.List; import java.util.Objects; import se.su.dsv.scipro.security.auth.roles.Roles; -public interface UserService - extends GenericService<User, Long>, FilteredService<User, Long, UserService.Filter> { +public interface UserService extends GenericService<User, Long>, FilteredService<User, Long, UserService.Filter> { User findByUsername(String username); User findByExternalIdentifier(Integer externalIdentifier); @@ -64,9 +63,7 @@ public interface UserService @Override public String toString() { - return ( - "UserService.Filter(roles=" + this.getRoles() + ", name=" + this.getName() + ")" - ); + return ("UserService.Filter(roles=" + this.getRoles() + ", name=" + this.getName() + ")"); } } } diff --git a/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java index 03aeed9d85..46d6783e33 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java @@ -39,9 +39,7 @@ public class UserServiceImpl extends AbstractServiceImpl<User, Long> implements @Override public List<User> findActiveReviewers() { - return findAll( - QUser.user.roles.any().eq(Roles.REVIEWER).and(QUser.user.activeAsSupervisor.isTrue()) - ); + return findAll(QUser.user.roles.any().eq(Roles.REVIEWER).and(QUser.user.activeAsSupervisor.isTrue())); } private static Predicate fromParams(Filter filter) { @@ -54,10 +52,7 @@ public class UserServiceImpl extends AbstractServiceImpl<User, Long> implements if (filter.getName() != null && !filter.getName().isEmpty()) { booleanBuilder.and( anyOf( - QUser.user.firstName - .concat(" ") - .concat(QUser.user.lastName) - .containsIgnoreCase(filter.getName()), + QUser.user.firstName.concat(" ").concat(QUser.user.lastName).containsIgnoreCase(filter.getName()), QUser.user.emailAddress.containsIgnoreCase(filter.getName()) ) ); diff --git a/core/src/main/java/se/su/dsv/scipro/system/Username.java b/core/src/main/java/se/su/dsv/scipro/system/Username.java index a46821e7bf..700f91e543 100755 --- a/core/src/main/java/se/su/dsv/scipro/system/Username.java +++ b/core/src/main/java/se/su/dsv/scipro/system/Username.java @@ -12,10 +12,7 @@ import jakarta.persistence.UniqueConstraint; import java.util.Objects; @Entity -@Table( - name = "username", - uniqueConstraints = { @UniqueConstraint(name = "uk_username", columnNames = { "username" }) } -) +@Table(name = "username", uniqueConstraints = { @UniqueConstraint(name = "uk_username", columnNames = { "username" }) }) @Cacheable(true) public class Username extends DomainObject { @@ -56,15 +53,7 @@ public class Username extends DomainObject { @Override public String toString() { - return ( - "Username(id=" + - this.getId() + - ", username=" + - this.getUsername() + - ", user=" + - this.getUser() + - ")" - ); + return ("Username(id=" + this.getId() + ", username=" + this.getUsername() + ", user=" + this.getUser() + ")"); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLink.java b/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLink.java index 2b54a66375..d560854009 100644 --- a/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLink.java +++ b/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLink.java @@ -114,13 +114,7 @@ public class ExternalLink extends DomainObject { @Override public int hashCode() { - return Objects.hash( - this.getId(), - this.getProject(), - this.getUrl(), - this.getUser(), - this.getDescription() - ); + return Objects.hash(this.getId(), this.getProject(), this.getUrl(), this.getUser(), this.getDescription()); } @Override diff --git a/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java index d382e59337..86006bcdb1 100755 --- a/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java @@ -7,9 +7,7 @@ import java.util.List; import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.system.AbstractServiceImpl; -public class ExternalLinkServiceImpl - extends AbstractServiceImpl<ExternalLink, Long> - implements ExternalLinkService { +public class ExternalLinkServiceImpl extends AbstractServiceImpl<ExternalLink, Long> implements ExternalLinkService { @Inject public ExternalLinkServiceImpl(Provider<EntityManager> em) { diff --git a/core/src/main/java/se/su/dsv/scipro/util/PropsUtils.java b/core/src/main/java/se/su/dsv/scipro/util/PropsUtils.java index 43b5474fba..f17499bf2b 100755 --- a/core/src/main/java/se/su/dsv/scipro/util/PropsUtils.java +++ b/core/src/main/java/se/su/dsv/scipro/util/PropsUtils.java @@ -19,9 +19,7 @@ public final class PropsUtils { * Loads the properties from the specified file into the given properties map. */ public static Properties load(String propertyFile, Properties properties) throws IOException { - InputStream in = Thread.currentThread() - .getContextClassLoader() - .getResourceAsStream(propertyFile); + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(propertyFile); properties.load(in); return properties; } diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/DailySchedule.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/DailySchedule.java index 2c317f718f..9fc15cc1c4 100644 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/DailySchedule.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/DailySchedule.java @@ -42,12 +42,8 @@ class DailySchedule extends Schedule { @VisibleForTesting static long minutesUntil(int targetHour, int targetMinute, int currentHour, int currentMinute) { - if ( - currentHour > targetHour || (currentHour == targetHour && currentMinute > targetMinute) - ) { - return ( - MINUTES_PER_DAY - minutesUntil(currentHour, currentMinute, targetHour, targetMinute) - ); + if (currentHour > targetHour || (currentHour == targetHour && currentMinute > targetMinute)) { + return (MINUTES_PER_DAY - minutesUntil(currentHour, currentMinute, targetHour, targetMinute)); } int hx = targetHour - currentHour; diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java index 8e919cfaec..69c1975a93 100644 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java @@ -61,8 +61,7 @@ public class GradeFinalSeminarParticipantReminderWorker extends AbstractWorker { mailEvent.setRecipients(Collections.singleton(finalSeminar.getHeadSupervisor())); mailEvent.setSubject("Final seminar participants needs to be graded"); - final GeneralSystemSettings settings = - generalSystemSettingsService.getGeneralSystemSettingsInstance(); + final GeneralSystemSettings settings = generalSystemSettingsService.getGeneralSystemSettingsInstance(); final String body = "The project " + '\'' + diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java index 2d84b377c1..0eba229f57 100644 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java @@ -153,12 +153,9 @@ public class IdeaExportWorker extends AbstractWorker { String supportEmail = "thesissupport@dsv.su.se"; String subjectFormat = "[SciPro] Automatic idea exporting {0, date}"; - String prefix = - "The following {0, choice, 1#idea|1<{0, number} ideas} failed to export into Daisy.\n\n"; - String suffix = - "***DO NOT REPLY TO THIS MESSAGE!*** This is an automated message from SciPro."; - String ideaFormat = - "{0}\n" + "Error: {1}\n" + " - Supervisor: {2}\n" + " - Authors: {3}\n\n"; + String prefix = "The following {0, choice, 1#idea|1<{0, number} ideas} failed to export into Daisy.\n\n"; + String suffix = "***DO NOT REPLY TO THIS MESSAGE!*** This is an automated message from SciPro."; + String ideaFormat = "{0}\n" + "Error: {1}\n" + " - Supervisor: {2}\n" + " - Authors: {3}\n\n"; Collection<Idea> failedIdeas; String subject; @@ -212,10 +209,7 @@ public class IdeaExportWorker extends AbstractWorker { private String getAuthors(Idea idea) { StringBuilder authors = new StringBuilder(); - for ( - Iterator<IdeaParticipation> iterator = idea.getIdeaParticipations().iterator(); - iterator.hasNext(); - ) { + for (Iterator<IdeaParticipation> iterator = idea.getIdeaParticipations().iterator(); iterator.hasNext();) { authors.append(iterator.next().getUser().getFullName()); if (iterator.hasNext()) { authors.append(", "); diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java index d36d5966b2..78cdf622c6 100644 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java @@ -50,22 +50,15 @@ public class ManualMatchRemindWorker extends AbstractWorker { for (ApplicationPeriod applicationPeriod : applicationPeriodService.findAll()) { if (LocalDate.now(clock).equals(applicationPeriod.getEndDate())) { MailEvent mailEvent = new MailEvent(); - mailEvent.setNonUserRecipients( - new HashSet<>(Collections.singletonList(matchResponsibleMail)) - ); - mailEvent.setSubject( - "Manual matching required for application period " + applicationPeriod.getName() - ); + mailEvent.setNonUserRecipients(new HashSet<>(Collections.singletonList(matchResponsibleMail))); + mailEvent.setSubject("Manual matching required for application period " + applicationPeriod.getName()); StringBuilder sb = new StringBuilder(); sb.append("Application period: ").append(applicationPeriod.getName()).append('\n'); sb.append("Start date: ").append(applicationPeriod.getStartDate()).append('\n'); sb.append("End date: ").append(applicationPeriod.getEndDate()).append('\n'); - sb - .append("Course start date: ") - .append(applicationPeriod.getCourseStartDate()) - .append('\n'); + sb.append("Course start date: ").append(applicationPeriod.getCourseStartDate()).append('\n'); for (ProjectType projectType : applicationPeriod.getProjectTypes()) { IdeaService.Filter params = new IdeaService.Filter(); @@ -82,12 +75,7 @@ public class ManualMatchRemindWorker extends AbstractWorker { sb .append("Total no of ideas in application period: ") - .append( - ideaService.countByApplicationPeriod( - applicationPeriod, - new IdeaService.Filter() - ) - ) + .append(ideaService.countByApplicationPeriod(applicationPeriod, new IdeaService.Filter())) .append('\n'); mailEvent.setMessageBody(sb.toString()); diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java index 88ea5d84b0..27d96f8626 100755 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java @@ -19,9 +19,7 @@ import se.su.dsv.scipro.system.User; public class NotificationCompilationWorker extends AbstractWorker { - private static final Logger LOGGER = LoggerFactory.getLogger( - NotificationCompilationWorker.class - ); + private static final Logger LOGGER = LoggerFactory.getLogger(NotificationCompilationWorker.class); @Inject NotificationService notificationService; @@ -64,8 +62,7 @@ public class NotificationCompilationWorker extends AbstractWorker { private void sendNotifications(User user, List<Notification> notifications) { beginTransaction(); - GeneralSystemSettings systemSettings = - systemSettingsService.getGeneralSystemSettingsInstance(); + GeneralSystemSettings systemSettings = systemSettingsService.getGeneralSystemSettingsInstance(); NotificationMail notificationMail = notificationMailFormatter.compile(notifications); String subject = notificationMail.getSubject(); @@ -90,9 +87,7 @@ public class NotificationCompilationWorker extends AbstractWorker { beginTransaction(); List<User> withMailCompilation = userProfileService.findUsersWithMailCompilation(); - Iterable<Notification> unreadNotifications = notificationService.findUnreadByUsers( - withMailCompilation - ); + Iterable<Notification> unreadNotifications = notificationService.findUnreadByUsers(withMailCompilation); for (Notification notification : unreadNotifications) { if (notification.isMailed()) { diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java index f19b9ede91..01815b10e2 100755 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java @@ -10,11 +10,7 @@ public class Task { private final String description; private final Schedule schedule; - Task( - final String description, - final Provider<? extends Worker> worker, - final Schedule schedule - ) { + Task(final String description, final Provider<? extends Worker> worker, final Schedule schedule) { this.description = description; this.worker = worker; this.schedule = schedule; diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java index 76492e39d1..5b98019b51 100644 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java @@ -24,15 +24,10 @@ public class TemporaryWorkerScheduler { Provider<PlagiarismSubmitter> plagiarismSubmitter, Provider<StatusPollingWorker> urkundPoller, Provider<RemoveFulfilledPartnerAdsWorker> removeFulfilledPartnerAds, - Provider< - GradeFinalSeminarParticipantReminderWorker - > gradeFinalSeminarParticipantReminderWorkerProvider + Provider<GradeFinalSeminarParticipantReminderWorker> gradeFinalSeminarParticipantReminderWorkerProvider ) { scheduler.schedule("Mail-event-worker").runBy(mailEventWorker).every(1, TimeUnit.MINUTES); - scheduler - .schedule("Check-plagiarism-event-worker") - .runBy(plagiarismSubmitter) - .every(10, TimeUnit.MINUTES); + scheduler.schedule("Check-plagiarism-event-worker").runBy(plagiarismSubmitter).every(10, TimeUnit.MINUTES); scheduler .schedule("Send out summary mails for all unread notifications") .runBy(notificationCompilationWorker) @@ -50,21 +45,12 @@ public class TemporaryWorkerScheduler { .schedule("Remind match responsible to manually match ideas") .runBy(manualMatchRemindWorkerProvider) .dailyAt(4, 0); - scheduler - .schedule("Reviewer decision reminders") - .runBy(reviewerDecisionReminderWorker) - .dailyAt(11, 45); - scheduler - .schedule("Poll URKUND for status") - .runBy(urkundPoller) - .every(15, TimeUnit.MINUTES); + scheduler.schedule("Reviewer decision reminders").runBy(reviewerDecisionReminderWorker).dailyAt(11, 45); + scheduler.schedule("Poll URKUND for status").runBy(urkundPoller).every(15, TimeUnit.MINUTES); scheduler .schedule("Remind supervisors to grade seminar participants") .runBy(gradeFinalSeminarParticipantReminderWorkerProvider) .dailyAt(7, 0); - scheduler - .schedule("Remove fulfilled partner ads") - .runBy(removeFulfilledPartnerAds) - .every(1, TimeUnit.HOURS); + scheduler.schedule("Remove fulfilled partner ads").runBy(removeFulfilledPartnerAds).every(1, TimeUnit.HOURS); } } diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java index 723796ae3b..490e394bfa 100755 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java @@ -24,10 +24,7 @@ public class ThesisUploadDeadlineWorker extends AbstractWorker { * Feature should not look at seminars held before this date */ Date validFrom = Date.from( - Instant.now() - .atZone(ZoneId.systemDefault()) - .with(LocalDate.of(2013, Month.AUGUST, 8)) - .toInstant() + Instant.now().atZone(ZoneId.systemDefault()).with(LocalDate.of(2013, Month.AUGUST, 8)).toInstant() ); try { diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java index 6731a1b891..9f17a5fbc9 100755 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java @@ -65,14 +65,8 @@ public class ThesisUploadReminderWorker extends AbstractWorker { remindDate.before(todayEnd) ) { final NotificationSource source = new NotificationSource(); - source.setMessage( - new SimpleDateFormat(DateStyle.DATETIME.getFormat()).format(uploadDeadline) - ); - notificationController.notifySeminar( - fs, - SeminarEvent.Event.THESIS_UPLOAD_REMIND, - source - ); + source.setMessage(new SimpleDateFormat(DateStyle.DATETIME.getFormat()).format(uploadDeadline)); + notificationController.notifySeminar(fs, SeminarEvent.Event.THESIS_UPLOAD_REMIND, source); } } commitTransaction(); diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerData.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerData.java index c0c5bd4c44..0598cbc57d 100755 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerData.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerData.java @@ -103,11 +103,6 @@ public class WorkerData extends DomainObject { @Override public int hashCode() { - return Objects.hash( - this.getId(), - this.getName(), - this.getLastRun(), - this.getLastSuccessfulRun() - ); + return Objects.hash(this.getId(), this.getName(), this.getLastRun(), this.getLastSuccessfulRun()); } } diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java index c90cbab4ef..7b80062c92 100644 --- a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java @@ -5,9 +5,7 @@ import jakarta.inject.Provider; import jakarta.persistence.EntityManager; import se.su.dsv.scipro.system.AbstractServiceImpl; -public class WorkerDataServiceImpl - extends AbstractServiceImpl<WorkerData, Long> - implements WorkerDataService { +public class WorkerDataServiceImpl extends AbstractServiceImpl<WorkerData, Long> implements WorkerDataService { @Inject public WorkerDataServiceImpl(Provider<EntityManager> em) { diff --git a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java index 38ca6a56fb..f759f3ff87 100644 --- a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java @@ -141,10 +141,7 @@ public class ActivityPlanFacadeImplIntegrationTest extends IntegrationTest { @Test public void findEventsByProject() { List<Activity> expectedList = Collections.singletonList(newActivity(today)); - assertEquals( - expectedList, - activityPlanFacade.findEventsByProject(project, yesterday, tomorrow, ALL) - ); + assertEquals(expectedList, activityPlanFacade.findEventsByProject(project, yesterday, tomorrow, ALL)); } @Test @@ -153,10 +150,7 @@ public class ActivityPlanFacadeImplIntegrationTest extends IntegrationTest { newActivity(today); newActivity(today); newActivity(today); - assertEquals( - expectedCount, - activityPlanFacade.countEventsByProject(project, yesterday, tomorrow) - ); + assertEquals(expectedCount, activityPlanFacade.countEventsByProject(project, yesterday, tomorrow)); } @Test @@ -165,10 +159,7 @@ public class ActivityPlanFacadeImplIntegrationTest extends IntegrationTest { newActivity(yesterday); newActivity(today); newActivity(today); - assertEquals( - expectedCount, - activityPlanFacade.countEventsByProject(project, null, tomorrow) - ); + assertEquals(expectedCount, activityPlanFacade.countEventsByProject(project, null, tomorrow)); } @Test @@ -177,10 +168,7 @@ public class ActivityPlanFacadeImplIntegrationTest extends IntegrationTest { newActivity(tomorrow); newActivity(tomorrow); newActivity(tomorrow); - assertEquals( - expectedCount, - activityPlanFacade.countEventsByProject(project, yesterday, null) - ); + assertEquals(expectedCount, activityPlanFacade.countEventsByProject(project, yesterday, null)); } @Test @@ -224,12 +212,6 @@ public class ActivityPlanFacadeImplIntegrationTest extends IntegrationTest { } private User createUser() { - return save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + return save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); } } diff --git a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java index 83553c1f1b..00de8adc3d 100644 --- a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java +++ b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java @@ -31,18 +31,10 @@ public class ActivityPlanFacadeImplIntegrationTestChecklistMethods extends Integ @BeforeEach public void startTransaction() { - employee1 = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + employee1 = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); employee1 = save(employee1); - ProjectType bachelor = new ProjectType( - ProjectType.BACHELOR, - "Bachelor", - "Bachelor degree thesis project" - ); + ProjectType bachelor = new ProjectType(ProjectType.BACHELOR, "Bachelor", "Bachelor degree thesis project"); bachelor = save(bachelor); Project project = Project.builder() @@ -79,13 +71,7 @@ public class ActivityPlanFacadeImplIntegrationTestChecklistMethods extends Integ !checklist.getQuestions().get(0).getAnswers().isEmpty() && checklist.getQuestions().get(0).getAnswers().get(0) != null && checklist.getQuestions().get(0).getAnswers().get(0).getAnswer() != null && - checklist - .getQuestions() - .get(0) - .getAnswers() - .get(0) - .getAnswer() - .equals(ChecklistAnswerEnum.GREEN) && + checklist.getQuestions().get(0).getAnswers().get(0).getAnswer().equals(ChecklistAnswerEnum.GREEN) && checklist.getUserLastOpenDate().get(employee1) == null ); } diff --git a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplTest.java b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplTest.java index f319c0976f..4469562215 100644 --- a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplTest.java @@ -40,10 +40,7 @@ public class ActivityPlanFacadeImplTest { .projectType(PROJECT_TYPE) .startDate(LocalDate.now()) .build(); - static final ChecklistTemplate SOME_TEMPLATE = new ChecklistTemplate( - "name", - new UserBuilder().create() - ); + static final ChecklistTemplate SOME_TEMPLATE = new ChecklistTemplate("name", new UserBuilder().create()); static final String SOME_NAME = "someName"; static final String SOME_TITLE = "someTitle"; @@ -109,23 +106,16 @@ public class ActivityPlanFacadeImplTest { final FileReference fileReference = new FileReference(); fileDescription.setFileReference(fileReference); - when( - projectFileService.store(isA(ProjectFileUpload.class), any(FileSource.class)) - ).thenReturn(fileDescription); + when(projectFileService.store(isA(ProjectFileUpload.class), any(FileSource.class))).thenReturn(fileDescription); activityPlanFacade.storeActivityUpload(mock(ProjectFileUpload.class), activity); - ArgumentCaptor<ActivityFileUploadedEvent> captor = ArgumentCaptor.forClass( - ActivityFileUploadedEvent.class - ); + ArgumentCaptor<ActivityFileUploadedEvent> captor = ArgumentCaptor.forClass(ActivityFileUploadedEvent.class); verify(eventBus).post(captor.capture()); ActivityFileUploadedEvent event = captor.getValue(); assertThat(event.getActivity(), is(activity)); - assertThat( - event.getFileDescription(), - CoreMatchers.is(fileDescription.getFileDescription()) - ); + assertThat(event.getFileDescription(), CoreMatchers.is(fileDescription.getFileDescription())); } @Test @@ -152,9 +142,7 @@ public class ActivityPlanFacadeImplTest { String question = "q1"; SOME_TEMPLATE.addQuestion(question); ChecklistQuestion checklistQuestion = new ChecklistQuestion(question, 1); - when(checklistQuestionRepo.save(any(ChecklistQuestion.class))).thenReturn( - checklistQuestion - ); + when(checklistQuestionRepo.save(any(ChecklistQuestion.class))).thenReturn(checklistQuestion); return checklistQuestion; } diff --git a/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java index 25e09febb7..9407b77f5b 100644 --- a/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java @@ -29,13 +29,7 @@ public class ChecklistTemplateServiceImplTest extends IntegrationTest { @BeforeEach public void setUp() throws Exception { - user = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + user = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); template = newChecklistTemplate(user); } @@ -98,16 +92,9 @@ public class ChecklistTemplateServiceImplTest extends IntegrationTest { public void find_peer_request_checklists() { ProjectType master = save(new ProjectType(DegreeType.MASTER, "Master", "Master")); Project project = save( - Project.builder() - .title("Title") - .projectType(master) - .startDate(LocalDate.now()) - .headSupervisor(user) - .build() + Project.builder().title("Title").projectType(master).startDate(LocalDate.now()).headSupervisor(user).build() ); - template - .getCategories() - .add(save(new ChecklistCategory(ChecklistTemplateServiceImpl.PEER))); + template.getCategories().add(save(new ChecklistCategory(ChecklistTemplateServiceImpl.PEER))); template.getProjectTypes().add(master); assertThat(checklistTemplateService.findPeerRequestChecklists(project), hasItem(template)); @@ -124,10 +111,7 @@ public class ChecklistTemplateServiceImplTest extends IntegrationTest { } private ChecklistTemplate newChecklistTemplate(User user) { - ChecklistTemplate clt = new ChecklistTemplate( - "New checklist template (change this to real name)", - user - ); + ChecklistTemplate clt = new ChecklistTemplate("New checklist template (change this to real name)", user); clt.setCategories(new ArrayList<ChecklistCategory>()); ArrayList<String> questionList = new ArrayList<>(); questionList.add("Example question (remove this and add relevant questions)"); diff --git a/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java b/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java index cb81b3b698..44eb67b749 100644 --- a/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java @@ -276,11 +276,7 @@ public class DaisyAPIImplTest { } private DaisyAPIImpl getDaisyAPI(HttpServer httpServer) { - String uri = - "http://" + - httpServer.getAddress().getHostName() + - ":" + - httpServer.getAddress().getPort(); + String uri = "http://" + httpServer.getAddress().getHostName() + ":" + httpServer.getAddress().getPort(); return new DaisyAPIImpl(uri, "user", "password"); } diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java index 2c2339c0c2..9b27323fd4 100644 --- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java @@ -61,11 +61,7 @@ public class FinalSeminarOppositionServiceImplIntegrationTest extends Integratio } private User createUser() { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); return save(user); } diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java index 348c154a54..ef6d059972 100644 --- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java @@ -42,10 +42,7 @@ public class FinalSeminarRespondentServiceImplIntegrationTest extends Integratio @Test public void saves_respondent() { - FinalSeminarRespondent finalSeminarRespondent = new FinalSeminarRespondent( - user, - finalSeminar - ); + FinalSeminarRespondent finalSeminarRespondent = new FinalSeminarRespondent(user, finalSeminar); FinalSeminarRespondent save = save(finalSeminarRespondent); assertNotNull(save.getId()); } @@ -69,11 +66,7 @@ public class FinalSeminarRespondentServiceImplIntegrationTest extends Integratio } private User createUser() { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); return save(user); } diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java index 529fe208fd..23ebd8113c 100644 --- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java +++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java @@ -52,11 +52,7 @@ public class FinalSeminarSchedulingTest extends IntegrationTest { public void setUp() { ProjectType master = save(new ProjectType(DegreeType.MASTER, "Master", "Master")); User supervisor = save( - User.builder() - .firstName("Hasse") - .lastName("Handledare") - .emailAddress("hasse@example.com") - .build() + User.builder().firstName("Hasse").lastName("Handledare").emailAddress("hasse@example.com").build() ); exemptedProject = save( Project.builder() @@ -151,10 +147,7 @@ public class FinalSeminarSchedulingTest extends IntegrationTest { assertTrue(scheduled.isRight(), "Seminar should be scheduled"); LocalDate future = LocalDate.of(2022, Month.OCTOBER, 18); - Either<MovingError, FinalSeminar> moved = finalSeminarService.move( - scheduled.right(), - future.atStartOfDay() - ); + Either<MovingError, FinalSeminar> moved = finalSeminarService.move(scheduled.right(), future.atStartOfDay()); assertTrue(moved.isRight(), "Moving seminar forward should be allowed"); } @@ -208,30 +201,14 @@ public class FinalSeminarSchedulingTest extends IntegrationTest { } private static FinalSeminarDetails detailsAt() { - return new FinalSeminarDetails( - "Zoom", - false, - 5, - 5, - Language.SWEDISH, - Language.ENGLISH, - null - ); + return new FinalSeminarDetails("Zoom", false, 5, 5, Language.SWEDISH, Language.ENGLISH, null); } private void approveRoughDraftApproval(Project project) { ByteArrayInputStream data = new ByteArrayInputStream("a".getBytes(StandardCharsets.UTF_8)); - StreamingUpload upload = new StreamingUpload( - "f.txt", - "text/plain", - project.getHeadSupervisor(), - 1, - data - ); + StreamingUpload upload = new StreamingUpload("f.txt", "text/plain", project.getHeadSupervisor(), 1, data); roughDraftApprovalService .requestApproval(project, upload, "no comment") - .foreach(approval -> - reviewerDecisionService.approve(approval, "very nice!", Optional.empty()) - ); + .foreach(approval -> reviewerDecisionService.approve(approval, "very nice!", Optional.empty())); } } diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java index 11c58acfcf..3cced9804a 100644 --- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java @@ -93,10 +93,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { @Test public void can_oppose_future_seminar() { - assertThat( - finalSeminarService.canOppose(user, futureFinalSeminar, otherProject), - isRight(anything()) - ); + assertThat(finalSeminarService.canOppose(user, futureFinalSeminar, otherProject), isRight(anything())); } @Test @@ -110,11 +107,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { @Test public void can_not_oppose_if_already_opponent() { otherProject.addProjectParticipant(user); - finalSeminarService.attemptAddOppositionAsSupervisor( - user, - futureFinalSeminar, - otherProject - ); + finalSeminarService.attemptAddOppositionAsSupervisor(user, futureFinalSeminar, otherProject); assertThat( finalSeminarService.canOppose(user, futureFinalSeminar, otherProject), isLeft(instanceOf(AlreadyParticipating.class)) @@ -124,11 +117,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { @Test public void can_not_oppose_if_participant() { otherProject.addProjectParticipant(user); - finalSeminarService.attemptAddActiveParticipationAsSupervisor( - user, - futureFinalSeminar, - otherProject - ); + finalSeminarService.attemptAddActiveParticipationAsSupervisor(user, futureFinalSeminar, otherProject); assertThat( finalSeminarService.canOppose(user, futureFinalSeminar, otherProject), isLeft(instanceOf(AlreadyParticipating.class)) @@ -137,10 +126,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { @Test public void can_participate_on_future_seminar() { - assertThat( - finalSeminarService.canActiveParticipate(user, futureFinalSeminar), - isRight(anything()) - ); + assertThat(finalSeminarService.canActiveParticipate(user, futureFinalSeminar), isRight(anything())); } @Test @@ -154,11 +140,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { @Test public void can_not_participate_twice() { otherProject.addProjectParticipant(user); - finalSeminarService.attemptAddActiveParticipationAsSupervisor( - user, - futureFinalSeminar, - otherProject - ); + finalSeminarService.attemptAddActiveParticipationAsSupervisor(user, futureFinalSeminar, otherProject); assertThat( finalSeminarService.canActiveParticipate(user, futureFinalSeminar), isLeft(instanceOf(ParticipationAlreadyParticipating.class)) @@ -222,26 +204,16 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { @Test public void can_participate_if_previous_oppositions_are_failed() { FinalSeminar secondSeminar = createFinalSeminar(createProject(), 10); - finalSeminarService.attemptAddOppositionAsSupervisor( - user, - futureFinalSeminar, - otherProject - ); + finalSeminarService.attemptAddOppositionAsSupervisor(user, futureFinalSeminar, otherProject); for (FinalSeminarOpposition finalSeminarOpposition : futureFinalSeminar.getOppositions()) { finalSeminarOpposition.setGrade(FinalSeminarGrade.NOT_APPROVED); } - assertThat( - finalSeminarService.canOppose(user, secondSeminar, otherProject), - isRight(anything()) - ); + assertThat(finalSeminarService.canOppose(user, secondSeminar, otherProject), isRight(anything())); } @Test public void findByProject() { - assertEquals( - futureFinalSeminar, - finalSeminarService.findByProject(futureFinalSeminar.getProject()) - ); + assertEquals(futureFinalSeminar, finalSeminarService.findByProject(futureFinalSeminar.getProject())); } @Test @@ -261,11 +233,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { addOpposition(unfinishedTooEarly, null); final Date before = Date.from(ZonedDateTime.now().minusDays(5).toInstant()); - List<FinalSeminar> seminars = finalSeminarService.findUnfinishedSeminars( - null, - before, - new PageRequest(0, 5) - ); + List<FinalSeminar> seminars = finalSeminarService.findUnfinishedSeminars(null, before, new PageRequest(0, 5)); assertEquals(1, seminars.size()); assertThat(seminars, hasItem(unfinished)); } @@ -280,11 +248,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { addActiveParticipant(unfinishedTooEarly, null); final Date before = Date.from(ZonedDateTime.now().minusDays(5).toInstant()); - List<FinalSeminar> seminars = finalSeminarService.findUnfinishedSeminars( - null, - before, - new PageRequest(0, 5) - ); + List<FinalSeminar> seminars = finalSeminarService.findUnfinishedSeminars(null, before, new PageRequest(0, 5)); assertEquals(1, seminars.size()); assertThat(seminars, hasItem(unfinished)); } @@ -299,11 +263,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { addRespondent(unfinishedTooEarly, null); final Date before = Date.from(ZonedDateTime.now().minusDays(5).toInstant()); - List<FinalSeminar> seminars = finalSeminarService.findUnfinishedSeminars( - null, - before, - new PageRequest(0, 5) - ); + List<FinalSeminar> seminars = finalSeminarService.findUnfinishedSeminars(null, before, new PageRequest(0, 5)); assertEquals(1, seminars.size()); assertThat(seminars, hasItem(unfinished)); } @@ -337,10 +297,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { setOppositionPriorityDaysTo(3); FinalSeminar finalSeminar = createFutureFinalSeminarSomeDaysAgo(5); - assertThat( - finalSeminarService.canOppose(user, finalSeminar, otherProject), - isRight(anything()) - ); + assertThat(finalSeminarService.canOppose(user, finalSeminar, otherProject), isRight(anything())); } @Test @@ -349,10 +306,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { FinalSeminar finalSeminar = createFutureFinalSeminarSomeDaysAgo(5); save(initFinalSeminar(otherProject, 30)); - assertThat( - finalSeminarService.canOppose(user, finalSeminar, otherProject), - isRight(anything()) - ); + assertThat(finalSeminarService.canOppose(user, finalSeminar, otherProject), isRight(anything())); } private FinalSeminar createFutureFinalSeminarSomeDaysAgo(final int daysAgo) { @@ -393,18 +347,12 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { } private OppositionReport createOppositionReport(FinalSeminarOpposition opposition) { - OppositionReport oppositionReport = new OppositionReport( - createGradingReportTemplate(projectType), - opposition - ); + OppositionReport oppositionReport = new OppositionReport(createGradingReportTemplate(projectType), opposition); return save(oppositionReport); } private GradingReportTemplate createGradingReportTemplate(ProjectType projectType) { - GradingReportTemplate template = new GradingReportTemplate( - projectType, - LocalDate.of(2024, Month.JANUARY, 1) - ); + GradingReportTemplate template = new GradingReportTemplate(projectType, LocalDate.of(2024, Month.JANUARY, 1)); return save(template); } @@ -461,11 +409,7 @@ public class FinalSeminarServiceImplIntegrationTest extends IntegrationTest { } private User createUser() { - User studentUser = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User studentUser = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); studentUser = save(studentUser); return studentUser; } diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplTest.java index aab57a5880..8e14741410 100755 --- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplTest.java @@ -116,10 +116,7 @@ public class FinalSeminarServiceImplTest { when(finalSeminarSettingsService.getInstance()).thenReturn(finalSeminarSettings); when( - daysService.workDaysAhead( - finalSeminar.getStartDate(), - finalSeminarSettings.getDaysAheadToUploadThesis() - ) + daysService.workDaysAhead(finalSeminar.getStartDate(), finalSeminarSettings.getDaysAheadToUploadThesis()) ).thenReturn(date); assertTrue(seminarService.hasDeadlinePassed(finalSeminar)); @@ -175,9 +172,7 @@ public class FinalSeminarServiceImplTest { verify(oppositionReportService).deleteOppositionReport(isA(FinalSeminarOpposition.class)); verify(finalSeminarOppositionRepository).delete(isA(Long.class)); - ArgumentCaptor<FinalSeminarDeletedEvent> captor = ArgumentCaptor.forClass( - FinalSeminarDeletedEvent.class - ); + ArgumentCaptor<FinalSeminarDeletedEvent> captor = ArgumentCaptor.forClass(FinalSeminarDeletedEvent.class); verify(eventBus).post(captor.capture()); FinalSeminarDeletedEvent event = captor.getValue(); diff --git a/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java index 00e50d9037..433ee9c53a 100644 --- a/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java @@ -46,19 +46,9 @@ public class FinalThesisServiceImplTest extends IntegrationTest { public void setUp() throws Exception { ProjectType bachelor = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() - ); - uploader = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); + uploader = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); project = save( Project.builder() .title("Some title") @@ -143,15 +133,8 @@ public class FinalThesisServiceImplTest extends IntegrationTest { @Test public void removes_plagiarism_analysis_when_rejecting_thesis() { - InputStream data = - FinalThesisServiceImplTest.class.getResourceAsStream("/text_matching_analysis.txt"); - StreamingUpload fileUpload = new StreamingUpload( - "plagiarism_analysis.txt", - "text/plain", - uploader, - 24, - data - ); + InputStream data = FinalThesisServiceImplTest.class.getResourceAsStream("/text_matching_analysis.txt"); + StreamingUpload fileUpload = new StreamingUpload("plagiarism_analysis.txt", "text/plain", uploader, 24, data); FileReference fileReference = fileService.storeFile(fileUpload); FinalThesis finalThesis = uploadThesis(); @@ -195,10 +178,7 @@ public class FinalThesisServiceImplTest extends IntegrationTest { saveThesis(FinalThesis.Status.APPROVED); saveThesis(FinalThesis.Status.REJECTED); - Iterable<FinalThesis> result = finalThesisService.findAll( - approvedFilter(), - new PageRequest(0, 5) - ); + Iterable<FinalThesis> result = finalThesisService.findAll(approvedFilter(), new PageRequest(0, 5)); assertThat(result, everyItem(hasStatus(FinalThesis.Status.APPROVED))); } diff --git a/core/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorkerTest.java b/core/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorkerTest.java index 81cf3161c3..a99d60caf8 100644 --- a/core/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorkerTest.java +++ b/core/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorkerTest.java @@ -82,11 +82,7 @@ public class FirstMeetingReminderWorkerTest { Idea idea = newIdea(LocalDate.now()); - MailEvent reminder = worker.generateReminder( - "test-baseURL", - idea.getMatch().getSupervisor(), - List.of(idea) - ); + MailEvent reminder = worker.generateReminder("test-baseURL", idea.getMatch().getSupervisor(), List.of(idea)); assertThat(reminder.getMessageBody(), containsString(idea.getTitle())); } @@ -104,11 +100,7 @@ public class FirstMeetingReminderWorkerTest { } private User newUser() { - User user = User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build(); + User user = User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build(); user.setId(234L); return user; } diff --git a/core/src/test/java/se/su/dsv/scipro/forum/BasicForumServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/forum/BasicForumServiceImplTest.java index ecc7e4999e..de6288d6f4 100644 --- a/core/src/test/java/se/su/dsv/scipro/forum/BasicForumServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/forum/BasicForumServiceImplTest.java @@ -52,12 +52,8 @@ public class BasicForumServiceImplTest { @Test public void testMarkRead() { - when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn( - new ForumPostReadState() - ); - when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); + when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn(new ForumPostReadState()); + when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); User user = new User(); ForumPost post = new ForumPost(); @@ -66,9 +62,7 @@ public class BasicForumServiceImplTest { assertTrue(read, "Did not return proper read state"); - ArgumentCaptor<ForumPostReadState> captor = ArgumentCaptor.forClass( - ForumPostReadState.class - ); + ArgumentCaptor<ForumPostReadState> captor = ArgumentCaptor.forClass(ForumPostReadState.class); verify(readStateRepository, times(1)).save(captor.capture()); assertTrue(captor.getValue().isRead(), "Did not save correct read state"); @@ -76,12 +70,8 @@ public class BasicForumServiceImplTest { @Test public void testMarkUnread() { - when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn( - new ForumPostReadState() - ); - when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); + when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn(new ForumPostReadState()); + when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); // when User user = new User(); @@ -93,9 +83,7 @@ public class BasicForumServiceImplTest { // then assertFalse(read, "Did not return proper read state"); - ArgumentCaptor<ForumPostReadState> captor = ArgumentCaptor.forClass( - ForumPostReadState.class - ); + ArgumentCaptor<ForumPostReadState> captor = ArgumentCaptor.forClass(ForumPostReadState.class); verify(readStateRepository, times(1)).save(captor.capture()); assertFalse(captor.getValue().isRead(), "Did not save correct read state"); @@ -121,10 +109,7 @@ public class BasicForumServiceImplTest { @Test public void testIsThreadRead() { User goodUser = new UserBuilder().setFirstName("Reads").setLastName("Forum").create(); - User badUser = new UserBuilder() - .setFirstName("Does not read") - .setLastName("Forum") - .create(); + User badUser = new UserBuilder().setFirstName("Does not read").setLastName("Forum").create(); ForumPost post = new ForumPost(); ForumPostReadState readState = new ForumPostReadState(goodUser, post); @@ -148,9 +133,7 @@ public class BasicForumServiceImplTest { @Test public void create_forum_thread() { - when(threadRepository.save(any(ForumThread.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); + when(threadRepository.save(any(ForumThread.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); final String subject = "Subject"; ForumThread thread = basicForumService.createThread(subject); @@ -160,33 +143,16 @@ public class BasicForumServiceImplTest { @Test public void reply_to_thread() { - when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn( - new ForumPostReadState() - ); - when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); - when(threadRepository.save(any(ForumThread.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); - when(postRepository.save(any(ForumPost.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); + when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn(new ForumPostReadState()); + when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); + when(threadRepository.save(any(ForumThread.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); + when(postRepository.save(any(ForumPost.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); final ForumThread forumThread = new ForumThread(); - final User poster = User.builder() - .firstName("Bob") - .lastName("Example") - .emailAddress("bob@example.com") - .build(); + final User poster = User.builder().firstName("Bob").lastName("Example").emailAddress("bob@example.com").build(); final String content = "content"; - ForumPost forumPost = basicForumService.createReply( - forumThread, - poster, - content, - Collections.emptySet() - ); + ForumPost forumPost = basicForumService.createReply(forumThread, poster, content, Collections.emptySet()); assertThat(forumPost.getContent(), is(content)); assertThat(forumPost.getPostedBy(), is(poster)); @@ -195,12 +161,8 @@ public class BasicForumServiceImplTest { @Test public void mark_post_read_posts_event() { - when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn( - new ForumPostReadState() - ); - when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); + when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn(new ForumPostReadState()); + when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); final ForumPost post = new ForumPost(); post.setId(235235L); @@ -209,9 +171,7 @@ public class BasicForumServiceImplTest { basicForumService.setRead(user, post, true); - ArgumentCaptor<ForumPostReadEvent> captor = ArgumentCaptor.forClass( - ForumPostReadEvent.class - ); + ArgumentCaptor<ForumPostReadEvent> captor = ArgumentCaptor.forClass(ForumPostReadEvent.class); verify(eventBus).post(captor.capture()); ForumPostReadEvent event = captor.getValue(); @@ -221,12 +181,8 @@ public class BasicForumServiceImplTest { @Test public void mark_post_unread_does_not_post_read_event() { - when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn( - new ForumPostReadState() - ); - when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer( - AdditionalAnswers.returnsFirstArg() - ); + when(readStateRepository.find(any(User.class), any(ForumPost.class))).thenReturn(new ForumPostReadState()); + when(readStateRepository.save(isA(ForumPostReadState.class))).thenAnswer(AdditionalAnswers.returnsFirstArg()); final ForumPost post = new ForumPost(); post.setId(235235L); diff --git a/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java b/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java index a9126749f1..b6b7f62d05 100644 --- a/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java +++ b/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java @@ -23,13 +23,7 @@ public class GroupForumServiceTest extends ForumModuleTest { @BeforeEach public void setUp() throws Exception { - groupOwner = save( - User.builder() - .firstName("Bob") - .lastName("Example") - .emailAddress("bob@example.com") - .build() - ); + groupOwner = save(User.builder().firstName("Bob").lastName("Example").emailAddress("bob@example.com").build()); save(groupOwner); final Group group = new Group(); group.setUser(groupOwner); @@ -66,12 +60,7 @@ public class GroupForumServiceTest extends ForumModuleTest { ); final String content = "Content"; - final ForumPost reply = groupForumService.createReply( - groupThread, - groupOwner, - content, - Collections.emptySet() - ); + final ForumPost reply = groupForumService.createReply(groupThread, groupOwner, content, Collections.emptySet()); assertThat(reply.getForumThread(), is(groupThread.getForumThread())); assertThat(reply.getContent(), is(content)); diff --git a/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java index 88b68763e5..3f6a99dba8 100644 --- a/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java @@ -35,19 +35,11 @@ public class ProjectForumServiceImplTest extends ForumModuleTest { @BeforeEach public void setUp() throws Exception { - ProjectType projectType = new ProjectType( - DegreeType.BACHELOR, - "Some project type", - "Some description" - ); + ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description"); projectType.addModule(ProjectModule.FORUM); save(projectType); supervisor = save( - User.builder() - .firstName("Bob") - .lastName("The Builder") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("The Builder").emailAddress("bob@example.com").build() ); project = Project.builder() .title("Some title") @@ -56,23 +48,13 @@ public class ProjectForumServiceImplTest extends ForumModuleTest { .headSupervisor(supervisor) .build(); save(project); - author = User.builder() - .firstName("Stina") - .lastName("Student") - .emailAddress("stina@example.com") - .build(); + author = User.builder().firstName("Stina").lastName("Student").emailAddress("stina@example.com").build(); save(author); } @Test public void testLoadThread() { - final ProjectThread thread = service.createThread( - project, - author, - "subject", - "content", - Set.of() - ); + final ProjectThread thread = service.createThread(project, author, "subject", "content", Set.of()); ProjectThread serviceThread = service.findOne(thread.getId()); assertEquals(thread, serviceThread); @@ -97,13 +79,7 @@ public class ProjectForumServiceImplTest extends ForumModuleTest { @Test public void testGetPostPageByForumThread() { - final ProjectThread thread = service.createThread( - project, - author, - "subject", - "content", - Set.of() - ); + final ProjectThread thread = service.createThread(project, author, "subject", "content", Set.of()); final ForumPost reply = service.createReply(thread, author, "reply", Set.of()); List<ForumPost> servicePage = service.getPosts(thread); @@ -114,20 +90,8 @@ public class ProjectForumServiceImplTest extends ForumModuleTest { @Test public void testGetThreadsByProject() { - final ProjectThread thread1 = service.createThread( - project, - author, - "subject 1", - "content", - Set.of() - ); - final ProjectThread thread2 = service.createThread( - project, - author, - "subject 2", - "content", - Set.of() - ); + final ProjectThread thread1 = service.createThread(project, author, "subject 1", "content", Set.of()); + final ProjectThread thread2 = service.createThread(project, author, "subject 2", "content", Set.of()); List<ProjectThread> serviceThreads = service.getThreads(project); @@ -138,13 +102,7 @@ public class ProjectForumServiceImplTest extends ForumModuleTest { @Test public void supervisor_has_unread_forum_threads_after_student_replies() { - final ProjectThread thread = service.createThread( - project, - supervisor, - "subject", - "content", - Set.of() - ); + final ProjectThread thread = service.createThread(project, supervisor, "subject", "content", Set.of()); service.createReply(thread, author, "reply", Set.of()); boolean hasUnreadThreads = service.hasUnreadThreads(project, supervisor); @@ -162,11 +120,7 @@ public class ProjectForumServiceImplTest extends ForumModuleTest { ) { assertEquals(project, thread.getProject(), "Thread created for the wrong project"); assertEquals(user, thread.getForumThread().getCreatedBy(), "Thread created by wrong user"); - assertEquals( - subject, - thread.getForumThread().getSubject(), - "Thread created with wrong subject" - ); + assertEquals(subject, thread.getForumThread().getSubject(), "Thread created with wrong subject"); assertEquals(1, thread.getForumThread().getPostCount(), "Thread does not contain one post"); ForumPost post = thread.getForumThread().getPosts().get(0); assertEquals(content, post.getContent(), "Post does not contain content"); diff --git a/core/src/test/java/se/su/dsv/scipro/forum/notifications/ForumNotificationsTest.java b/core/src/test/java/se/su/dsv/scipro/forum/notifications/ForumNotificationsTest.java index 6baac79403..1cd5ca3d62 100644 --- a/core/src/test/java/se/su/dsv/scipro/forum/notifications/ForumNotificationsTest.java +++ b/core/src/test/java/se/su/dsv/scipro/forum/notifications/ForumNotificationsTest.java @@ -72,10 +72,7 @@ public class ForumNotificationsTest { ProjectThread projectThread = new ProjectThread(); projectThread.setForumThread(forumThread); - NewProjectForumReplyEvent forumReplyEvent = new NewProjectForumReplyEvent( - projectThread, - firstReply - ); + NewProjectForumReplyEvent forumReplyEvent = new NewProjectForumReplyEvent(projectThread, firstReply); forumNotifications.newProjectForumPost(forumReplyEvent); verify(notificationController).notifyProjectForum( @@ -92,10 +89,7 @@ public class ForumNotificationsTest { groupThread.setForumThread(forumThread); forumThread.addPost(secondReply); - NewGroupForumReplyEvent forumReplyEvent = new NewGroupForumReplyEvent( - groupThread, - secondReply - ); + NewGroupForumReplyEvent forumReplyEvent = new NewGroupForumReplyEvent(groupThread, secondReply); forumNotifications.newGroupForumPost(forumReplyEvent); verify(notificationController).notifyGroup( @@ -124,10 +118,7 @@ public class ForumNotificationsTest { ProjectThread projectThread = new ProjectThread(); projectThread.setForumThread(forumThread); - NewProjectForumReplyEvent forumReplyEvent = new NewProjectForumReplyEvent( - projectThread, - firstReply - ); + NewProjectForumReplyEvent forumReplyEvent = new NewProjectForumReplyEvent(projectThread, firstReply); forumNotifications.newProjectForumPost(forumReplyEvent); ArgumentCaptor<ForumNotification> captor = ArgumentCaptor.forClass(ForumNotification.class); diff --git a/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java index 3e9d35ee0d..31114269b9 100644 --- a/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java @@ -38,11 +38,7 @@ public class GroupServiceImplTest extends IntegrationTest { cosupervisor = saveUser("cosupervisor", "test", "reviewer@example.com"); projectType = save(new ProjectType(DegreeType.BACHELOR, "b", "b")); User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); Project project = save( Project.builder() @@ -122,11 +118,7 @@ public class GroupServiceImplTest extends IntegrationTest { another.setTitle("hi"); another.setUser(creator); User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); Project anotherProject = save( Project.builder() @@ -156,12 +148,6 @@ public class GroupServiceImplTest extends IntegrationTest { } private User saveUser(String firstName, String lastName, String emailAddress) { - return save( - User.builder() - .firstName(firstName) - .lastName(lastName) - .emailAddress(emailAddress) - .build() - ); + return save(User.builder().firstName(firstName).lastName(lastName).emailAddress(emailAddress).build()); } } diff --git a/core/src/test/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandlerTest.java b/core/src/test/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandlerTest.java index a6bb1e45a3..cd942ed014 100644 --- a/core/src/test/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandlerTest.java +++ b/core/src/test/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandlerTest.java @@ -40,13 +40,9 @@ public class FinalSeminarActivityHandlerTest { FinalSeminar finalSeminar = new FinalSeminar(); finalSeminar.setProject(new Project()); finalSeminar.setStartDate(new Date()); - FinalSeminarCreatedEvent finalSeminarCreatedEvent = new FinalSeminarCreatedEvent( - finalSeminar - ); + FinalSeminarCreatedEvent finalSeminarCreatedEvent = new FinalSeminarCreatedEvent(finalSeminar); - when(activityFinalSeminarRepository.findByFinalSeminar(finalSeminar)).thenReturn( - Optional.empty() - ); + when(activityFinalSeminarRepository.findByFinalSeminar(finalSeminar)).thenReturn(Optional.empty()); finalSeminarActivityHandler.finalSeminarCreated(finalSeminarCreatedEvent); @@ -58,9 +54,7 @@ public class FinalSeminarActivityHandlerTest { public void on_delete() { FinalSeminar finalSeminar = new FinalSeminar(); finalSeminar.setProject(new Project()); - FinalSeminarDeletedEvent finalSeminarDeletedEvent = new FinalSeminarDeletedEvent( - finalSeminar - ); + FinalSeminarDeletedEvent finalSeminarDeletedEvent = new FinalSeminarDeletedEvent(finalSeminar); mockExistingActivity(finalSeminar); @@ -74,9 +68,7 @@ public class FinalSeminarActivityHandlerTest { public void on_cancel() { FinalSeminar finalSeminar = new FinalSeminar(); finalSeminar.setProject(new Project()); - FinalSeminarCancelledEvent finalSeminarCancelledEvent = new FinalSeminarCancelledEvent( - finalSeminar - ); + FinalSeminarCancelledEvent finalSeminarCancelledEvent = new FinalSeminarCancelledEvent(finalSeminar); mockExistingActivity(finalSeminar); @@ -88,10 +80,7 @@ public class FinalSeminarActivityHandlerTest { private void mockExistingActivity(final FinalSeminar finalSeminar) { Activity activity = new Activity(); - ActivityFinalSeminar finalSeminarActivity = new ActivityFinalSeminar( - activity, - finalSeminar - ); + ActivityFinalSeminar finalSeminarActivity = new ActivityFinalSeminar(activity, finalSeminar); when(activityFinalSeminarRepository.findByFinalSeminar(finalSeminar)).thenReturn( Optional.of(finalSeminarActivity) ); diff --git a/core/src/test/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForumTest.java b/core/src/test/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForumTest.java index 3efc58f5ce..effc0f54cd 100644 --- a/core/src/test/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForumTest.java +++ b/core/src/test/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForumTest.java @@ -75,13 +75,7 @@ public class PostActivityUploadToForumTest { public void when_uploading_additional_files_should_not_create_new_thread() { isAdditionalUpload(); fireEvent(); - verify(projectForumService, never()).createThread( - any(Project.class), - any(), - anyString(), - any(), - anySet() - ); + verify(projectForumService, never()).createThread(any(Project.class), any(), anyString(), any(), anySet()); } @Test @@ -108,12 +102,7 @@ public class PostActivityUploadToForumTest { public void should_post_the_file_as_reply_to_the_thread() { isAdditionalUpload(); fireEvent(); - verify(projectForumService).createReply( - thread, - uploader, - activity.getDescription(), - attachments - ); + verify(projectForumService).createReply(thread, uploader, activity.getDescription(), attachments); } private void isAdditionalUpload() { @@ -125,8 +114,6 @@ public class PostActivityUploadToForumTest { } private void fireEvent() { - integration.postActivityUploadToForum( - new ActivityFileUploadedEvent(activity, fileDescription) - ); + integration.postActivityUploadToForum(new ActivityFileUploadedEvent(activity, fileDescription)); } } diff --git a/core/src/test/java/se/su/dsv/scipro/mail/FailureTest.java b/core/src/test/java/se/su/dsv/scipro/mail/FailureTest.java index aed741f789..12dc1415b2 100644 --- a/core/src/test/java/se/su/dsv/scipro/mail/FailureTest.java +++ b/core/src/test/java/se/su/dsv/scipro/mail/FailureTest.java @@ -61,17 +61,13 @@ public class FailureTest { @Test public void logs_non_delivered_mails() { failure.log(logger); - verify(logger).warn( - "Could not deliver to: " + Arrays.toString(exception.getValidUnsentAddresses()) - ); + verify(logger).warn("Could not deliver to: " + Arrays.toString(exception.getValidUnsentAddresses())); } @Test public void logs_invalid_emails() { failure.log(logger); - verify(logger).error( - "Invalid email found: " + Arrays.toString(exception.getInvalidAddresses()) - ); + verify(logger).error("Invalid email found: " + Arrays.toString(exception.getInvalidAddresses())); } @Test diff --git a/core/src/test/java/se/su/dsv/scipro/mail/MailEventWorkerTest.java b/core/src/test/java/se/su/dsv/scipro/mail/MailEventWorkerTest.java index ff2bf32893..638cda54c3 100644 --- a/core/src/test/java/se/su/dsv/scipro/mail/MailEventWorkerTest.java +++ b/core/src/test/java/se/su/dsv/scipro/mail/MailEventWorkerTest.java @@ -34,23 +34,14 @@ public class MailEventWorkerTest { systemSettings = new GeneralSystemSettings(); systemSettings.setMailNotifications(true); worker = new TestMailEventWorker(); - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - systemSettings - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(systemSettings); } @Test public void callSendMailUsersOnly() throws Exception { setUpMailEventWithUsersOnly(); worker.doWork(); - verify(mailer).mail( - eq(FROM_NAME), - eq(FROM_EMAIL), - eq(RECIPIENTS_MAILS), - eq(SUBJECT), - eq(MESSAGE_BODY), - any() - ); + verify(mailer).mail(eq(FROM_NAME), eq(FROM_EMAIL), eq(RECIPIENTS_MAILS), eq(SUBJECT), eq(MESSAGE_BODY), any()); } @Test @@ -142,16 +133,9 @@ public class MailEventWorkerTest { } private void mockMailResult(final MailResult result) throws MessagingException { - when( - mailer.mail( - anyString(), - anyString(), - any(String[].class), - anyString(), - anyString(), - any() - ) - ).thenReturn(result); + when(mailer.mail(anyString(), anyString(), any(String[].class), anyString(), anyString(), any())).thenReturn( + result + ); } private void setUpMailEventWithUsersAndNonUser() throws Exception { @@ -175,10 +159,7 @@ public class MailEventWorkerTest { } private void setUpTwoMailEvents() throws Exception { - mockMailEventService( - createMailEventUsersOnlyNoFromName(), - createMailEventUsersOnlyNoFromName() - ); + mockMailEventService(createMailEventUsersOnlyNoFromName(), createMailEventUsersOnlyNoFromName()); } private void mockMailEventService(final MailEvent... mailEvents) throws Exception { @@ -199,16 +180,7 @@ public class MailEventWorkerTest { ); MailResult successfulResult = createSuccessfulResult("123.abcdefg.987@mail.com"); lenient() - .when( - mailer.mail( - anyString(), - anyString(), - any(String[].class), - anyString(), - anyString(), - any() - ) - ) + .when(mailer.mail(anyString(), anyString(), any(String[].class), anyString(), anyString(), any())) .thenReturn(successfulResult); } diff --git a/core/src/test/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStartTest.java b/core/src/test/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStartTest.java index 339370805c..dd547c0e26 100644 --- a/core/src/test/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStartTest.java +++ b/core/src/test/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStartTest.java @@ -49,11 +49,7 @@ public class AddActivityPlanOnProjectStartTest { handler.projectStarted(tuple._2()); - verify(activityPlanFacade).addActivitiesFromTemplate( - eq(tuple._1()), - eq(template), - any(Date.class) - ); + verify(activityPlanFacade).addActivitiesFromTemplate(eq(tuple._1()), eq(template), any(Date.class)); } @Test @@ -62,11 +58,7 @@ public class AddActivityPlanOnProjectStartTest { handler.projectStarted(tuple._2()); - verify(activityPlanFacade, never()).addActivitiesFromTemplate( - eq(tuple._1()), - eq(template), - any(Date.class) - ); + verify(activityPlanFacade, never()).addActivitiesFromTemplate(eq(tuple._1()), eq(template), any(Date.class)); } @Test @@ -82,9 +74,7 @@ public class AddActivityPlanOnProjectStartTest { ); } - private Tuple2<Project, ProjectStartedEvent> prepareEventWithoutTemplate( - final ProjectType projectType - ) { + private Tuple2<Project, ProjectStartedEvent> prepareEventWithoutTemplate(final ProjectType projectType) { return prepareEvent(projectType, null); } @@ -96,14 +86,12 @@ public class AddActivityPlanOnProjectStartTest { final ProjectType projectType, final ActivityPlanTemplate activityPlanTemplate ) { - Project project = Project.builder() - .title("Title") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + Project project = Project.builder().title("Title").projectType(projectType).startDate(LocalDate.now()).build(); ApplicationPeriod applicationPeriod = new ApplicationPeriod(); - ApplicationPeriodProjectType applicationPeriodProjectType = - new ApplicationPeriodProjectType(applicationPeriod, projectType); + ApplicationPeriodProjectType applicationPeriodProjectType = new ApplicationPeriodProjectType( + applicationPeriod, + projectType + ); applicationPeriodProjectType.setActivityPlanTemplate(activityPlanTemplate); applicationPeriod.getApplicationPeriodProjectTypes().add(applicationPeriodProjectType); Idea idea = new Idea(); diff --git a/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java index a4b7ff5dbf..d825183b5b 100644 --- a/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java @@ -26,13 +26,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { @BeforeEach public void setUp() throws Exception { projectType = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); - student = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + student = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); } @Test @@ -59,10 +53,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { assertTrue(actualList.contains(new OpenPeriod(current, Collections.emptyList()))); assertTrue( actualList.contains( - new ExemptedPeriod( - exempted, - List.of(ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA) - ) + new ExemptedPeriod(exempted, List.of(ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA)) ) ); } @@ -94,10 +85,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { public void getPreviousPeriodByProjectTypeSecondPeriodIsPrevious() { ApplicationPeriod applicationPeriod2 = createPeriod(-10, -8, projectType); - assertEquals( - applicationPeriod2, - applicationPeriodService.getPreviousPeriodByProjectType(projectType) - ); + assertEquals(applicationPeriod2, applicationPeriodService.getPreviousPeriodByProjectType(projectType)); } @Test @@ -157,32 +145,18 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { public void hasNoOpenExemptions() { ApplicationPeriod applicationPeriod = createPeriod(-1, 1); - assertFalse( - applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption( - applicationPeriod, - student - ) - ); + assertFalse(applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption(applicationPeriod, student)); } @Test public void hasExemptionButStudentHasNoExemption() { ApplicationPeriod applicationPeriod = createPeriod(-10, -5); final User newStudent = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); createExemption(newStudent, applicationPeriod, LocalDate.now()); - assertFalse( - applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption( - applicationPeriod, - student - ) - ); + assertFalse(applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption(applicationPeriod, student)); } @Test @@ -190,12 +164,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { ApplicationPeriod applicationPeriod = createPeriod(-1, 1); createExemption(student, applicationPeriod, LocalDate.now().minusDays(1)); - assertFalse( - applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption( - applicationPeriod, - student - ) - ); + assertFalse(applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption(applicationPeriod, student)); } @Test @@ -208,12 +177,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { ApplicationPeriodExemption.Type.SELECT_SUPERVISOR_IDEA ); - assertTrue( - applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption( - applicationPeriod, - student - ) - ); + assertTrue(applicationPeriodService.hasCurrentSelectSupervisorIdeaExemption(applicationPeriod, student)); } @Test @@ -242,10 +206,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { createPeriod(-2, -1, projectType); createPeriod(-4, -3, projectType); ApplicationPeriod applicationPeriod = createPeriod(0, 5, projectType); - assertEquals( - size, - applicationPeriodService.getPreviousPeriods(applicationPeriod, size).size() - ); + assertEquals(size, applicationPeriodService.getPreviousPeriods(applicationPeriod, size).size()); } @Test @@ -271,11 +232,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { @Test public void does_not_overlap_different_project_types() { createPeriod(0, 3, projectType); - ApplicationPeriod newPeriod = createPeriod( - 0, - 3, - save(new ProjectType(DegreeType.MASTER, "master", "master")) - ); + ApplicationPeriod newPeriod = createPeriod(0, 3, save(new ProjectType(DegreeType.MASTER, "master", "master"))); assertFalse(applicationPeriodService.doesPeriodOverlap(newPeriod)); } @@ -289,26 +246,18 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { @Test public void exemption_without_date() { final ApplicationPeriod applicationPeriod = createPeriod(-5, -1); - createExemptionForExemptionType( - student, - applicationPeriod, - null, - ApplicationPeriodExemption.Type.PROJECT_TYPE - ); + createExemptionForExemptionType(student, applicationPeriod, null, ApplicationPeriodExemption.Type.PROJECT_TYPE); createExemptionForExemptionType( student, applicationPeriod, LocalDate.now().plusDays(1), ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA ); - final List<StudentPeriod> currentStudentPeriods = - applicationPeriodService.getCurrentStudentPeriods(student); + final List<StudentPeriod> currentStudentPeriods = applicationPeriodService.getCurrentStudentPeriods(student); final StudentPeriod studentPeriod = currentStudentPeriods.get(0); assertTrue(studentPeriod instanceof ExemptedPeriod); final ExemptedPeriod exemptedPeriod = (ExemptedPeriod) studentPeriod; - assertTrue( - exemptedPeriod.exemptions().contains(ApplicationPeriodExemption.Type.PROJECT_TYPE) - ); + assertTrue(exemptedPeriod.exemptions().contains(ApplicationPeriodExemption.Type.PROJECT_TYPE)); } @Test @@ -320,12 +269,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { student.setDegreeType(DegreeType.BACHELOR); save(student); - createExemptionForExemptionType( - student, - applicationPeriod, - null, - ApplicationPeriodExemption.Type.PROJECT_TYPE - ); + createExemptionForExemptionType(student, applicationPeriod, null, ApplicationPeriodExemption.Type.PROJECT_TYPE); final List<ProjectType> typesForStudent = applicationPeriodService.getTypesForStudent( applicationPeriod, student @@ -351,11 +295,7 @@ public class ApplicationPeriodServiceImplTest extends IntegrationTest { createExemption(student, period, LocalDate.now().plusDays(1)); } - private void createExemption( - User student, - ApplicationPeriod applicationPeriod, - LocalDate newDate - ) { + private void createExemption(User student, ApplicationPeriod applicationPeriod, LocalDate newDate) { createExemptionForExemptionType( student, applicationPeriod, diff --git a/core/src/test/java/se/su/dsv/scipro/match/IdeaFacadeTest.java b/core/src/test/java/se/su/dsv/scipro/match/IdeaFacadeTest.java index 814bb3e247..c3ea46732f 100644 --- a/core/src/test/java/se/su/dsv/scipro/match/IdeaFacadeTest.java +++ b/core/src/test/java/se/su/dsv/scipro/match/IdeaFacadeTest.java @@ -63,18 +63,11 @@ public class IdeaFacadeTest { when(ideaService.findAll(params)).thenReturn(ideas); when( - targetService.hasTargetsLeft( - applicationPeriod, - idea.getMatch().getSupervisor(), - idea.getProjectType() - ) + targetService.hasTargetsLeft(applicationPeriod, idea.getMatch().getSupervisor(), idea.getProjectType()) ).thenReturn(true); when(ideaService.findAllInList(ideas, pageRequest)).thenReturn(ideas); - assertEquals( - ideas, - ideaFacade.findIdeasPossibleToMatch(applicationPeriod, user, params, pageRequest) - ); + assertEquals(ideas, ideaFacade.findIdeasPossibleToMatch(applicationPeriod, user, params, pageRequest)); } @Test @@ -83,16 +76,9 @@ public class IdeaFacadeTest { when(ideaService.findAll(params)).thenReturn(ideas); when( - targetService.hasTargetsLeft( - applicationPeriod, - idea.getMatch().getSupervisor(), - idea.getProjectType() - ) + targetService.hasTargetsLeft(applicationPeriod, idea.getMatch().getSupervisor(), idea.getProjectType()) ).thenReturn(true); - assertEquals( - expectedInt, - ideaFacade.countIdeasPossibleToMatch(applicationPeriod, user, params) - ); + assertEquals(expectedInt, ideaFacade.countIdeasPossibleToMatch(applicationPeriod, user, params)); } } diff --git a/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java index 48c5c2fa54..57b8cca178 100644 --- a/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java @@ -181,11 +181,7 @@ public class IdeaServiceImplIntegrationTest extends IntegrationTest { } private User createUser() { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); return save(user); } diff --git a/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplTest.java index b5efd9b6f1..6365ba546a 100755 --- a/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplTest.java @@ -105,14 +105,7 @@ public class IdeaServiceImplTest { idea.setProjectType(master); // when - ideaService.saveStudentIdea( - idea, - creator, - null, - Collections.singleton(coAuthor), - new ArrayList<>(), - true - ); + ideaService.saveStudentIdea(idea, creator, null, Collections.singleton(coAuthor), new ArrayList<>(), true); // then Mockito.verify(notificationController).notifyIdea( @@ -137,14 +130,7 @@ public class IdeaServiceImplTest { idea.addIdeaParticipation(coParticipation); // when - ideaService.saveStudentIdea( - idea, - creator, - null, - Collections.singleton(coAuthor), - new ArrayList<>(), - false - ); + ideaService.saveStudentIdea(idea, creator, null, Collections.singleton(coAuthor), new ArrayList<>(), false); // then Mockito.verify(notificationController, Mockito.times(0)).notifyIdea( @@ -165,14 +151,7 @@ public class IdeaServiceImplTest { idea.addIdeaParticipation(participation); // when - ideaService.saveStudentIdea( - idea, - creator, - null, - Collections.singleton(coAuthor), - new ArrayList<>(), - false - ); + ideaService.saveStudentIdea(idea, creator, null, Collections.singleton(coAuthor), new ArrayList<>(), false); // then Mockito.verify(notificationController).notifyIdea( @@ -200,10 +179,7 @@ public class IdeaServiceImplTest { public void validateSupervisorAcceptance() { Idea idea = createBachelorIdea(Idea.Status.UNMATCHED); whenSupervisorHasTargetsLeft(idea); - final Either<SelectionError, Idea> either = ideaService.supervisorAcceptIdea( - idea, - supervisor - ); + final Either<SelectionError, Idea> either = ideaService.supervisorAcceptIdea(idea, supervisor); assertTrue(either.isRight()); assertTrue(either.right().hasSupervisor()); assertEquals(supervisor, either.right().getMatch().getSupervisor()); @@ -224,9 +200,7 @@ public class IdeaServiceImplTest { @Test public void validateStudentAcceptanceNoLongerAvailable() { - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); Idea idea = createBachelorIdea(Idea.Status.MATCHED); assertPair( @@ -238,14 +212,10 @@ public class IdeaServiceImplTest { @Test public void validateStudentAcceptanceNoPartner() { - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); Idea idea = createBachelorIdea(Idea.Status.UNMATCHED); - when(applicationPeriodService.hasIdeaSizeExemption(student, applicationPeriod)).thenReturn( - false - ); + when(applicationPeriodService.hasIdeaSizeExemption(student, applicationPeriod)).thenReturn(false); assertPair( false, @@ -256,9 +226,7 @@ public class IdeaServiceImplTest { @Test public void validateStudentAcceptanceSelfPartner() { - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); Idea idea = createBachelorIdea(Idea.Status.UNMATCHED); assertPair( @@ -270,13 +238,9 @@ public class IdeaServiceImplTest { @Test public void validateStudentAcceptance() { - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); Idea idea = createBachelorIdea(Idea.Status.UNMATCHED); - when(applicationPeriodService.getTypesForStudent(applicationPeriod, student)).thenReturn( - List.of(bachelor) - ); + when(applicationPeriodService.getTypesForStudent(applicationPeriod, student)).thenReturn(List.of(bachelor)); Pair<Boolean, String> acceptance = ideaService.validateStudentAcceptance( idea, @@ -317,9 +281,7 @@ public class IdeaServiceImplTest { ProjectType projectType = master; idea.setProjectType(projectType); - when(applicationPeriodService.getCurrentPeriod(eq(projectType))).thenReturn( - new ApplicationPeriod() - ); + when(applicationPeriodService.getCurrentPeriod(eq(projectType))).thenReturn(new ApplicationPeriod()); TreeSet<User> authors = new TreeSet<>(new User.ByNameComparator()); authors.addAll(Collections.singletonList(student)); @@ -332,12 +294,7 @@ public class IdeaServiceImplTest { assertEquals( idea, - ideaService.saveSupervisorIdea( - idea, - supervisor, - Collections.singletonList(new Keyword()), - true - ) + ideaService.saveSupervisorIdea(idea, supervisor, Collections.singletonList(new Keyword()), true) ); } @@ -350,12 +307,7 @@ public class IdeaServiceImplTest { assertEquals( idea, - ideaService.saveSupervisorIdea( - idea, - supervisor, - Collections.singletonList(new Keyword()), - false - ) + ideaService.saveSupervisorIdea(idea, supervisor, Collections.singletonList(new Keyword()), false) ); } @@ -364,10 +316,7 @@ public class IdeaServiceImplTest { Idea idea = new Idea(); idea.setMatch(new Match()); - assertEquals( - idea, - ideaService.acceptIdea(idea, student, null, coAuthor, applicationPeriod) - ); + assertEquals(idea, ideaService.acceptIdea(idea, student, null, coAuthor, applicationPeriod)); Mockito.verify(notificationController).notifyIdea( eq(idea), eq(IdeaEvent.Event.PARTNER_ACCEPT), @@ -408,9 +357,7 @@ public class IdeaServiceImplTest { @Test public void bachelor_idea_must_have_two_authors() { - when(applicationPeriodService.getCurrentPeriod(any(ProjectType.class))).thenReturn( - applicationPeriod - ); + when(applicationPeriodService.getCurrentPeriod(any(ProjectType.class))).thenReturn(applicationPeriod); SortedSet<User> authors = new TreeSet<>(new User.ByNameComparator()); authors.add(student); assertPair( @@ -422,9 +369,7 @@ public class IdeaServiceImplTest { @Test public void master_idea_cant_have_two_authors() { - when(applicationPeriodService.getCurrentPeriod(any(ProjectType.class))).thenReturn( - applicationPeriod - ); + when(applicationPeriodService.getCurrentPeriod(any(ProjectType.class))).thenReturn(applicationPeriod); SortedSet<User> authors = new TreeSet<>(new User.ByNameComparator()); authors.add(student); authors.add(coAuthor); @@ -437,12 +382,8 @@ public class IdeaServiceImplTest { @Test public void bachelor_idea_must_have_two_authors_unless_the_first_one_has_an_exemption() { - when(applicationPeriodService.getCurrentPeriod(any(ProjectType.class))).thenReturn( - applicationPeriod - ); - when(applicationPeriodService.hasIdeaSizeExemption(student, applicationPeriod)).thenReturn( - true - ); + when(applicationPeriodService.getCurrentPeriod(any(ProjectType.class))).thenReturn(applicationPeriod); + when(applicationPeriodService.hasIdeaSizeExemption(student, applicationPeriod)).thenReturn(true); SortedSet<User> authors = new TreeSet<>(new User.ByNameComparator()); authors.add(student); assertPair( @@ -457,10 +398,7 @@ public class IdeaServiceImplTest { Long expected = 0L; Filter params = new Filter(); params.setStatuses(new ArrayList<>()); - assertEquals( - expected, - ideaService.countAuthorsByApplicationPeriod(applicationPeriod, params) - ); + assertEquals(expected, ideaService.countAuthorsByApplicationPeriod(applicationPeriod, params)); } private Idea mockInactiveIdea() { @@ -497,41 +435,22 @@ public class IdeaServiceImplTest { } private void whenSupervisorHasTargetsLeft(final Idea idea) { - final Target target = new Target( - supervisor, - idea.getApplicationPeriod(), - idea.getProjectType() - ); + final Target target = new Target(supervisor, idea.getApplicationPeriod(), idea.getProjectType()); target.setTarget(1); - when( - targetRepository.getTarget( - supervisor, - idea.getApplicationPeriod(), - idea.getProjectType() - ) - ).thenReturn(target); + when(targetRepository.getTarget(supervisor, idea.getApplicationPeriod(), idea.getProjectType())).thenReturn( + target + ); } private void whenSupervisorHasNoTargetsLeft(final Idea idea) { - final Target target = new Target( - supervisor, - idea.getApplicationPeriod(), - idea.getProjectType() + final Target target = new Target(supervisor, idea.getApplicationPeriod(), idea.getProjectType()); + when(targetRepository.getTarget(supervisor, idea.getApplicationPeriod(), idea.getProjectType())).thenReturn( + target ); - when( - targetRepository.getTarget( - supervisor, - idea.getApplicationPeriod(), - idea.getProjectType() - ) - ).thenReturn(target); } private void assertValidateSupervisorAcceptanceFails(Idea idea, SelectionError error) { - final Either<SelectionError, Idea> either = ideaService.supervisorAcceptIdea( - idea, - supervisor - ); + final Either<SelectionError, Idea> either = ideaService.supervisorAcceptIdea(idea, supervisor); assertFalse(either.isRight()); assertEquals(error, either.left()); } diff --git a/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java b/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java index 161f8060b9..c443b0b709 100644 --- a/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java +++ b/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java @@ -80,14 +80,8 @@ public class MatchFollowUpServiceTest extends MatchModuleTest { public void find_unmet_targets() { giveTargetsTo(bob, bachelor, 2); - assertThat( - matchFollowUpService.findUnmetTargets(applicationPeriod, ALL), - hasItem(forSupervisor(bob)) - ); - assertThat( - matchFollowUpService.findUnmetTargets(applicationPeriod, ALL), - not(hasItem(forSupervisor(charles))) - ); + assertThat(matchFollowUpService.findUnmetTargets(applicationPeriod, ALL), hasItem(forSupervisor(bob))); + assertThat(matchFollowUpService.findUnmetTargets(applicationPeriod, ALL), not(hasItem(forSupervisor(charles)))); } private static Matcher<? super TargetResult> forSupervisor(final User supervisor) { @@ -104,11 +98,7 @@ public class MatchFollowUpServiceTest extends MatchModuleTest { }; } - private void submitIdeas( - final User supervisor, - final ProjectType projectType, - final int numberOfIdeas - ) { + private void submitIdeas(final User supervisor, final ProjectType projectType, final int numberOfIdeas) { for (int i = 0; i < numberOfIdeas; i++) { Idea idea = new Idea(); idea.setType(Idea.Type.SUPERVISOR); @@ -127,11 +117,7 @@ public class MatchFollowUpServiceTest extends MatchModuleTest { } } - private void giveTargetsTo( - final User supervisor, - final ProjectType projectType, - final int target - ) { + private void giveTargetsTo(final User supervisor, final ProjectType projectType, final int target) { Target targetEntity = new Target(supervisor, applicationPeriod, projectType); targetEntity.setTarget(target); save(targetEntity); diff --git a/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java index 62a27da8c8..d2715aab5d 100644 --- a/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java @@ -23,13 +23,7 @@ public class TargetServiceImplTest extends MatchModuleTest { @BeforeEach public void setUp() throws Exception { applicationPeriod = newApplicationPeriod(); - supervisor = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + supervisor = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); projectType = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); } @@ -55,20 +49,14 @@ public class TargetServiceImplTest extends MatchModuleTest { @Test public void ideasLeftToCreateToMeetTarget() { createTarget(3); - assertEquals( - 3, - targetService.ideasLeftToCreateToMeetTarget(applicationPeriod, supervisor, projectType) - ); + assertEquals(3, targetService.ideasLeftToCreateToMeetTarget(applicationPeriod, supervisor, projectType)); } @Test public void ideasLeftToCreateToMeetTargetNoIdeasLeft() { createTarget(2); createIdea(); - assertEquals( - 1, - targetService.ideasLeftToCreateToMeetTarget(applicationPeriod, supervisor, projectType) - ); + assertEquals(1, targetService.ideasLeftToCreateToMeetTarget(applicationPeriod, supervisor, projectType)); } @Test @@ -80,18 +68,13 @@ public class TargetServiceImplTest extends MatchModuleTest { @Test public void project_types_with_targets_left() { createTarget(0); - assertTrue( - targetService.projectTypesWithTargetsLeft(applicationPeriod, supervisor).isEmpty() - ); + assertTrue(targetService.projectTypesWithTargetsLeft(applicationPeriod, supervisor).isEmpty()); } @Test public void project_types_with_targets_left_2() { createTarget(1); - assertThat( - targetService.projectTypesWithTargetsLeft(applicationPeriod, supervisor), - hasItem(projectType) - ); + assertThat(targetService.projectTypesWithTargetsLeft(applicationPeriod, supervisor), hasItem(projectType)); } private void createIdea() { diff --git a/core/src/test/java/se/su/dsv/scipro/match/TestApplicationPeriod.java b/core/src/test/java/se/su/dsv/scipro/match/TestApplicationPeriod.java index d6dcdf5b03..4b42e30c12 100755 --- a/core/src/test/java/se/su/dsv/scipro/match/TestApplicationPeriod.java +++ b/core/src/test/java/se/su/dsv/scipro/match/TestApplicationPeriod.java @@ -14,11 +14,7 @@ public class TestApplicationPeriod { @BeforeEach public void startTransaction() { - ProjectType bachelor = new ProjectType( - ProjectType.BACHELOR, - "Bachelor", - "Bachelor degree thesis project" - ); + ProjectType bachelor = new ProjectType(ProjectType.BACHELOR, "Bachelor", "Bachelor degree thesis project"); Set<ProjectType> bachelorSet = new HashSet<>(); bachelorSet.add(bachelor); diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/MilestoneActivatorTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/MilestoneActivatorTest.java index 69dd906fcd..53f9ed6eb1 100644 --- a/core/src/test/java/se/su/dsv/scipro/milestones/service/MilestoneActivatorTest.java +++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/MilestoneActivatorTest.java @@ -61,11 +61,7 @@ public class MilestoneActivatorTest { @BeforeEach public void setUp() { - author = User.builder() - .firstName("Bob") - .lastName("Builder") - .emailAddress("bob@example.com") - .build(); + author = User.builder().firstName("Bob").lastName("Builder").emailAddress("bob@example.com").build(); author.setId(123L); ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); @@ -100,11 +96,7 @@ public class MilestoneActivatorTest { OppositionApprovedEvent event = new OppositionApprovedEvent(opposition); MilestoneActivityTemplate milestoneActivityTemplate = mockMilestoneForEvent(); milestoneActivator.oppositionApproved(event); - verifyIndividualMilestoneActivated( - event.getProject(), - event.getStudent(), - milestoneActivityTemplate - ); + verifyIndividualMilestoneActivated(event.getProject(), event.getStudent(), milestoneActivityTemplate); } @Test @@ -128,29 +120,18 @@ public class MilestoneActivatorTest { ParticipationApprovedEvent event = new ParticipationApprovedEvent(participation); MilestoneActivityTemplate milestoneActivityTemplate = mockMilestoneForEvent(); milestoneActivator.participationApproved(event); - verifyIndividualMilestoneActivated( - event.getProject(), - event.getStudent(), - milestoneActivityTemplate - ); + verifyIndividualMilestoneActivated(event.getProject(), event.getStudent(), milestoneActivityTemplate); } @Test public void does_not_activate_milestone_for_participations_when_not_done_enough() { - when(finalSeminarService.findUserParticipating(project, author)).thenReturn( - List.of(participation) - ); + when(finalSeminarService.findUserParticipating(project, author)).thenReturn(List.of(participation)); ParticipationApprovedEvent event = new ParticipationApprovedEvent(participation); MilestoneActivityTemplate milestoneActivityTemplate = mockMilestoneForEvent(); milestoneActivator.participationApproved(event); - verify(mileStoneService, never()).setConfirmed( - project, - author, - milestoneActivityTemplate, - true - ); + verify(mileStoneService, never()).setConfirmed(project, author, milestoneActivityTemplate, true); } @Test @@ -158,11 +139,7 @@ public class MilestoneActivatorTest { RespondentApprovedEvent event = new RespondentApprovedEvent(respondent); MilestoneActivityTemplate milestoneActivityTemplate = mockMilestoneForEvent(); milestoneActivator.respondentApproved(event); - verifyIndividualMilestoneActivated( - event.getProject(), - event.getStudent(), - milestoneActivityTemplate - ); + verifyIndividualMilestoneActivated(event.getProject(), event.getStudent(), milestoneActivityTemplate); } @Test @@ -170,11 +147,7 @@ public class MilestoneActivatorTest { RespondentFailedEvent event = new RespondentFailedEvent(respondent); MilestoneActivityTemplate milestoneActivityTemplate = mockMilestoneForEvent(); milestoneActivator.respondentFailed(event); - verifyMilestoneDeactivated( - event.getProject(), - event.getStudent(), - milestoneActivityTemplate - ); + verifyMilestoneDeactivated(event.getProject(), event.getStudent(), milestoneActivityTemplate); } @Test @@ -182,11 +155,7 @@ public class MilestoneActivatorTest { FirstPeerReviewCompletedEvent event = new FirstPeerReviewCompletedEvent(peerReview); MilestoneActivityTemplate milestoneActivityTemplate = mockMilestoneForEvent(); milestoneActivator.peerReviewCompleted(event); - verifyIndividualMilestoneActivated( - event.getProject(), - event.getStudent(), - milestoneActivityTemplate - ); + verifyIndividualMilestoneActivated(event.getProject(), event.getStudent(), milestoneActivityTemplate); } @Test @@ -194,11 +163,7 @@ public class MilestoneActivatorTest { SecondPeerReviewCompletedEvent event = new SecondPeerReviewCompletedEvent(peerReview); MilestoneActivityTemplate milestoneActivityTemplate = mockMilestoneForEvent(); milestoneActivator.secondPeerReviewCompleted(event); - verifyIndividualMilestoneActivated( - event.getProject(), - event.getStudent(), - milestoneActivityTemplate - ); + verifyIndividualMilestoneActivated(event.getProject(), event.getStudent(), milestoneActivityTemplate); } @Test @@ -266,12 +231,7 @@ public class MilestoneActivatorTest { MilestoneActivityTemplate milestoneActivityTemplate, boolean activated ) { - verify(mileStoneService).setConfirmed( - project, - student, - milestoneActivityTemplate, - activated - ); + verify(mileStoneService).setConfirmed(project, student, milestoneActivityTemplate, activated); } private void verifyProjectMilestoneActivated(MilestoneActivityTemplate activity) { @@ -288,8 +248,7 @@ public class MilestoneActivatorTest { Project seminarProject = new Project(); FinalSeminar finalSeminar = new FinalSeminar(); finalSeminar.setProject(seminarProject); - FinalSeminarActiveParticipation finalSeminarActiveParticipation = - new FinalSeminarActiveParticipation(); + FinalSeminarActiveParticipation finalSeminarActiveParticipation = new FinalSeminarActiveParticipation(); finalSeminarActiveParticipation.setUser(author); finalSeminarActiveParticipation.setProject(project); finalSeminarActiveParticipation.setFinalSeminar(finalSeminar); @@ -309,9 +268,7 @@ public class MilestoneActivatorTest { private MilestoneActivityTemplate mockMilestoneForEvent() { MilestoneActivityTemplate milestoneActivityTemplate = new MilestoneActivityTemplate(); - lenient() - .when(milestoneActivityTemplateService.findByEvent(any())) - .thenReturn(milestoneActivityTemplate); + lenient().when(milestoneActivityTemplateService.findByEvent(any())).thenReturn(milestoneActivityTemplate); return milestoneActivityTemplate; } diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImplTest.java index 161d2deb90..8aea46084c 100644 --- a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImplTest.java @@ -102,10 +102,7 @@ public class MilestoneActivityTemplateServiceImplTest { 1 ); projectActivity2.setDeleted(true); - List<MilestoneActivityTemplate> listOfAll = Arrays.asList( - projectActivity, - projectActivity2 - ); + List<MilestoneActivityTemplate> listOfAll = Arrays.asList(projectActivity, projectActivity2); when( milestoneActivityTemplateRepository.findAllActivitiesByProjectType( @@ -126,25 +123,18 @@ public class MilestoneActivityTemplateServiceImplTest { @Test public void testSave() { - when( - milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class)) - ).thenAnswer(AdditionalAnswers.returnsFirstArg()); + when(milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class))).thenAnswer( + AdditionalAnswers.returnsFirstArg() + ); String title = "title"; String desc = "desc"; - MilestoneActivityTemplate activity = createActivity( - MilestoneActivityTemplate.Type.PROJECT, - title, - desc, - 0 - ); + MilestoneActivityTemplate activity = createActivity(MilestoneActivityTemplate.Type.PROJECT, title, desc, 0); MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); mileStoneActivityService.save(activity, phase); verify(milestoneActivityTemplateRepository, times(1)).save(eq(activity)); - ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass( - MilestoneActivityTemplate.class - ); + ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass(MilestoneActivityTemplate.class); verify(milestoneActivityTemplateRepository).save(captor.capture()); assertEquals(captor.getValue().getTitle(), title); @@ -155,25 +145,18 @@ public class MilestoneActivityTemplateServiceImplTest { @Test public void testEditActivityShouldNotCareAboutSortOrder() { - when( - milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class)) - ).thenAnswer(AdditionalAnswers.returnsFirstArg()); - MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); - MilestoneActivityTemplate activity = createActivity( - MilestoneActivityTemplate.Type.PROJECT, - "title", - "desc", - 0 + when(milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class))).thenAnswer( + AdditionalAnswers.returnsFirstArg() ); + MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); + MilestoneActivityTemplate activity = createActivity(MilestoneActivityTemplate.Type.PROJECT, "title", "desc", 0); DomainObjects.injectId(activity, 1L); activity.setSortOrder(3); activity.setMilestonePhaseTemplate(phase); mileStoneActivityService.save(activity, phase); - ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass( - MilestoneActivityTemplate.class - ); + ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass(MilestoneActivityTemplate.class); verify(milestoneActivityTemplateRepository).save(captor.capture()); assertEquals(captor.getValue().getSortOrder(), 3); @@ -181,16 +164,11 @@ public class MilestoneActivityTemplateServiceImplTest { @Test public void testActivityWithZeroIdGetsSortOrderByCount() { - when( - milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class)) - ).thenAnswer(AdditionalAnswers.returnsFirstArg()); - MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); - MilestoneActivityTemplate activity = createActivity( - MilestoneActivityTemplate.Type.PROJECT, - "title", - "desc", - 0 + when(milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class))).thenAnswer( + AdditionalAnswers.returnsFirstArg() ); + MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); + MilestoneActivityTemplate activity = createActivity(MilestoneActivityTemplate.Type.PROJECT, "title", "desc", 0); DomainObjects.injectId(activity, 0L); activity.setMilestonePhaseTemplate(phase); @@ -198,9 +176,7 @@ public class MilestoneActivityTemplateServiceImplTest { mileStoneActivityService.save(activity, phase); - ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass( - MilestoneActivityTemplate.class - ); + ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass(MilestoneActivityTemplate.class); verify(milestoneActivityTemplateRepository).save(captor.capture()); assertEquals(captor.getValue().getSortOrder(), 4); @@ -208,32 +184,23 @@ public class MilestoneActivityTemplateServiceImplTest { @Test public void testActivityWithChangedPhaseGetsSortOrderByCount() { - when( - milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class)) - ).thenAnswer(AdditionalAnswers.returnsFirstArg()); + when(milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class))).thenAnswer( + AdditionalAnswers.returnsFirstArg() + ); MilestonePhaseTemplate currentPhase = new MilestonePhaseTemplate("title", "desc"); DomainObjects.injectId(currentPhase, 2L); MilestonePhaseTemplate newPhase = new MilestonePhaseTemplate("new title", "new desc"); DomainObjects.injectId(newPhase, 3L); - MilestoneActivityTemplate activity = createActivity( - MilestoneActivityTemplate.Type.PROJECT, - "title", - "desc", - 0 - ); + MilestoneActivityTemplate activity = createActivity(MilestoneActivityTemplate.Type.PROJECT, "title", "desc", 0); DomainObjects.injectId(activity, 1L); activity.setSortOrder(3); activity.setMilestonePhaseTemplate(newPhase); - when(milestoneActivityTemplateRepository.countByMilestonePhase(eq(newPhase))).thenReturn( - 1L - ); + when(milestoneActivityTemplateRepository.countByMilestonePhase(eq(newPhase))).thenReturn(1L); mileStoneActivityService.save(activity, currentPhase); - ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass( - MilestoneActivityTemplate.class - ); + ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass(MilestoneActivityTemplate.class); verify(milestoneActivityTemplateRepository).save(captor.capture()); assertEquals(captor.getValue().getSortOrder(), 1); @@ -248,11 +215,9 @@ public class MilestoneActivityTemplateServiceImplTest { 0 ); List<MilestoneActivityTemplate> list = Collections.singletonList(createSeminar); - when( - milestoneActivityTemplateRepository.findByMilestonePhase( - isA(MilestonePhaseTemplate.class) - ) - ).thenReturn(list); + when(milestoneActivityTemplateRepository.findByMilestonePhase(isA(MilestonePhaseTemplate.class))).thenReturn( + list + ); List<MilestoneActivityTemplate> serviceList = mileStoneActivityService.findByMileStonePhase( mock(MilestonePhaseTemplate.class) @@ -264,20 +229,11 @@ public class MilestoneActivityTemplateServiceImplTest { @Test public void testFindActiveActivitiesByPhase() { List<MilestoneActivityTemplate> list = Collections.singletonList( - createActivity( - MilestoneActivityTemplate.Type.PROJECT, - "Create seminar", - "description", - 0 - ) + createActivity(MilestoneActivityTemplate.Type.PROJECT, "Create seminar", "description", 0) ); LocalDate date = LocalDate.now().minusDays(1); ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); - Project project = Project.builder() - .title("title") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + Project project = Project.builder().title("title").projectType(bachelor).startDate(LocalDate.now()).build(); project.setStartDate(date); when( milestoneActivityTemplateRepository.findActiveByPhase( @@ -321,21 +277,16 @@ public class MilestoneActivityTemplateServiceImplTest { LocalDate projectStartDate = LocalDate.now().minusDays(1); long expected = 3L; - when( - milestoneActivityTemplateRepository.countActivities(projectType, projectStartDate) - ).thenReturn(expected); + when(milestoneActivityTemplateRepository.countActivities(projectType, projectStartDate)).thenReturn(expected); - assertEquals( - expected, - mileStoneActivityService.countActivities(projectType, projectStartDate) - ); + assertEquals(expected, mileStoneActivityService.countActivities(projectType, projectStartDate)); } @Test public void testMoveUpPhase() { - when( - milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class)) - ).thenAnswer(AdditionalAnswers.returnsFirstArg()); + when(milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class))).thenAnswer( + AdditionalAnswers.returnsFirstArg() + ); MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); MilestoneActivityTemplate current = new MilestoneActivityTemplate( MilestoneActivityTemplate.Type.PROJECT, @@ -352,12 +303,9 @@ public class MilestoneActivityTemplateServiceImplTest { current.setSortOrder(2); downActivity.setSortOrder(1); - when( - milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate( - eq(1), - eq(phase) - ) - ).thenReturn(downActivity); + when(milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate(eq(1), eq(phase))).thenReturn( + downActivity + ); mileStoneActivityService.moveUp(current); @@ -375,21 +323,18 @@ public class MilestoneActivityTemplateServiceImplTest { ); current.setMilestonePhaseTemplate(phase); current.setSortOrder(1); - when( - milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate( - eq(0), - eq(phase) - ) - ).thenReturn(null); + when(milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate(eq(0), eq(phase))).thenReturn( + null + ); mileStoneActivityService.moveUp(current); Assertions.assertEquals(current.getSortOrder(), 1); } @Test public void testMoveDownPhase() { - when( - milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class)) - ).thenAnswer(AdditionalAnswers.returnsFirstArg()); + when(milestoneActivityTemplateRepository.save(isA(MilestoneActivityTemplate.class))).thenAnswer( + AdditionalAnswers.returnsFirstArg() + ); MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); MilestoneActivityTemplate current = new MilestoneActivityTemplate( MilestoneActivityTemplate.Type.PROJECT, @@ -406,12 +351,9 @@ public class MilestoneActivityTemplateServiceImplTest { current.setSortOrder(1); upActivity.setSortOrder(2); - when( - milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate( - eq(2), - eq(phase) - ) - ).thenReturn(upActivity); + when(milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate(eq(2), eq(phase))).thenReturn( + upActivity + ); mileStoneActivityService.moveDown(current); @@ -429,28 +371,19 @@ public class MilestoneActivityTemplateServiceImplTest { ); current.setMilestonePhaseTemplate(phase); current.setSortOrder(1); - when( - milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate( - eq(2), - eq(phase) - ) - ).thenReturn(null); + when(milestoneActivityTemplateRepository.findBySortOrderAndMilestonePhaseTemplate(eq(2), eq(phase))).thenReturn( + null + ); mileStoneActivityService.moveDown(current); Assertions.assertEquals(current.getSortOrder(), 1); } @Test public void testGetActivitiesInOrder() { - List<MilestoneActivityTemplate> list = Collections.singletonList( - new MilestoneActivityTemplate() - ); + List<MilestoneActivityTemplate> list = Collections.singletonList(new MilestoneActivityTemplate()); LocalDate dateCreated = LocalDate.now().minusDays(1); ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); - Project project = Project.builder() - .title("title") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + Project project = Project.builder().title("title").projectType(projectType).startDate(LocalDate.now()).build(); project.setStartDate(dateCreated); when( @@ -477,9 +410,7 @@ public class MilestoneActivityTemplateServiceImplTest { activity.setType(type); activity.setTitle(title); activity.setDescription(description); - activity.setMilestonePhaseTemplate( - new MilestonePhaseTemplate("phase test", "this is for test", 0) - ); + activity.setMilestonePhaseTemplate(new MilestonePhaseTemplate("phase test", "this is for test", 0)); activity.setProjectTypes(new HashSet<>(Collections.singletonList(projectType))); activity.setSortOrder(order); return activity; diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java index fda2c82551..b8d885927a 100644 --- a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java @@ -33,9 +33,7 @@ public class MilestonePhaseTemplateServiceImplTest extends IntegrationTest { @Test public void testFindAll() { - List<MilestonePhaseTemplate> servicePhases = service.findAll( - new Sort(Sort.Direction.ASC, "sortOrder") - ); + List<MilestonePhaseTemplate> servicePhases = service.findAll(new Sort(Sort.Direction.ASC, "sortOrder")); assertEquals(servicePhases.get(0), first); assertEquals(servicePhases.get(1), second); @@ -45,9 +43,7 @@ public class MilestonePhaseTemplateServiceImplTest extends IntegrationTest { public void phases_created_after_project_start_are_not_included() { // Have to add some amount of time or else the test will fail if it runs too fast since the new Date() here // will be equal to the new Date() called when saving the first phase template in #setUp - List<MilestonePhaseTemplate> servicePhases = service.findAllActive( - LocalDate.now().plusDays(1) - ); + List<MilestonePhaseTemplate> servicePhases = service.findAllActive(LocalDate.now().plusDays(1)); assertEquals(servicePhases.size(), 1); assertEquals(servicePhases.get(0), first); diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java index 05d69f1a66..09e2f53c87 100644 --- a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java @@ -36,13 +36,7 @@ public class MilestoneServiceImplIntegrationTest extends IntegrationTest { public void setUp() throws Exception { bachelor = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); project = createProject(); - user = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + user = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); MilestonePhaseTemplate phase = save(new MilestonePhaseTemplate("Phase 1", "Description")); MilestoneActivityTemplate individualMilestone = new MilestoneActivityTemplate( MilestoneActivityTemplate.Type.STUDENT, @@ -66,9 +60,7 @@ public class MilestoneServiceImplIntegrationTest extends IntegrationTest { public void find_completed_milestones() { MileStoneService.Filter filter = new MileStoneService.Filter(); - assertTrue( - milestoneService.findCompletedMilestones(individualMilestone, filter, ALL).isEmpty() - ); + assertTrue(milestoneService.findCompletedMilestones(individualMilestone, filter, ALL).isEmpty()); } @Test @@ -127,10 +119,7 @@ public class MilestoneServiceImplIntegrationTest extends IntegrationTest { long expected = 0L; MileStoneService.Filter filter = new MileStoneService.Filter(); - assertEquals( - expected, - milestoneService.countCompletedMileStones(individualMilestone, filter) - ); + assertEquals(expected, milestoneService.countCompletedMileStones(individualMilestone, filter)); } @Test @@ -150,11 +139,7 @@ public class MilestoneServiceImplIntegrationTest extends IntegrationTest { private Project createProject() { User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); return save( Project.builder() diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java index 73cc7a717f..9a1735cfd3 100644 --- a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java @@ -45,10 +45,7 @@ public class MilestoneStatisticsServiceImplTest extends IntegrationTest { confirmMilestone(completed, secondMilestone); confirmMilestone(completed, firstMilestone); - assertThat( - milestoneStatisticsService.countProgressedProjects(secondMilestone, firstMilestone), - is(1L) - ); + assertThat(milestoneStatisticsService.countProgressedProjects(secondMilestone, firstMilestone), is(1L)); } @Test @@ -72,11 +69,7 @@ public class MilestoneStatisticsServiceImplTest extends IntegrationTest { private Project createProject() { User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); return save( Project.builder() @@ -99,10 +92,7 @@ public class MilestoneStatisticsServiceImplTest extends IntegrationTest { return save(individualMilestone); } - private void confirmMilestone( - final Project project, - final MilestoneActivityTemplate projectMilestone - ) { + private void confirmMilestone(final Project project, final MilestoneActivityTemplate projectMilestone) { Milestone milestone = new Milestone(project, projectMilestone); milestone.setConfirmed(true); save(milestone); diff --git a/core/src/test/java/se/su/dsv/scipro/misc/DaysServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/misc/DaysServiceImplTest.java index f7ddd0a73c..b91fd98aec 100644 --- a/core/src/test/java/se/su/dsv/scipro/misc/DaysServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/misc/DaysServiceImplTest.java @@ -50,9 +50,7 @@ public class DaysServiceImplTest { then(2013, 2, dayOfMonth - 7); // when - Mockito.when(nonWorkDays.isNonWorkDay(ArgumentMatchers.isA(LocalDate.class))).thenReturn( - false - ); + Mockito.when(nonWorkDays.isNonWorkDay(ArgumentMatchers.isA(LocalDate.class))).thenReturn(false); // then Date ahead = service.workDaysAhead(now(), 5); @@ -79,10 +77,7 @@ public class DaysServiceImplTest { then(2013, 4, 9); // when - Mockito.when(nonWorkDays.isNonWorkDay(ArgumentMatchers.isA(LocalDate.class))).thenReturn( - true, - false - ); + Mockito.when(nonWorkDays.isNonWorkDay(ArgumentMatchers.isA(LocalDate.class))).thenReturn(true, false); // then Date ahead = service.workDaysAhead(now(), 1); @@ -97,10 +92,7 @@ public class DaysServiceImplTest { then(2013, 4, 26); // when - Mockito.when(nonWorkDays.isNonWorkDay(ArgumentMatchers.isA(LocalDate.class))).thenReturn( - true, - false - ); + Mockito.when(nonWorkDays.isNonWorkDay(ArgumentMatchers.isA(LocalDate.class))).thenReturn(true, false); // then Date ahead = service.workDaysAhead(now(), 1); @@ -143,11 +135,7 @@ public class DaysServiceImplTest { now(2021, 11, 29); then(2021, 12, 3); - Mockito.when(nonWorkDays.isNonWorkDay(Mockito.any(LocalDate.class))).thenReturn( - true, - true, - false - ); + Mockito.when(nonWorkDays.isNonWorkDay(Mockito.any(LocalDate.class))).thenReturn(true, true, false); final int days = service.workDaysBetween(now(), then()); diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationControllerImplTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationControllerImplTest.java index 3469382f2f..92c836e20c 100755 --- a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationControllerImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationControllerImplTest.java @@ -69,9 +69,7 @@ public class NotificationControllerImplTest { () -> currentUser ); - when(mailFormatter.format(isA(Notification.class))).thenReturn( - new NotificationMail("Subject", "Body") - ); + when(mailFormatter.format(isA(Notification.class))).thenReturn(new NotificationMail("Subject", "Body")); when( deliveryConfiguration.isDelivery( isA(Notification.Type.class), @@ -90,11 +88,7 @@ public class NotificationControllerImplTest { // when when(project.getMembers()).thenReturn(generateMemberList()); setReceivers(Member.Type.AUTHOR); - notificationController.notifyProject( - project, - ProjectEvent.Event.CREATED, - new NotificationSource() - ); + notificationController.notifyProject(project, ProjectEvent.Event.CREATED, new NotificationSource()); // then verify(notificationService, times(1)).save(isA(Notification.class)); @@ -108,11 +102,7 @@ public class NotificationControllerImplTest { // when when(seminar.getMembers()).thenReturn(generateMemberList()); setReceivers(Member.Type.ACTIVE_PARTICIPANT, Member.Type.OPPONENT); - notificationController.notifySeminar( - seminar, - SeminarEvent.Event.ROOM_CHANGED, - new NotificationSource() - ); + notificationController.notifySeminar(seminar, SeminarEvent.Event.ROOM_CHANGED, new NotificationSource()); // then verify(notificationService, times(2)).save(isA(Notification.class)); @@ -126,11 +116,7 @@ public class NotificationControllerImplTest { // when when(idea.getMembers()).thenReturn(generateMemberList()); setReceivers(Member.Type.CREATOR, Member.Type.CO_AUTHOR); - notificationController.notifyIdea( - idea, - IdeaEvent.Event.EXPORTED_FAIL, - new NotificationSource() - ); + notificationController.notifyIdea(idea, IdeaEvent.Event.EXPORTED_FAIL, new NotificationSource()); // then verify(notificationService, times(2)).save(isA(Notification.class)); @@ -144,11 +130,7 @@ public class NotificationControllerImplTest { // when when(request.getMembers()).thenReturn(generateMemberList()); setReceivers(Member.Type.PEER_REQUESTER, Member.Type.SUPERVISOR); - notificationController.notifyPeer( - request, - PeerEvent.Event.REQUEST_EXPIRED, - new NotificationSource() - ); + notificationController.notifyPeer(request, PeerEvent.Event.REQUEST_EXPIRED, new NotificationSource()); // then verify(notificationService, times(2)).save(isA(Notification.class)); @@ -162,11 +144,7 @@ public class NotificationControllerImplTest { // when when(review.getMembers()).thenReturn(generateMemberList()); setReceivers(Member.Type.PEER_REVIEWER); - notificationController.notifyPeer( - review, - PeerEvent.Event.REVIEW_COMPLETED, - new NotificationSource() - ); + notificationController.notifyPeer(review, PeerEvent.Event.REVIEW_COMPLETED, new NotificationSource()); // then verify(notificationService, times(1)).save(isA(Notification.class)); @@ -217,18 +195,10 @@ public class NotificationControllerImplTest { // when when( - receiverConfiguration.isReceiving( - isA(Notification.Type.class), - isA(Enum.class), - isA(Member.Type.class) - ) + receiverConfiguration.isReceiving(isA(Notification.Type.class), isA(Enum.class), isA(Member.Type.class)) ).thenReturn(true); when(project.getMembers()).thenReturn(generateMemberList()); - notificationController.notifyProject( - project, - ProjectEvent.Event.CREATED, - new NotificationSource() - ); + notificationController.notifyProject(project, ProjectEvent.Event.CREATED, new NotificationSource()); // then // there is only one supervisor, setting should be checked for every delivery method @@ -258,19 +228,11 @@ public class NotificationControllerImplTest { private void setReceivers(Member.Type... members) { when( - receiverConfiguration.isReceiving( - isA(Notification.Type.class), - isA(Enum.class), - isA(Member.Type.class) - ) + receiverConfiguration.isReceiving(isA(Notification.Type.class), isA(Enum.class), isA(Member.Type.class)) ).thenReturn(false); for (Member.Type member : members) { when( - receiverConfiguration.isReceiving( - isA(Notification.Type.class), - isA(Enum.class), - eq(member) - ) + receiverConfiguration.isReceiving(isA(Notification.Type.class), isA(Enum.class), eq(member)) ).thenReturn(true); } } diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java index 4630072ca9..18ecf8ce88 100644 --- a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java @@ -33,18 +33,14 @@ public class NotificationServiceImplIntegrationTest extends IntegrationTest { public void find_unread_notifications_by_users_with_mail_compilation() { User user = createUser(); Notification notification = createNotification(user); - Collection<Notification> unreadByUsers = notificationService.findUnreadByUsers( - Collections.singletonList(user) - ); + Collection<Notification> unreadByUsers = notificationService.findUnreadByUsers(Collections.singletonList(user)); assertThat(unreadByUsers, hasItem(notification)); } @Test public void find_unread_returns_empty_result_if_no_users_are_passed_in() { createNotification(createUser()); - Collection<Notification> unreadByUsers = notificationService.findUnreadByUsers( - new ArrayList<User>() - ); + Collection<Notification> unreadByUsers = notificationService.findUnreadByUsers(new ArrayList<User>()); assertTrue(unreadByUsers.isEmpty()); } @@ -52,18 +48,10 @@ public class NotificationServiceImplIntegrationTest extends IntegrationTest { public void find_all_with_all_filters() { NotificationService.Filter filter = new NotificationService.Filter(); User currentUser = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); User anotherUser = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); createNotification(currentUser); @@ -72,10 +60,7 @@ public class NotificationServiceImplIntegrationTest extends IntegrationTest { filter.setCurrentUser(currentUser); filter.setFromUser(anotherUser); - Iterable<Notification> notifications = notificationService.findAll( - filter, - new PageRequest(0, 3) - ); + Iterable<Notification> notifications = notificationService.findAll(filter, new PageRequest(0, 3)); assertThat(notifications, everyItem(hasUser(filter.getCurrentUser()))); assertThat(notifications, everyItem(comesFrom(filter.getFromUser()))); @@ -84,18 +69,10 @@ public class NotificationServiceImplIntegrationTest extends IntegrationTest { @Test public void find_all_with_no_filters() { User currentUser = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); User anotherUser = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); Notification first = createNotification(currentUser); @@ -112,18 +89,10 @@ public class NotificationServiceImplIntegrationTest extends IntegrationTest { @Test public void count_with_filter() { User currentUser = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); User anotherUser = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); createNotification(currentUser); @@ -135,15 +104,9 @@ public class NotificationServiceImplIntegrationTest extends IntegrationTest { @Test public void mark_read_for_project() { final User user = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); - final ProjectType bachelor = save( - new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor") + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); + final ProjectType bachelor = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); final Project project = save( Project.builder() .title("Project") @@ -200,11 +163,7 @@ public class NotificationServiceImplIntegrationTest extends IntegrationTest { } private User createUser() { - User user = User.builder() - .firstName("first") - .lastName("last") - .emailAddress("first@last.com") - .build(); + User user = User.builder().firstName("first").lastName("last").emailAddress("first@last.com").build(); return save(user); } } diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java index 5f01789394..9297c23d0c 100644 --- a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java @@ -15,13 +15,7 @@ public class NotificationServiceImplTest extends IntegrationTest { @Test public void test_mark_read() { - User user = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + User user = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); Notification n2 = create_notification(user, false); diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java index f841efa126..9ae5b17a4f 100644 --- a/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java @@ -28,13 +28,7 @@ public class DeliveryConfigurationServiceImplTest extends IntegrationTest { type = Notification.Type.PEER; event = PeerEvent.Event.REQUEST_DELETED; method = DeliveryMethod.WEB; - user = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + user = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); } @Test diff --git a/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java index e284bb64d6..4901ff9b16 100644 --- a/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java @@ -22,13 +22,7 @@ public class CommentServiceImplTest extends IntegrationTest { commentThread = save(new CommentThread(getCommentable())); comment = save( new Comment( - save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ), + save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()), commentThread ) ); diff --git a/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java index 72789f4092..cd037f3ee5 100644 --- a/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java @@ -46,11 +46,7 @@ public class CommentThreadServiceImplTest extends IntegrationTest { @Test public void creates_a_new_one_if_it_does_not_exist() { - assertNotNull( - commentThreadService.getCommentThread( - createPeerReview(createPeerRequest(createProject())) - ) - ); + assertNotNull(commentThreadService.getCommentThread(createPeerReview(createPeerRequest(createProject())))); } private PeerReview createPeerReview(PeerRequest peerRequest) { @@ -80,22 +76,12 @@ public class CommentThreadServiceImplTest extends IntegrationTest { } private User createUser() { - return save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + return save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); } private Project createProject() { User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); return save( Project.builder() diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerPortalImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerPortalImplTest.java index 8a469bdd63..c522e28538 100644 --- a/core/src/test/java/se/su/dsv/scipro/peer/PeerPortalImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerPortalImplTest.java @@ -196,16 +196,9 @@ public class PeerPortalImplTest { peerRequest.setProject(newProject()); peerRequest.setChecklistTemplate(checklistTemplate); - PeerReview peerReview = peerPortalController.acceptReview( - peerRequest, - new User(), - newProject() - ); + PeerReview peerReview = peerPortalController.acceptReview(peerRequest, new User(), newProject()); - assertEquals( - peerReview.getAnswers().size(), - peerRequest.getChecklistTemplate().getQuestions().size() - ); + assertEquals(peerReview.getAnswers().size(), peerRequest.getChecklistTemplate().getQuestions().size()); } @Test @@ -265,14 +258,8 @@ public class PeerPortalImplTest { PeerRequest peerRequest = new PeerRequest(); peerRequest.setProject(project); peerReview.setPeerRequest(peerRequest); - when(peerReviewRepository.findAll(any(Predicate.class))).thenReturn( - Collections.singletonList(peerReview) - ); - peerPortalController.acceptReview( - peerRequest, - ObjectMother.SOME_USER, - ObjectMother.SOME_PROJECT - ); + when(peerReviewRepository.findAll(any(Predicate.class))).thenReturn(Collections.singletonList(peerReview)); + peerPortalController.acceptReview(peerRequest, ObjectMother.SOME_USER, ObjectMother.SOME_PROJECT); }); } @@ -282,22 +269,14 @@ public class PeerPortalImplTest { PeerRequest peerRequest = new PeerRequest(); peerRequest.setStatus(RequestStatus.TAKEN); peerRequest.setProject(projectWithSettings()); - peerPortalController.acceptReview( - peerRequest, - ObjectMother.SOME_USER, - ObjectMother.SOME_PROJECT - ); + peerPortalController.acceptReview(peerRequest, ObjectMother.SOME_USER, ObjectMother.SOME_PROJECT); }); } private Project projectWithSettings() { ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "b", "b"); projectType.setProjectTypeSettings(new ProjectTypeSettings()); - return Project.builder() - .title("title") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + return Project.builder().title("title").projectType(projectType).startDate(LocalDate.now()).build(); } private void addSomeAnswers(PeerReview peerReview) { @@ -332,11 +311,7 @@ public class PeerPortalImplTest { ProjectTypeSettings projectTypeSettings = new ProjectTypeSettings(); ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); projectType.setProjectTypeSettings(projectTypeSettings); - return Project.builder() - .title("Peer project") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + return Project.builder().title("Peer project").projectType(projectType).startDate(LocalDate.now()).build(); } private PeerReview submittedReview() { diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java index 32f6f04943..215e6c5f45 100644 --- a/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java @@ -35,19 +35,9 @@ public class PeerRequestServiceImplTest extends IntegrationTest { @BeforeEach public void setUp() throws Exception { - requester = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + requester = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); projectType = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); project = Project.builder() @@ -73,13 +63,7 @@ public class PeerRequestServiceImplTest extends IntegrationTest { public void findAllWithParams() { PeerRequestService.Filter params = new PeerRequestService.Filter(); params.setAuthor( - save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ) + save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()) ); assertThat(peerRequestService.findAll(params, ALL), not(hasItem(waiting))); } @@ -100,26 +84,16 @@ public class PeerRequestServiceImplTest extends IntegrationTest { @Test public void findByStudentAndProject() { - assertThat( - peerRequestService.findByRequesterAndProject(requester, project), - hasItems(waiting, cancelled) - ); + assertThat(peerRequestService.findByRequesterAndProject(requester, project), hasItems(waiting, cancelled)); } @Test public void findAvailableRequests() { RequestStatus status = RequestStatus.WAITING; User reviewer = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); - assertThat( - peerRequestService.findAvailableRequests(reviewer, status, projectType, ALL), - hasItems(waiting) + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); + assertThat(peerRequestService.findAvailableRequests(reviewer, status, projectType, ALL), hasItems(waiting)); } @Test @@ -134,10 +108,7 @@ public class PeerRequestServiceImplTest extends IntegrationTest { public void findAvailableRequestsWithoutProjectType() { RequestStatus status = RequestStatus.WAITING; - assertThat( - peerRequestService.findAvailableRequests(null, status, null, ALL), - hasItems(waiting, cancelled) - ); + assertThat(peerRequestService.findAvailableRequests(null, status, null, ALL), hasItems(waiting, cancelled)); } @Test @@ -148,16 +119,9 @@ public class PeerRequestServiceImplTest extends IntegrationTest { @Test public void countAvailableRequests() { User reviewer = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); - assertEquals( - 1, - peerRequestService.countAvailableRequests(reviewer, RequestStatus.WAITING, projectType) + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); + assertEquals(1, peerRequestService.countAvailableRequests(reviewer, RequestStatus.WAITING, projectType)); } @Test @@ -167,10 +131,7 @@ public class PeerRequestServiceImplTest extends IntegrationTest { @Test public void countAvailableRequestsWithoutProjectType() { - assertEquals( - 3, - peerRequestService.countAvailableRequests(null, RequestStatus.WAITING, null) - ); + assertEquals(3, peerRequestService.countAvailableRequests(null, RequestStatus.WAITING, null)); } @Test diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java index 41884942a4..15a004fd89 100644 --- a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java @@ -45,9 +45,7 @@ public class PeerReviewServiceImplIntegrationTest extends IntegrationTest { @Test public void find_completed_peer_reviews() { - List<PeerReview> completed = peerReviewService.findAllCompleted( - new PageRequest(0, Integer.MAX_VALUE) - ); + List<PeerReview> completed = peerReviewService.findAllCompleted(new PageRequest(0, Integer.MAX_VALUE)); assertThat(completed.size(), is(1)); assertThat(completed, hasItem(completedReview)); } @@ -113,11 +111,7 @@ public class PeerReviewServiceImplIntegrationTest extends IntegrationTest { } private User createUser() { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); return save(user); } @@ -127,11 +121,7 @@ public class PeerReviewServiceImplIntegrationTest extends IntegrationTest { private Project createProject() { User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); return save( Project.builder() @@ -145,9 +135,7 @@ public class PeerReviewServiceImplIntegrationTest extends IntegrationTest { private void createDefaultProjectType() { ProjectType projectType = save(new ProjectType(DegreeType.NONE, "name", "description")); - projectType - .getProjectTypeSettings() - .setNumDaysToSubmitPeerReview(DAYS_TO_SUBMIT_PEER_REVIEW); + projectType.getProjectTypeSettings().setNumDaysToSubmitPeerReview(DAYS_TO_SUBMIT_PEER_REVIEW); this.projectType = save(projectType); } } diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java index 6a542e0101..9c6a5dd3da 100644 --- a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java @@ -27,11 +27,7 @@ public class PeerReviewServiceImplTest extends IntegrationTest { @Inject private PeerReviewServiceImpl peerReviewService; - public static final ProjectType SOME_PROJECT_TYPE = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType SOME_PROJECT_TYPE = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); public static final Project SOME_PROJECT = Project.builder() .title("Some title") .projectType(SOME_PROJECT_TYPE) @@ -47,13 +43,7 @@ public class PeerReviewServiceImplTest extends IntegrationTest { @BeforeEach public void setUp() throws Exception { - reviewer = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + reviewer = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); project = newProject(); requesterProject = newProject(); peerRequest = prepareRequest(); @@ -70,9 +60,7 @@ public class PeerReviewServiceImplTest extends IntegrationTest { @Test public void findAllWithParams() { Filter filter = new Filter(); - filter.setStatuses( - EnumSet.of(PeerReview.ReviewStatus.COMPLETED, PeerReview.ReviewStatus.EXPIRED) - ); + filter.setStatuses(EnumSet.of(PeerReview.ReviewStatus.COMPLETED, PeerReview.ReviewStatus.EXPIRED)); assertThat(peerReviewService.findAll(filter, ALL), hasItems(completed, expired)); assertThat(peerReviewService.findAll(filter, ALL), not(hasItem(inProgress))); } @@ -90,10 +78,7 @@ public class PeerReviewServiceImplTest extends IntegrationTest { @Test public void findReceivedCompletedReviews() { - assertThat( - peerReviewService.findReceivedCompletedReviews(requesterProject), - hasItem(completed) - ); + assertThat(peerReviewService.findReceivedCompletedReviews(requesterProject), hasItem(completed)); } @Test @@ -108,13 +93,7 @@ public class PeerReviewServiceImplTest extends IntegrationTest { PeerRequest peerRequest = new PeerRequest(); peerRequest.setProject(requesterProject); peerRequest.setRequester( - save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ) + save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()) ); final FileDescription fileDescription = save(new FileDescription()); final FileReference fileReference = new FileReference(); @@ -126,15 +105,9 @@ public class PeerReviewServiceImplTest extends IntegrationTest { private Project newProject() { User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() - ); - ProjectType projectType = save( - new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor") + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); + ProjectType projectType = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); return save( Project.builder() .title("Title") diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewTest.java index 237e3e9d40..ff071c2109 100644 --- a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewTest.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewTest.java @@ -63,10 +63,6 @@ public class PeerReviewTest { ProjectTypeSettings projectTypeSettings = new ProjectTypeSettings(); ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); projectType.setProjectTypeSettings(projectTypeSettings); - return Project.builder() - .title("Peer project") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + return Project.builder().title("Peer project").projectType(projectType).startDate(LocalDate.now()).build(); } } diff --git a/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java b/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java index 1feeeec5e5..34e5e5c7e2 100755 --- a/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java +++ b/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java @@ -42,35 +42,15 @@ public class TestPeerReview extends IntegrationTest { @BeforeEach public void startTransaction() { - ProjectType bachelor = new ProjectType( - ProjectType.BACHELOR, - "Bachelor", - "Bachelor degree thesis project" - ); + ProjectType bachelor = new ProjectType(ProjectType.BACHELOR, "Bachelor", "Bachelor degree thesis project"); bachelor = save(bachelor); master = new ProjectType(ProjectType.MASTER, "Master", "Master degree thesis project"); master = save(master); - User employeeUser = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User employeeUser = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); employeeUser = save(employeeUser); - reviewer = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); - requester = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + reviewer = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); + requester = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); reviewerProject = newProject(bachelor, reviewer, employeeUser, ProjectStatus.ACTIVE); requesterProject = newProject(master, requester, employeeUser, ProjectStatus.ACTIVE); @@ -81,40 +61,21 @@ public class TestPeerReview extends IntegrationTest { request3 = newRequest(requester, requesterProject, "Request 3", null); request4 = newRequest(requester, requesterProject, "Request 4", RequestStatus.WAITING); - review1 = newReview( - reviewer, - reviewerProject, - request1, - RequestStatus.FINISHED, - false, - true - ); - review2 = newReview( - reviewer, - reviewerProject, - request2, - RequestStatus.FINISHED, - false, - true - ); + review1 = newReview(reviewer, reviewerProject, request1, RequestStatus.FINISHED, false, true); + review2 = newReview(reviewer, reviewerProject, request2, RequestStatus.FINISHED, false, true); review3 = newReview(reviewer, reviewerProject, request3, RequestStatus.TAKEN, false, false); } @Test public void testFindInProgressReviewsByAuthorAndProject() { - List<PeerReview> inProgressReviews = peerReviewService.findInProgressReviews( - reviewer, - reviewerProject - ); + List<PeerReview> inProgressReviews = peerReviewService.findInProgressReviews(reviewer, reviewerProject); Assertions.assertEquals(1, inProgressReviews.size()); Assertions.assertEquals(asList(review3), inProgressReviews); } @Test public void testFindReceivedCompletedReviewsByProject() { - List<PeerReview> receivedCompleted = peerReviewService.findReceivedCompletedReviews( - requesterProject - ); + List<PeerReview> receivedCompleted = peerReviewService.findReceivedCompletedReviews(requesterProject); Assertions.assertEquals(2, receivedCompleted.size()); Assertions.assertEquals(asList(review1, review2), receivedCompleted); } diff --git a/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java index 0342949339..5181dfffff 100644 --- a/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java @@ -79,10 +79,7 @@ public class ProjectServiceImplIntegrationTest extends IntegrationTest { public void findAll() { PageRequest pageable = new PageRequest(0, 5); - List<Project> page = Arrays.asList( - project, - createProject(createProjectType(), ProjectStatus.ACTIVE) - ); + List<Project> page = Arrays.asList(project, createProject(createProjectType(), ProjectStatus.ACTIVE)); assertEquals(page, projectService.findAll(new ProjectService.Filter(), pageable)); } @@ -109,9 +106,7 @@ public class ProjectServiceImplIntegrationTest extends IntegrationTest { params.setStatuses(new HashSet<>(Collections.singletonList(ProjectStatus.ACTIVE))); params.setProjectTypes(Collections.singletonList(projectType)); params.setAuthorUser(author); - params.setRoles( - new HashSet<>(Collections.singletonList(ProjectTeamMemberRoles.CO_SUPERVISOR)) - ); + params.setRoles(new HashSet<>(Collections.singletonList(ProjectTeamMemberRoles.CO_SUPERVISOR))); params.setSupervisor(employee); params.setFilterSupervisor(true); params.setTitleContains("Some"); @@ -141,10 +136,7 @@ public class ProjectServiceImplIntegrationTest extends IntegrationTest { project = save(project); List<Project> expectedList = Collections.singletonList(project); - assertEquals( - expectedList, - projectService.getActiveProjectsByUserAndProjectType(user, projectType) - ); + assertEquals(expectedList, projectService.getActiveProjectsByUserAndProjectType(user, projectType)); } @Test @@ -224,10 +216,7 @@ public class ProjectServiceImplIntegrationTest extends IntegrationTest { project.addProjectParticipant(user); save(project); - assertEquals( - 0, - projectService.findByUserAndStatus(createUser(), ProjectStatus.COMPLETED).size() - ); + assertEquals(0, projectService.findByUserAndStatus(createUser(), ProjectStatus.COMPLETED).size()); } @Test @@ -281,11 +270,7 @@ public class ProjectServiceImplIntegrationTest extends IntegrationTest { private Project createProject(ProjectType projectType, ProjectStatus active) { User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); Project project = new Project(); project.setTitle("Some title"); @@ -304,11 +289,7 @@ public class ProjectServiceImplIntegrationTest extends IntegrationTest { } private User createUser() { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); return save(user); } } diff --git a/core/src/test/java/se/su/dsv/scipro/project/ProjectTest.java b/core/src/test/java/se/su/dsv/scipro/project/ProjectTest.java index abadc6e42c..c597265d6c 100644 --- a/core/src/test/java/se/su/dsv/scipro/project/ProjectTest.java +++ b/core/src/test/java/se/su/dsv/scipro/project/ProjectTest.java @@ -17,11 +17,7 @@ public class ProjectTest { @BeforeEach public void setUp() throws Exception { ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - project = Project.builder() - .title("Foo") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + project = Project.builder().title("Foo").projectType(bachelor).startDate(LocalDate.now()).build(); } @Test diff --git a/core/src/test/java/se/su/dsv/scipro/project/TestProject.java b/core/src/test/java/se/su/dsv/scipro/project/TestProject.java index 107aed8f0c..1cff5bc479 100755 --- a/core/src/test/java/se/su/dsv/scipro/project/TestProject.java +++ b/core/src/test/java/se/su/dsv/scipro/project/TestProject.java @@ -21,37 +21,17 @@ public class TestProject extends IntegrationTest { @BeforeEach public void startTransaction() { - ProjectType bachelor = new ProjectType( - ProjectType.BACHELOR, - "Bachelor", - "Bachelor degree thesis project" - ); + ProjectType bachelor = new ProjectType(ProjectType.BACHELOR, "Bachelor", "Bachelor degree thesis project"); bachelor = save(bachelor); - ProjectType master = new ProjectType( - ProjectType.MASTER, - "Master", - "Master degree thesis project" - ); + ProjectType master = new ProjectType(ProjectType.MASTER, "Master", "Master degree thesis project"); master = save(master); - User employeeUser = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User employeeUser = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); employeeUser = save(employeeUser); - User reviewerUser = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User reviewerUser = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); reviewerUser = save(reviewerUser); - authorUser = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + authorUser = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); authorUser = save(authorUser); project1 = Project.builder() diff --git a/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java index 729d788d83..66d7ece367 100644 --- a/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java @@ -30,13 +30,7 @@ public class ProjectPartnerServiceImplTest extends IntegrationTest { @BeforeEach public void setUp() throws Exception { - user = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + user = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); projectType = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); final ApplicationPeriod applicationPeriod = new ApplicationPeriod("My period"); applicationPeriod.addProjectType(projectType); @@ -70,20 +64,14 @@ public class ProjectPartnerServiceImplTest extends IntegrationTest { public void countProjectPartnerInSpan() { newProjectPartner(); newProjectPartner(10); - assertEquals( - 1, - projectPartnerService.countProjectPartnerInSpan(5, applicationPeriod, projectType) - ); + assertEquals(1, projectPartnerService.countProjectPartnerInSpan(5, applicationPeriod, projectType)); } @Test public void countProjectPartnerInSpanDaysAreZero() { newProjectPartner(); newProjectPartner(10); - assertEquals( - 2, - projectPartnerService.countProjectPartnerInSpan(0, applicationPeriod, projectType) - ); + assertEquals(2, projectPartnerService.countProjectPartnerInSpan(0, applicationPeriod, projectType)); } private ProjectPartner newProjectPartner() { diff --git a/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java b/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java index 6be8442915..78dfb897e7 100644 --- a/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java +++ b/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java @@ -43,11 +43,7 @@ public class ReflectionServiceTest extends IntegrationTest { .emailAddress("stefan@example.com") .build(); save(supervisor); - author = User.builder() - .firstName("Arthur") - .lastName("Author") - .emailAddress("arthur@example.com") - .build(); + author = User.builder().firstName("Arthur").lastName("Author").emailAddress("arthur@example.com").build(); save(author); project = Project.builder() .title("Project") diff --git a/core/src/test/java/se/su/dsv/scipro/report/GradeCalculatorTest.java b/core/src/test/java/se/su/dsv/scipro/report/GradeCalculatorTest.java index a292b4f4b8..10fa29a994 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/GradeCalculatorTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/GradeCalculatorTest.java @@ -11,19 +11,13 @@ public abstract class GradeCalculatorTest { @Test public void a_report_whose_answers_does_not_meet_minimum_requirements_fails() { assessAllCriteria(0); - Assertions.assertEquals( - GradingReport.Grade.F, - getGradingReport().getGrade(getGradeCalculator()) - ); + Assertions.assertEquals(GradingReport.Grade.F, getGradingReport().getGrade(getGradeCalculator())); } @Test public void a_report_whose_answers_are_all_max_points_has_A() { assessAllCriteriaTheirMaxPoints(); - Assertions.assertEquals( - GradingReport.Grade.A, - getGradingReport().getGrade(getGradeCalculator()) - ); + Assertions.assertEquals(GradingReport.Grade.A, getGradingReport().getGrade(getGradeCalculator())); } @Test @@ -83,11 +77,7 @@ public abstract class GradeCalculatorTest { protected void assignPointsToProjectCriteriaWithFxFlag(int numberOfCriteriaToAssign) { for (GradingCriterion gradingCriterion : getGradingReport().getGradingCriteria()) { - if ( - gradingCriterion.isFx() && - gradingCriterion.isProjectCriterion() && - numberOfCriteriaToAssign > 0 - ) { + if (gradingCriterion.isFx() && gradingCriterion.isProjectCriterion() && numberOfCriteriaToAssign > 0) { assess(gradingCriterion, gradingCriterion.getMaxPoints()); numberOfCriteriaToAssign--; } @@ -96,11 +86,7 @@ public abstract class GradeCalculatorTest { protected void assignPointsToTwoIndividualCriteriaWithFxFlag(int numberOfCriteriaToAssign) { for (GradingCriterion gradingCriterion : getGradingReport().getGradingCriteria()) { - if ( - gradingCriterion.isFx() && - gradingCriterion.isIndividualCriterion() && - numberOfCriteriaToAssign > 0 - ) { + if (gradingCriterion.isFx() && gradingCriterion.isIndividualCriterion() && numberOfCriteriaToAssign > 0) { assess(gradingCriterion, gradingCriterion.getMaxPoints()); numberOfCriteriaToAssign--; } diff --git a/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java index 72197b48b6..4eec189c37 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java @@ -69,15 +69,17 @@ public class GradingReportServiceImplIntegrationTest extends IntegrationTest { @Test public void submit_supervisor_grading_report_flags_report_as_submitted() { assessAllCriteria(gradingReport); - Either<List<SubmissionError>, SupervisorGradingReport> result = - gradingReportService.submitReport(gradingReport); + Either<List<SubmissionError>, SupervisorGradingReport> result = gradingReportService.submitReport( + gradingReport + ); assertTrue(result.isRight()); } @Test public void submitting_supervisor_report_throws_exception_if_report_is_not_finished() { - Either<List<SubmissionError>, SupervisorGradingReport> result = - gradingReportService.submitReport(gradingReport); + Either<List<SubmissionError>, SupervisorGradingReport> result = gradingReportService.submitReport( + gradingReport + ); assertFalse(result.isRight()); } @@ -98,9 +100,7 @@ public class GradingReportServiceImplIntegrationTest extends IntegrationTest { addOppositionCriterion(); boolean updated = updateOppositionCriterion(); - GradingCriterion oppositionCriterion = findEnglishOppositionCriterion( - "Ö1 Opposition report" - ); + GradingCriterion oppositionCriterion = findEnglishOppositionCriterion("Ö1 Opposition report"); assert oppositionCriterion != null; assertEquals(FEEDBACK_ON_OPPOSITION, oppositionCriterion.getFeedback()); assertEquals((Integer) OPPOSITION_CRITERION_POINTS, oppositionCriterion.getPoints()); @@ -225,10 +225,7 @@ public class GradingReportServiceImplIntegrationTest extends IntegrationTest { } private SupervisorGradingReport createGradingReport(Project project, User student) { - SupervisorGradingReport gradingReport = gradingReportTemplate.createSupervisorReport( - project, - student - ); + SupervisorGradingReport gradingReport = gradingReportTemplate.createSupervisorReport(project, student); return save(gradingReport); } @@ -252,19 +249,11 @@ public class GradingReportServiceImplIntegrationTest extends IntegrationTest { private List<GradingCriterionPointTemplate> getPointTemplates(int maxPoints, String desc) { List<GradingCriterionPointTemplate> gradingCriterionPointTemplates = new ArrayList<>(); gradingCriterionPointTemplates.add( - new GradingCriterionPointTemplate.Builder() - .point(0) - .description(desc) - .descriptionEn(desc) - .build() + new GradingCriterionPointTemplate.Builder().point(0).description(desc).descriptionEn(desc).build() ); for (int i = 1; i <= maxPoints; i++) { gradingCriterionPointTemplates.add( - new GradingCriterionPointTemplate.Builder() - .point(i) - .description(desc) - .descriptionEn(desc) - .build() + new GradingCriterionPointTemplate.Builder().point(i).description(desc).descriptionEn(desc).build() ); } return gradingCriterionPointTemplates; @@ -287,14 +276,8 @@ public class GradingReportServiceImplIntegrationTest extends IntegrationTest { return save(gradingReportTemplate); } - private GradingReportTemplate createOppositionCriteria( - GradingReportTemplate gradingReportTemplate, - int maxPoints - ) { - List<GradingCriterionPointTemplate> gradingCriterionPointTemplates = getPointTemplates( - maxPoints, - "Opposition" - ); + private GradingReportTemplate createOppositionCriteria(GradingReportTemplate gradingReportTemplate, int maxPoints) { + List<GradingCriterionPointTemplate> gradingCriterionPointTemplates = getPointTemplates(maxPoints, "Opposition"); gradingReportTemplate.addIndividualCriterion( "Ö1 Oppositionsrapport", "Ö1 Opposition report", @@ -333,23 +316,11 @@ public class GradingReportServiceImplIntegrationTest extends IntegrationTest { } private User createStudent() { - return save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + return save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); } private User createSupervisor() { - User user = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + User user = save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); user.addRole(Roles.SUPERVISOR); return save(user); } diff --git a/core/src/test/java/se/su/dsv/scipro/report/GradingReportTemplateTest.java b/core/src/test/java/se/su/dsv/scipro/report/GradingReportTemplateTest.java index 137a64a2af..0c503f990f 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/GradingReportTemplateTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/GradingReportTemplateTest.java @@ -53,10 +53,7 @@ public class GradingReportTemplateTest { GradingReportTemplate gradingReportTemplate = createBachelorTemplate(); Project project = createBachelorProject(); - GradingReport gradingReport = gradingReportTemplate.createSupervisorReport( - project, - mock(User.class) - ); + GradingReport gradingReport = gradingReportTemplate.createSupervisorReport(project, mock(User.class)); assertNotNull(gradingReport); } @@ -74,12 +71,7 @@ public class GradingReportTemplateTest { .descriptionEn("DescriptionEn") .build() ); - gradingReportTemplate.addProjectCriterion( - title, - titleEn, - 1, - gradingCriterionPointTemplates - ); + gradingReportTemplate.addProjectCriterion(title, titleEn, 1, gradingCriterionPointTemplates); assertThat(gradingReportTemplate.getCriteria(), hasItem(withTitle(title))); } @@ -107,11 +99,7 @@ public class GradingReportTemplateTest { } private Project createProject(ProjectType projectType) { - return Project.builder() - .title("Foo") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + return Project.builder().title("Foo").projectType(projectType).startDate(LocalDate.now()).build(); } private GradingReportTemplate createBachelorTemplate() { diff --git a/core/src/test/java/se/su/dsv/scipro/report/OppositionReportServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/report/OppositionReportServiceImplTest.java index 213e09d770..39cf0e784f 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/OppositionReportServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/OppositionReportServiceImplTest.java @@ -31,11 +31,7 @@ import se.su.dsv.scipro.test.UserBuilder; @ExtendWith(MockitoExtension.class) public class OppositionReportServiceImplTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "bachelor", - "bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); @Mock OppositionReportRepo oppositionReportRepo; @@ -60,10 +56,7 @@ public class OppositionReportServiceImplTest { @BeforeEach public void setUp() throws Exception { - GradingReportTemplate template = new GradingReportTemplate( - BACHELOR, - LocalDate.of(2024, Month.JANUARY, 1) - ); + GradingReportTemplate template = new GradingReportTemplate(BACHELOR, LocalDate.of(2024, Month.JANUARY, 1)); List<GradingCriterionPointTemplate> gradingCriterionPointTemplates = new ArrayList<>(); gradingCriterionPointTemplates.add( new GradingCriterionPointTemplate.Builder() @@ -88,28 +81,18 @@ public class OppositionReportServiceImplTest { @Test public void create_report_if_not_existing() { GradingReportTemplate template = Mockito.mock(GradingReportTemplate.class); - Mockito.when(template.createOppositionReport(any(FinalSeminarOpposition.class))).thenReturn( - oppositionReport - ); - Mockito.when(gradingReportTemplateRepo.getTemplate(any(Project.class))).thenReturn( - template - ); + Mockito.when(template.createOppositionReport(any(FinalSeminarOpposition.class))).thenReturn(oppositionReport); + Mockito.when(gradingReportTemplateRepo.getTemplate(any(Project.class))).thenReturn(template); Mockito.when(oppositionReportRepo.save(oppositionReport)).thenReturn(oppositionReport); - assertEquals( - oppositionReport, - oppositionReportService.findOrCreateReport(createFinalSeminarOpposition()) - ); + assertEquals(oppositionReport, oppositionReportService.findOrCreateReport(createFinalSeminarOpposition())); } @Test public void get_existing_opposition_report() { - Mockito.when( - oppositionReportRepo.findByFinalSeminarOpposition(any(FinalSeminarOpposition.class)) - ).thenReturn(oppositionReport); - assertEquals( - oppositionReport, - oppositionReportService.findOrCreateReport(createFinalSeminarOpposition()) + Mockito.when(oppositionReportRepo.findByFinalSeminarOpposition(any(FinalSeminarOpposition.class))).thenReturn( + oppositionReport ); + assertEquals(oppositionReport, oppositionReportService.findOrCreateReport(createFinalSeminarOpposition())); } @Test diff --git a/core/src/test/java/se/su/dsv/scipro/report/OppositionReportTest.java b/core/src/test/java/se/su/dsv/scipro/report/OppositionReportTest.java index a448b98307..65af375b71 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/OppositionReportTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/OppositionReportTest.java @@ -27,9 +27,7 @@ public class OppositionReportTest { ); addCriteria(gradingReportTemplate); - oppositionReport = gradingReportTemplate.createOppositionReport( - new FinalSeminarOpposition() - ); + oppositionReport = gradingReportTemplate.createOppositionReport(new FinalSeminarOpposition()); } @Test @@ -83,12 +81,7 @@ public class OppositionReportTest { 1, gradingCriterionPointTemplates ); - gradingReportTemplate.addProjectCriterion( - "U3 Problem", - "U3 Problem", - 1, - gradingCriterionPointTemplates - ); + gradingReportTemplate.addProjectCriterion("U3 Problem", "U3 Problem", 1, gradingCriterionPointTemplates); gradingReportTemplate.addProjectCriterion( "U4 Frågeställning", "U4 Research question", diff --git a/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportFactoryTest.java b/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportFactoryTest.java index 2950f97d2f..b956f46040 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportFactoryTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportFactoryTest.java @@ -17,10 +17,7 @@ public class SupervisorGradingReportFactoryTest { @BeforeEach public void setUp() throws Exception { - gradingReportTemplate = new GradingReportTemplate( - BACHELOR, - LocalDate.of(2024, Month.JANUARY, 1) - ); + gradingReportTemplate = new GradingReportTemplate(BACHELOR, LocalDate.of(2024, Month.JANUARY, 1)); List<GradingCriterionPointTemplate> gradingCriterionPointTemplates = new ArrayList<>(); gradingCriterionPointTemplates.add( new GradingCriterionPointTemplate.Builder() @@ -29,26 +26,13 @@ public class SupervisorGradingReportFactoryTest { .descriptionEn("DescriptionEn") .build() ); - gradingReportTemplate.addProjectCriterion( - "Title", - "TitleEn", - 1, - gradingCriterionPointTemplates - ); - gradingReportTemplate.addIndividualCriterion( - "Title", - "TitleEn", - 1, - gradingCriterionPointTemplates - ); + gradingReportTemplate.addProjectCriterion("Title", "TitleEn", 1, gradingCriterionPointTemplates); + gradingReportTemplate.addIndividualCriterion("Title", "TitleEn", 1, gradingCriterionPointTemplates); } @Test public void only_includes_project_criterion() { - GradingReport reviewerReport = gradingReportTemplate.createSupervisorReport( - SOME_PROJECT, - SOME_USER - ); + GradingReport reviewerReport = gradingReportTemplate.createSupervisorReport(SOME_PROJECT, SOME_USER); assertThat(reviewerReport.getGradingCriteria().size(), is(2)); } } diff --git a/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportTest.java b/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportTest.java index 1a72001109..a5091ad1c7 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/SupervisorGradingReportTest.java @@ -23,16 +23,9 @@ public class SupervisorGradingReportTest { @BeforeEach public void prepareTemplate() { ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); - project = Project.builder() - .title("Foo") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + project = Project.builder().title("Foo").projectType(bachelor).startDate(LocalDate.now()).build(); - gradingReportTemplate = new GradingReportTemplate( - bachelor, - LocalDate.of(2024, Month.JANUARY, 1) - ); + gradingReportTemplate = new GradingReportTemplate(bachelor, LocalDate.of(2024, Month.JANUARY, 1)); addCriteria(gradingReportTemplate); gradingReport = gradingReportTemplate.createSupervisorReport(project, new User()); @@ -65,30 +58,10 @@ public class SupervisorGradingReportTest { } private void addCriteria(GradingReportTemplate gradingReportTemplate) { - gradingReportTemplate.addProjectCriterion( - "U1 Sammanfattning", - "U1 Abstract", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U2 Introduktion", - "U2 Introduction", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U3 Problem", - "U3 Problem", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U4 Frågeställning", - "U4 Research question", - 1, - getPointTemplates(2) - ); + gradingReportTemplate.addProjectCriterion("U1 Sammanfattning", "U1 Abstract", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U2 Introduktion", "U2 Introduction", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U3 Problem", "U3 Problem", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U4 Frågeställning", "U4 Research question", 1, getPointTemplates(2)); gradingReportTemplate.addProjectCriterion( "U5 Vetenskaplig förankring", "U5 Scientific base", @@ -107,12 +80,7 @@ public class SupervisorGradingReportTest { 1, getPointTemplates(2) ); - gradingReportTemplate.addProjectCriterion( - "U8 Resultat", - "U8 Result", - 1, - getPointTemplates(2) - ); + gradingReportTemplate.addProjectCriterion("U8 Resultat", "U8 Result", 1, getPointTemplates(2)); gradingReportTemplate .addProjectCriterion( "U9 Slutsatser och diskussion", @@ -156,12 +124,7 @@ public class SupervisorGradingReportTest { getPointTemplates(2), AbstractGradingCriterion.Flag.OPPOSITION ); - gradingReportTemplate.addIndividualCriterion( - "Ö2 Presentationer", - "Ö2 Presentations", - 1, - getPointTemplates(1) - ); + gradingReportTemplate.addIndividualCriterion("Ö2 Presentationer", "Ö2 Presentations", 1, getPointTemplates(1)); gradingReportTemplate.addIndividualCriterion( "Ö3 Aktivitet vid seminarier och möten", "Ö3 Participation in seminars and meetings", diff --git a/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorBachelorGradeCalculatorTest.java b/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorBachelorGradeCalculatorTest.java index 05911d67a1..d89ee2e351 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorBachelorGradeCalculatorTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorBachelorGradeCalculatorTest.java @@ -23,10 +23,7 @@ public class SupervisorBachelorGradeCalculatorTest extends GradeCalculatorTest { public void setUp() throws Exception { GradingReportTemplate gradingReportTemplate = prepareTemplate(); - gradingReport = gradingReportTemplate.createSupervisorReport( - ObjectMother.SOME_PROJECT, - mock(User.class) - ); + gradingReport = gradingReportTemplate.createSupervisorReport(ObjectMother.SOME_PROJECT, mock(User.class)); gradeCalculator = new SupervisorBachelorGradeCalculator(); } @@ -94,30 +91,10 @@ public class SupervisorBachelorGradeCalculatorTest extends GradeCalculatorTest { LocalDate.of(2024, Month.JANUARY, 1) ); - gradingReportTemplate.addProjectCriterion( - "U1 Sammanfattning", - "U1 Abstract", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U2 Introduktion", - "U2 Introduction", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U3 Problem", - "U3 Problem", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U4 Frågeställning", - "U4 Research question", - 1, - getPointTemplates(2) - ); + gradingReportTemplate.addProjectCriterion("U1 Sammanfattning", "U1 Abstract", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U2 Introduktion", "U2 Introduction", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U3 Problem", "U3 Problem", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U4 Frågeställning", "U4 Research question", 1, getPointTemplates(2)); gradingReportTemplate.addProjectCriterion( "U5 Vetenskaplig förankring", "U5 Scientific base", @@ -136,12 +113,7 @@ public class SupervisorBachelorGradeCalculatorTest extends GradeCalculatorTest { 1, getPointTemplates(2) ); - gradingReportTemplate.addProjectCriterion( - "U8 Resultat", - "U8 Result", - 1, - getPointTemplates(2) - ); + gradingReportTemplate.addProjectCriterion("U8 Resultat", "U8 Result", 1, getPointTemplates(2)); gradingReportTemplate.addProjectCriterion( "U9 Slutsatser och diskussion", "U9 Conclusions and discussion", @@ -154,12 +126,7 @@ public class SupervisorBachelorGradeCalculatorTest extends GradeCalculatorTest { 1, getPointTemplates(1) ); - gradingReportTemplate.addProjectCriterion( - "U11 Argumentation", - "U11 Argumentation", - 1, - getPointTemplates(1) - ); + gradingReportTemplate.addProjectCriterion("U11 Argumentation", "U11 Argumentation", 1, getPointTemplates(1)); gradingReportTemplate.addProjectCriterion( "U12 Källhänvisningar och dokumentation", "U12 References and documentation", @@ -182,12 +149,7 @@ public class SupervisorBachelorGradeCalculatorTest extends GradeCalculatorTest { getPointTemplates(2), AbstractGradingCriterion.Flag.OPPOSITION ); - gradingReportTemplate.addIndividualCriterion( - "Ö2 Presentationer", - "Ö2 Presentations", - 1, - getPointTemplates(1) - ); + gradingReportTemplate.addIndividualCriterion("Ö2 Presentationer", "Ö2 Presentations", 1, getPointTemplates(1)); gradingReportTemplate.addIndividualCriterion( "Ö3 Aktivitet vid seminarier och möten", "Ö3 Participation in seminars and meetings", diff --git a/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster15GradeCalculatorTest.java b/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster15GradeCalculatorTest.java index 972bc872df..b45abb7da1 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster15GradeCalculatorTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster15GradeCalculatorTest.java @@ -81,30 +81,10 @@ public class SupervisorMaster15GradeCalculatorTest extends GradeCalculatorTest { LocalDate.of(2024, Month.JANUARY, 1) ); - gradingReportTemplate.addProjectCriterion( - "U1 Sammanfattning", - "U1 Abstract", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U2 Introduktion", - "U2 Introduction", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U3 Problem", - "U3 Problem", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U4 Frågeställning", - "U4 Research question", - 1, - getPointTemplates(2) - ); + gradingReportTemplate.addProjectCriterion("U1 Sammanfattning", "U1 Abstract", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U2 Introduktion", "U2 Introduction", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U3 Problem", "U3 Problem", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U4 Frågeställning", "U4 Research question", 1, getPointTemplates(2)); gradingReportTemplate.addProjectCriterion( "U5 Vetenskaplig förankring", "U5 Scientific base", @@ -123,12 +103,7 @@ public class SupervisorMaster15GradeCalculatorTest extends GradeCalculatorTest { 1, getPointTemplates(2) ); - gradingReportTemplate.addProjectCriterion( - "U8 Resultat", - "U8 Result", - 2, - getPointTemplates(3) - ); + gradingReportTemplate.addProjectCriterion("U8 Resultat", "U8 Result", 2, getPointTemplates(3)); gradingReportTemplate.addProjectCriterion( "U9 Slutsatser och diskussion", "U9 Conclusions and discussion", @@ -141,12 +116,7 @@ public class SupervisorMaster15GradeCalculatorTest extends GradeCalculatorTest { 1, getPointTemplates(1) ); - gradingReportTemplate.addProjectCriterion( - "U11 Argumentation", - "U11 Argumentation", - 1, - getPointTemplates(1) - ); + gradingReportTemplate.addProjectCriterion("U11 Argumentation", "U11 Argumentation", 1, getPointTemplates(1)); gradingReportTemplate.addProjectCriterion( "U12 Källhänvisningar och dokumentation", "U12 References and documentation", @@ -167,12 +137,7 @@ public class SupervisorMaster15GradeCalculatorTest extends GradeCalculatorTest { getPointTemplates(2), AbstractGradingCriterion.Flag.OPPOSITION ); - gradingReportTemplate.addIndividualCriterion( - "Ö2 Presentationer", - "Ö2 Presentations", - 1, - getPointTemplates(1) - ); + gradingReportTemplate.addIndividualCriterion("Ö2 Presentationer", "Ö2 Presentations", 1, getPointTemplates(1)); gradingReportTemplate.addIndividualCriterion( "Ö3 Aktivitet vid seminarier och möten", "Ö3 Participation in seminars and meetings", diff --git a/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster30GradeCalculatorTest.java b/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster30GradeCalculatorTest.java index 337bc20878..be270c03ef 100644 --- a/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster30GradeCalculatorTest.java +++ b/core/src/test/java/se/su/dsv/scipro/report/calculators/original/SupervisorMaster30GradeCalculatorTest.java @@ -82,30 +82,10 @@ public class SupervisorMaster30GradeCalculatorTest extends GradeCalculatorTest { LocalDate.of(2024, Month.JANUARY, 1) ); - gradingReportTemplate.addProjectCriterion( - "U1 Sammanfattning", - "U1 Abstract", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U2 Introduktion", - "U2 Introduction", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U3 Problem", - "U3 Problem", - 1, - getPointTemplates(1) - ); - gradingReportTemplate.addProjectCriterion( - "U4 Frågeställning", - "U4 Research question", - 1, - getPointTemplates(2) - ); + gradingReportTemplate.addProjectCriterion("U1 Sammanfattning", "U1 Abstract", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U2 Introduktion", "U2 Introduction", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U3 Problem", "U3 Problem", 1, getPointTemplates(1)); + gradingReportTemplate.addProjectCriterion("U4 Frågeställning", "U4 Research question", 1, getPointTemplates(2)); gradingReportTemplate.addProjectCriterion( "U5 Vetenskaplig förankring", "U5 Scientific base", @@ -124,12 +104,7 @@ public class SupervisorMaster30GradeCalculatorTest extends GradeCalculatorTest { 2, getPointTemplates(3) ); - gradingReportTemplate.addProjectCriterion( - "U8 Resultat", - "U8 Result", - 2, - getPointTemplates(3) - ); + gradingReportTemplate.addProjectCriterion("U8 Resultat", "U8 Result", 2, getPointTemplates(3)); gradingReportTemplate.addProjectCriterion( "U9 Slutsatser och diskussion", "U9 Conclusions and discussion", @@ -142,12 +117,7 @@ public class SupervisorMaster30GradeCalculatorTest extends GradeCalculatorTest { 1, getPointTemplates(1) ); - gradingReportTemplate.addProjectCriterion( - "U11 Argumentation", - "U11 Argumentation", - 1, - getPointTemplates(1) - ); + gradingReportTemplate.addProjectCriterion("U11 Argumentation", "U11 Argumentation", 1, getPointTemplates(1)); gradingReportTemplate.addProjectCriterion( "U12 Källhänvisningar och dokumentation", "U12 References and documentation", @@ -168,24 +138,14 @@ public class SupervisorMaster30GradeCalculatorTest extends GradeCalculatorTest { getPointTemplates(2), AbstractGradingCriterion.Flag.OPPOSITION ); - gradingReportTemplate.addIndividualCriterion( - "Ö2 Presentationer", - "Ö2 Presentations", - 1, - getPointTemplates(1) - ); + gradingReportTemplate.addIndividualCriterion("Ö2 Presentationer", "Ö2 Presentations", 1, getPointTemplates(1)); gradingReportTemplate.addIndividualCriterion( "Ö3 Aktivitet vid seminarier och möten", "Ö3 Participation in seminars and meetings", 1, getPointTemplates(1) ); - gradingReportTemplate.addIndividualCriterion( - "Ö4 Deadlines", - "Ö4 Deadlines", - 0, - getPointTemplates(1) - ); + gradingReportTemplate.addIndividualCriterion("Ö4 Deadlines", "Ö4 Deadlines", 0, getPointTemplates(1)); gradingReportTemplate.addIndividualCriterion( "Ö5 Revision efter slutseminarium", "Ö5 Revisions after the final seminar", diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java index ce69288bac..2dc785806f 100644 --- a/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java @@ -27,18 +27,10 @@ public class FinalSeminarApprovalServiceImplTest extends ReviewingModuleTest { @BeforeEach public void setUp() throws Exception { User reviewer = save( - User.builder() - .firstName("Ronny") - .lastName("Reviewer") - .emailAddress("reviewer@dsv.su.se") - .build() + User.builder().firstName("Ronny").lastName("Reviewer").emailAddress("reviewer@dsv.su.se").build() ); User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); ProjectType bachelor = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); project = save( @@ -61,9 +53,7 @@ public class FinalSeminarApprovalServiceImplTest extends ReviewingModuleTest { @Test public void findOne() { finalSeminarApprovalService.requestApproval(project, createFileUpload(), "test"); - Optional<FinalSeminarApproval> finalSeminarApproval = finalSeminarApprovalService.findBy( - project - ); + Optional<FinalSeminarApproval> finalSeminarApproval = finalSeminarApprovalService.findBy(project); assertTrue(finalSeminarApproval.isPresent()); assertEquals( finalSeminarApproval.orElse(null), diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java index 61efee519c..e940bca282 100644 --- a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java @@ -22,16 +22,8 @@ import se.su.dsv.scipro.test.IntegrationTest; class ReviewerCapacityServiceImplTest extends IntegrationTest { private static Year YEAR_2024 = Year.of(2024); - private static LocalDate SOME_DATE_IN_SPRING = LocalDate.of( - YEAR_2024.getValue(), - Month.APRIL, - 1 - ); - private static LocalDate SOME_DATE_IN_AUTUMN = LocalDate.of( - YEAR_2024.getValue(), - Month.OCTOBER, - 1 - ); + private static LocalDate SOME_DATE_IN_SPRING = LocalDate.of(YEAR_2024.getValue(), Month.APRIL, 1); + private static LocalDate SOME_DATE_IN_AUTUMN = LocalDate.of(YEAR_2024.getValue(), Month.OCTOBER, 1); @Inject ReviewerCapacityServiceImpl service; @@ -98,9 +90,7 @@ class ReviewerCapacityServiceImplTest extends IntegrationTest { ReviewerCandidates candidates = service.getCandidatesToReview(project, SOME_DATE_IN_AUTUMN); // then - assertTrue( - candidates.wrongLanguage().stream().anyMatch(c -> c.reviewer().equals(reviewer)) - ); + assertTrue(candidates.wrongLanguage().stream().anyMatch(c -> c.reviewer().equals(reviewer))); } @Test @@ -114,9 +104,7 @@ class ReviewerCapacityServiceImplTest extends IntegrationTest { ReviewerCandidates candidates = service.getCandidatesToReview(project, SOME_DATE_IN_SPRING); // then - assertTrue( - candidates.wrongResearchArea().stream().anyMatch(c -> c.reviewer().equals(reviewer)) - ); + assertTrue(candidates.wrongResearchArea().stream().anyMatch(c -> c.reviewer().equals(reviewer))); } @Test @@ -177,16 +165,10 @@ class ReviewerCapacityServiceImplTest extends IntegrationTest { // then assertFalse(candidates.good().stream().anyMatch(c -> c.reviewer().equals(supervisor))); - assertFalse( - candidates.wrongResearchArea().stream().anyMatch(c -> c.reviewer().equals(supervisor)) - ); - assertFalse( - candidates.wrongLanguage().stream().anyMatch(c -> c.reviewer().equals(supervisor)) - ); + assertFalse(candidates.wrongResearchArea().stream().anyMatch(c -> c.reviewer().equals(supervisor))); + assertFalse(candidates.wrongLanguage().stream().anyMatch(c -> c.reviewer().equals(supervisor))); assertFalse(candidates.busy().stream().anyMatch(c -> c.reviewer().equals(supervisor))); - assertFalse( - candidates.unavailable().stream().anyMatch(c -> c.reviewer().equals(supervisor)) - ); + assertFalse(candidates.unavailable().stream().anyMatch(c -> c.reviewer().equals(supervisor))); } @Test @@ -202,12 +184,8 @@ class ReviewerCapacityServiceImplTest extends IntegrationTest { // then assertFalse(candidates.good().stream().anyMatch(c -> c.reviewer().equals(reviewer))); - assertFalse( - candidates.wrongResearchArea().stream().anyMatch(c -> c.reviewer().equals(reviewer)) - ); - assertFalse( - candidates.wrongLanguage().stream().anyMatch(c -> c.reviewer().equals(reviewer)) - ); + assertFalse(candidates.wrongResearchArea().stream().anyMatch(c -> c.reviewer().equals(reviewer))); + assertFalse(candidates.wrongLanguage().stream().anyMatch(c -> c.reviewer().equals(reviewer))); assertFalse(candidates.busy().stream().anyMatch(c -> c.reviewer().equals(reviewer))); assertFalse(candidates.unavailable().stream().anyMatch(c -> c.reviewer().equals(reviewer))); } diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorkerTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorkerTest.java index 2dc99df489..1305035764 100644 --- a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorkerTest.java +++ b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorkerTest.java @@ -23,9 +23,9 @@ public class ReviewerDecisionReminderWorkerTest { public void should_remind_if_is_same_date() { Date today = new Date(); RoughDraftApproval roughDraftApproval = newRoughDraftApproval(); - boolean needReminding = ReviewerDecisionReminderWorker.needReminding(today, x -> - Set.of(today) - ).test(roughDraftApproval); + boolean needReminding = ReviewerDecisionReminderWorker.needReminding(today, x -> Set.of(today)).test( + roughDraftApproval + ); assertTrue(needReminding); } @@ -35,9 +35,9 @@ public class ReviewerDecisionReminderWorkerTest { Date date = new Date(987452359L); RoughDraftApproval roughDraftApproval = newRoughDraftApproval(); - boolean needReminding = ReviewerDecisionReminderWorker.needReminding(new Date(0), x -> - Set.of(date) - ).test(roughDraftApproval); + boolean needReminding = ReviewerDecisionReminderWorker.needReminding(new Date(0), x -> Set.of(date)).test( + roughDraftApproval + ); assertFalse(needReminding); } @@ -50,10 +50,7 @@ public class ReviewerDecisionReminderWorkerTest { Optional.ofNullable(roughDraftApproval.getProject().getReviewer()), List.of(roughDraftApproval) ); - assertThat( - reminder.getMessageBody(), - containsString(roughDraftApproval.getProject().getTitle()) - ); + assertThat(reminder.getMessageBody(), containsString(roughDraftApproval.getProject().getTitle())); } @Test @@ -75,11 +72,7 @@ public class ReviewerDecisionReminderWorkerTest { } private User newUser() { - User user = User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build(); + User user = User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build(); user.setId(234L); user.setUnit(newUnit()); return user; diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImplTest.java index c3c58a8276..d7776a8437 100644 --- a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImplTest.java @@ -45,18 +45,9 @@ public class ReviewerInteractionServiceImplTest { @BeforeEach public void setUp() throws Exception { - when(reviewerThreadRepository.findByProject(isA(Project.class))).thenReturn( - Optional.empty() - ); + when(reviewerThreadRepository.findByProject(isA(Project.class))).thenReturn(Optional.empty()); when(basicForumService.createThread(anyString())).thenReturn(new ForumThread()); - when( - basicForumService.createReply( - isA(ForumThread.class), - isA(User.class), - anyString(), - anySet() - ) - ).thenAnswer( + when(basicForumService.createReply(isA(ForumThread.class), isA(User.class), anyString(), anySet())).thenAnswer( new Answer<ForumPost>() { @Override public ForumPost answer(final InvocationOnMock invocation) { @@ -81,12 +72,7 @@ public class ReviewerInteractionServiceImplTest { final Project project = createProject(); final User reviewer = createUser(); - reviewerInteractionService.reply( - project, - reviewer, - "Rough draft approvad", - Collections.emptySet() - ); + reviewerInteractionService.reply(project, reviewer, "Rough draft approvad", Collections.emptySet()); ArgumentCaptor<NewReviewerInteractionMessage> captor = ArgumentCaptor.forClass( NewReviewerInteractionMessage.class @@ -97,19 +83,11 @@ public class ReviewerInteractionServiceImplTest { } private User createUser() { - return User.builder() - .firstName("Bob") - .lastName("Reviewer") - .emailAddress("bob@example.com") - .build(); + return User.builder().firstName("Bob").lastName("Reviewer").emailAddress("bob@example.com").build(); } private Project createProject() { final ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - return Project.builder() - .title("Project") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + return Project.builder().title("Project").projectType(bachelor).startDate(LocalDate.now()).build(); } } diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerTest.java index c642041dcc..1108562f34 100644 --- a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerTest.java +++ b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerTest.java @@ -46,36 +46,35 @@ public class ReviewerTest extends ReviewingModuleTest { Project project = createProject(); User reviewer = createUser(); - var target = new ReviewerCapacityService.Target( - Year.now(clock), - 2, - 0, - "Can review at any time" - ); + var target = new ReviewerCapacityService.Target(Year.now(clock), 2, 0, "Can review at any time"); // When reviewerCapacityService.assignTarget(reviewer, target); - Either<AlreadyRequested, RoughDraftApproval> firstReviewRequest = - roughDraftApprovalService.requestApproval(project, dummyFile(), "Some comment"); + Either<AlreadyRequested, RoughDraftApproval> firstReviewRequest = roughDraftApprovalService.requestApproval( + project, + dummyFile(), + "Some comment" + ); assertTrue(firstReviewRequest.isRight()); ReviewerAssignment assignment = reviewerAssignmentService.assignReviewer(project, reviewer); assertEquals(ReviewerAssignment.OK, assignment); - reviewerDecisionService.reject( - firstReviewRequest.right(), - "Not good enough", - Optional.empty() - ); + reviewerDecisionService.reject(firstReviewRequest.right(), "Not good enough", Optional.empty()); - Either<AlreadyRequested, RoughDraftApproval> secondReviewRequest = - roughDraftApprovalService.requestApproval(project, dummyFile(), "Some new comment"); + Either<AlreadyRequested, RoughDraftApproval> secondReviewRequest = roughDraftApprovalService.requestApproval( + project, + dummyFile(), + "Some new comment" + ); assertTrue(secondReviewRequest.isRight()); // Then - ReviewerCapacityService.RemainingTargets remainingTargets = - reviewerCapacityService.getRemainingTargets(reviewer, target.year()); + ReviewerCapacityService.RemainingTargets remainingTargets = reviewerCapacityService.getRemainingTargets( + reviewer, + target.year() + ); assertEquals(1, remainingTargets.spring()); } diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java index d9a4526405..47903467c1 100644 --- a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java @@ -46,25 +46,13 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { @BeforeEach public void setUp() throws Exception { reviewer = save( - User.builder() - .firstName("Ronny") - .lastName("Reviewer") - .emailAddress("reviewer@dsv.su.se") - .build() + User.builder().firstName("Ronny").lastName("Reviewer").emailAddress("reviewer@dsv.su.se").build() ); User reviewer2 = save( - User.builder() - .firstName("Ronny") - .lastName("Reviewer") - .emailAddress("reviewer@dsv.su.se") - .build() + User.builder().firstName("Ronny").lastName("Reviewer").emailAddress("reviewer@dsv.su.se").build() ); User headSupervisor = save( - User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build() + User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build() ); ProjectType bachelor = save(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")); project = save( @@ -99,10 +87,7 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { @Test public void count() { finalSeminarApprovalService.requestApproval(project, createFileUpload(), "test"); - assertEquals( - 1, - reviewingService.countDecisions(getFilter(ReviewerApproval.Step.FINAL_SEMINAR_APPROVAL)) - ); + assertEquals(1, reviewingService.countDecisions(getFilter(ReviewerApproval.Step.FINAL_SEMINAR_APPROVAL))); } private MyReviewService.Filter getFilter(ReviewerApproval.Step step) { @@ -116,10 +101,7 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { public void find_undecided() { finalSeminarApprovalService.requestApproval(project, createFileUpload(), "test"); assertThat( - reviewingService.findAllDecisions( - getFilter(ReviewerApproval.Step.FINAL_SEMINAR_APPROVAL), - ALL - ), + reviewingService.findAllDecisions(getFilter(ReviewerApproval.Step.FINAL_SEMINAR_APPROVAL), ALL), hasItem(where(Decision::getReviewerApproval, instanceOf(FinalSeminarApproval.class))) ); } @@ -128,10 +110,7 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { public void find_undecided_rough_draft_approvals() { roughDraftApprovalService.requestApproval(project, createFileUpload(), "test"); assertThat( - reviewingService.findAllDecisions( - getFilter(ReviewerApproval.Step.ROUGH_DRAFT_APPROVAL), - ALL - ), + reviewingService.findAllDecisions(getFilter(ReviewerApproval.Step.ROUGH_DRAFT_APPROVAL), ALL), hasItem(where(Decision::getReviewerApproval, instanceOf(RoughDraftApproval.class))) ); } @@ -145,21 +124,23 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { @Test public void back_and_forth() { assertTrue(finalSeminarApprovalService.requiresUpload(project)); - Either<AlreadyRequested, FinalSeminarApproval> first = - finalSeminarApprovalService.requestApproval(project, createFileUpload(), "test"); + Either<AlreadyRequested, FinalSeminarApproval> first = finalSeminarApprovalService.requestApproval( + project, + createFileUpload(), + "test" + ); assertFalse(finalSeminarApprovalService.requiresUpload(project)); first.foreach(firstFinalSeminarApproval -> - reviewingService.reject( - firstFinalSeminarApproval, - "Very bad", - Optional.of(createFileUpload()) - ) + reviewingService.reject(firstFinalSeminarApproval, "Very bad", Optional.of(createFileUpload())) ); assertTrue(finalSeminarApprovalService.requiresUpload(project)); - Either<AlreadyRequested, FinalSeminarApproval> second = - finalSeminarApprovalService.requestApproval(project, createFileUpload(), "test"); + Either<AlreadyRequested, FinalSeminarApproval> second = finalSeminarApprovalService.requestApproval( + project, + createFileUpload(), + "test" + ); assertFalse(finalSeminarApprovalService.requiresUpload(project)); second.foreach(secondFinalSeminarApproval -> @@ -170,8 +151,11 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { @Test public void only_fetches_my_reviews() { - Either<AlreadyRequested, RoughDraftApproval> myRequest = - roughDraftApprovalService.requestApproval(project, createFileUpload(), "my request"); + Either<AlreadyRequested, RoughDraftApproval> myRequest = roughDraftApprovalService.requestApproval( + project, + createFileUpload(), + "my request" + ); assertTrue(myRequest.isRight()); List<Decision> requests = reviewingService.findAllDecisions( @@ -183,18 +167,21 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { @Test public void sort_by_requested() { - Either<AlreadyRequested, RoughDraftApproval> request1 = - roughDraftApprovalService.requestApproval(project, createFileUpload(), "request 1"); + Either<AlreadyRequested, RoughDraftApproval> request1 = roughDraftApprovalService.requestApproval( + project, + createFileUpload(), + "request 1" + ); assertTrue(request1.isRight()); - Either<AlreadyRequested, RoughDraftApproval> request2 = - roughDraftApprovalService.requestApproval(project3, createFileUpload(), "request 2"); + Either<AlreadyRequested, RoughDraftApproval> request2 = roughDraftApprovalService.requestApproval( + project3, + createFileUpload(), + "request 2" + ); assertTrue(request2.isRight()); - var sortByRequested = new Page.Sort<>( - MyReviewService.Sort.TITLE, - Page.Direction.DESCENDING - ); + var sortByRequested = new Page.Sort<>(MyReviewService.Sort.TITLE, Page.Direction.DESCENDING); TestPage page = new TestPage(0, Long.MAX_VALUE, sortByRequested); List<Decision> requests = reviewingService.findAllDecisions( getFilter(ReviewerApproval.Step.ROUGH_DRAFT_APPROVAL), @@ -212,8 +199,7 @@ public class ReviewingServiceImplTest extends ReviewingModuleTest { return fileUpload; } - record TestPage(long offset, long limit, Sort<MyReviewService.Sort> sort) - implements Page<MyReviewService.Sort> { + record TestPage(long offset, long limit, Sort<MyReviewService.Sort> sort) implements Page<MyReviewService.Sort> { TestPage(long offset, long limit) { this(offset, limit, new Sort<>(MyReviewService.Sort.TITLE, Direction.ASCENDING)); } diff --git a/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java b/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java index 07fc16885c..9ebffb3b4a 100644 --- a/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java @@ -22,13 +22,7 @@ public class LocalAuthenticationTest extends IntegrationTest { @BeforeEach public void setUp() throws Exception { - User user = save( - User.builder() - .firstName("Kalle") - .lastName("Tester") - .emailAddress("kalle@dsv.su.se") - .build() - ); + User user = save(User.builder().firstName("Kalle").lastName("Tester").emailAddress("kalle@dsv.su.se").build()); createUsername(user); createPassword(user); } @@ -40,16 +34,12 @@ public class LocalAuthenticationTest extends IntegrationTest { @Test public void authenticate_with_wrong_credentials() { - assertFalse( - localAuthentication.authenticate(new Credentials(TEST_USERNAME, "wrong".toCharArray())) - ); + assertFalse(localAuthentication.authenticate(new Credentials(TEST_USERNAME, "wrong".toCharArray()))); } @Test public void if_no_user_is_found_then_authentication_fails() { - assertFalse( - localAuthentication.authenticate(new Credentials("foobar", "password".toCharArray())) - ); + assertFalse(localAuthentication.authenticate(new Credentials("foobar", "password".toCharArray()))); } private void createPassword(final User user) { diff --git a/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java index 915d2c3423..2c9ff21bf0 100644 --- a/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java @@ -22,10 +22,7 @@ public class UserProfileServiceImplIntegrationTest extends IntegrationTest { createUserProfile(userWithoutMailCompilation, false); assertEquals(1, userProfileService.findUsersWithMailCompilation().size()); - assertEquals( - userWithMailCompilation, - userProfileService.findUsersWithMailCompilation().get(0) - ); + assertEquals(userWithMailCompilation, userProfileService.findUsersWithMailCompilation().get(0)); } private UserProfile createUserProfile(User user, boolean mailCompilation) { @@ -36,11 +33,7 @@ public class UserProfileServiceImplIntegrationTest extends IntegrationTest { } private User createUser() { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); return save(user); } } diff --git a/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java index 14484d998c..90802bb40b 100644 --- a/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java @@ -26,10 +26,7 @@ public class ProjectTypeServiceImplIntegrationTest extends IntegrationTest { createProjectType(DegreeType.NONE, "ICT4D"); List<ProjectType> projectTypes = asList(bachelor); - assertEquals( - projectTypes, - projectTypeService.findByDegreeTypes(asList(DegreeType.BACHELOR)) - ); + assertEquals(projectTypes, projectTypeService.findByDegreeTypes(asList(DegreeType.BACHELOR))); } @Test @@ -48,11 +45,7 @@ public class ProjectTypeServiceImplIntegrationTest extends IntegrationTest { @Test public void find_projects_types_from_supervisors_active_projects() { User supervisor = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); ProjectType bachelor = createProjectType(DegreeType.BACHELOR, "bachelor"); createProjectType(DegreeType.MASTER, "master"); @@ -83,11 +76,7 @@ public class ProjectTypeServiceImplIntegrationTest extends IntegrationTest { @Test public void find_projects_types_from_supervisors_active_projects_count_following_projects_as_well() { User supervisor = save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); ProjectType bachelor = createProjectType(DegreeType.BACHELOR, "bachelor"); ProjectType master = createProjectType(DegreeType.MASTER, "master"); @@ -105,13 +94,7 @@ public class ProjectTypeServiceImplIntegrationTest extends IntegrationTest { .projectType(master) .startDate(LocalDate.now()) .headSupervisor( - save( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ) + save(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()) ) .build(); reviewingProject.addReviewer(supervisor); diff --git a/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java index 7349758959..fe669d7623 100644 --- a/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java +++ b/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java @@ -33,13 +33,7 @@ public class UserServiceImplIntegrationTest extends IntegrationTest { createUserNames(); filter = new UserService.Filter(); - filter.setRoles( - Roles.SYSADMIN, - Roles.SUPERVISOR, - Roles.ADMIN, - Roles.EXAMINER, - Roles.AUTHOR - ); + filter.setRoles(Roles.SYSADMIN, Roles.SUPERVISOR, Roles.ADMIN, Roles.EXAMINER, Roles.AUTHOR); } @Test @@ -115,11 +109,7 @@ public class UserServiceImplIntegrationTest extends IntegrationTest { } private User newUser(String firstName, String lastName, String emailAddress) { - return User.builder() - .firstName(firstName) - .lastName(lastName) - .emailAddress(emailAddress) - .build(); + return User.builder().firstName(firstName).lastName(lastName).emailAddress(emailAddress).build(); } private void makeSysAdmin(User user) { diff --git a/core/src/test/java/se/su/dsv/scipro/test/ForumBuilder.java b/core/src/test/java/se/su/dsv/scipro/test/ForumBuilder.java index 90d12f8b36..e2f4a96813 100644 --- a/core/src/test/java/se/su/dsv/scipro/test/ForumBuilder.java +++ b/core/src/test/java/se/su/dsv/scipro/test/ForumBuilder.java @@ -19,24 +19,14 @@ public class ForumBuilder { public ForumPost createPost(ForumThread forumThread) { ForumPost post = new ForumPost(); DomainObjects.injectId(post, ID++); - post.setPostedBy( - new UserBuilder() - .setFirstName("test") - .setLastName("test") - .setEmail("test@test.se") - .create() - ); + post.setPostedBy(new UserBuilder().setFirstName("test").setLastName("test").setEmail("test@test.se").create()); post.setForumThread(forumThread); post.setContent("Test content"); return post; } public ProjectThread createThread() { - ProjectType projectType = new ProjectType( - DegreeType.BACHELOR, - "Some project type", - "Some description" - ); + ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description"); Project project = Project.builder() .title("Some title") .projectType(projectType) diff --git a/core/src/test/java/se/su/dsv/scipro/test/InMemoryFileStore.java b/core/src/test/java/se/su/dsv/scipro/test/InMemoryFileStore.java index 4bee72a73a..52291710ad 100644 --- a/core/src/test/java/se/su/dsv/scipro/test/InMemoryFileStore.java +++ b/core/src/test/java/se/su/dsv/scipro/test/InMemoryFileStore.java @@ -14,10 +14,7 @@ public class InMemoryFileStore implements FileStore { @Override public void storeData(final FileDescription metadata, final InputStream data) { - final InputStream noNullData = Objects.requireNonNullElseGet( - data, - InputStream::nullInputStream - ); + final InputStream noNullData = Objects.requireNonNullElseGet(data, InputStream::nullInputStream); try { fileData.put(metadata, noNullData.readAllBytes()); } catch (IOException e) { diff --git a/core/src/test/java/se/su/dsv/scipro/test/Matchers.java b/core/src/test/java/se/su/dsv/scipro/test/Matchers.java index 1a2cba0f18..e1b125f7c5 100644 --- a/core/src/test/java/se/su/dsv/scipro/test/Matchers.java +++ b/core/src/test/java/se/su/dsv/scipro/test/Matchers.java @@ -10,10 +10,7 @@ public final class Matchers { public static <E, A> Matcher<Either<E, A>> isRight(Matcher<? super A> subMatcher) { return new TypeSafeDiagnosingMatcher<Either<E, A>>() { @Override - protected boolean matchesSafely( - final Either<E, A> item, - final Description mismatchDescription - ) { + protected boolean matchesSafely(final Either<E, A> item, final Description mismatchDescription) { return item.fold( e -> { mismatchDescription.appendText("Left(").appendValue(e).appendText(")"); @@ -41,10 +38,7 @@ public final class Matchers { public static <E, A> Matcher<Either<E, A>> isLeft(Matcher<? super E> subMatcher) { return new TypeSafeDiagnosingMatcher<Either<E, A>>() { @Override - protected boolean matchesSafely( - final Either<E, A> item, - final Description mismatchDescription - ) { + protected boolean matchesSafely(final Either<E, A> item, final Description mismatchDescription) { return item.fold( e -> { if (!subMatcher.matches(e)) { diff --git a/core/src/test/java/se/su/dsv/scipro/test/ObjectMother.java b/core/src/test/java/se/su/dsv/scipro/test/ObjectMother.java index 4683e71966..7b6fade493 100755 --- a/core/src/test/java/se/su/dsv/scipro/test/ObjectMother.java +++ b/core/src/test/java/se/su/dsv/scipro/test/ObjectMother.java @@ -18,11 +18,7 @@ import se.su.dsv.scipro.system.User; @Deprecated public class ObjectMother { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); public static final ProjectType MASTER = new ProjectType(DegreeType.MASTER, "Master", "Master"); public static final User SOME_USER = User.builder() .firstName("Kalle") @@ -34,9 +30,7 @@ public class ObjectMother { .title("Some title") .projectType(BACHELOR) .startDate(LocalDate.now()) - .headSupervisor( - User.builder().firstName("Foo").lastName("Bar").emailAddress("foo@dsv.su.se").build() - ) + .headSupervisor(User.builder().firstName("Foo").lastName("Bar").emailAddress("foo@dsv.su.se").build()) .build(); public static final Project SOME_MASTER_PROJECT = Project.builder() @@ -84,9 +78,7 @@ public class ObjectMother { "Bachelor", "[Bachelor thesis]" ); - public static final ApplicationPeriod APPLICATION_PERIOD = new ApplicationPeriod( - "[Test period]" - ); + public static final ApplicationPeriod APPLICATION_PERIOD = new ApplicationPeriod("[Test period]"); public static final Match MATCH = new Match(); static { @@ -155,32 +147,20 @@ public class ObjectMother { project.setProjectType(new ProjectType(ProjectType.BACHELOR, "Bachelor", "tt")); User headSupervisorUser = get_with_id( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(), + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(), 6L ); project.setHeadSupervisor(headSupervisorUser); User author1 = get_with_id( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(), + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(), 2L ); author1.setFirstName("Kalle"); author1.setLastName("Testare"); author1.setEmailAddress("kalle@dsv.su.se"); User author2 = get_with_id( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(), + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(), 3L ); SortedSet<User> authors = new TreeSet<>(new User.ByNameComparator()); @@ -189,29 +169,17 @@ public class ObjectMother { project.setProjectParticipants(authors); User reviewer1 = get_with_id( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(), + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(), 4L ); User reviewer2 = get_with_id( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(), + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(), 5L ); User cosupervisor1 = get_with_id( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(), + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(), 8L ); diff --git a/core/src/test/java/se/su/dsv/scipro/test/SeminarBuilder.java b/core/src/test/java/se/su/dsv/scipro/test/SeminarBuilder.java index bfb6ca23b6..16ff430e3e 100644 --- a/core/src/test/java/se/su/dsv/scipro/test/SeminarBuilder.java +++ b/core/src/test/java/se/su/dsv/scipro/test/SeminarBuilder.java @@ -18,11 +18,7 @@ public class SeminarBuilder { fileReference.setFileDescription(fileDescription); seminar.setDocument(fileReference); if (seminar.getProject() == null) { - ProjectType projectType = new ProjectType( - DegreeType.BACHELOR, - "Some project type", - "Some description" - ); + ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description"); Project project = Project.builder() .title("Some title") .projectType(projectType) diff --git a/core/src/test/java/se/su/dsv/scipro/test/SpringTest.java b/core/src/test/java/se/su/dsv/scipro/test/SpringTest.java index c30a2cad2a..2b68b55008 100644 --- a/core/src/test/java/se/su/dsv/scipro/test/SpringTest.java +++ b/core/src/test/java/se/su/dsv/scipro/test/SpringTest.java @@ -34,9 +34,7 @@ public abstract class SpringTest { AnnotationConfigApplicationContext annotationConfigApplicationContext = new AnnotationConfigApplicationContext(); annotationConfigApplicationContext.register(TestContext.class); - annotationConfigApplicationContext - .getBeanFactory() - .registerSingleton("entityManager", this.entityManager); + annotationConfigApplicationContext.getBeanFactory().registerSingleton("entityManager", this.entityManager); annotationConfigApplicationContext.refresh(); annotationConfigApplicationContext.getAutowireCapableBeanFactory().autowireBean(this); } diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java index 8de401bf29..6613b2e597 100755 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java @@ -80,10 +80,7 @@ public class ExternalImporterDaisyImpl implements ExternalImporter, UserImportSe @Override public Optional<User> importUser(final String userName) { try { - return client - .findByUsername(userName) - .filter(p -> p.getEmail() != null) - .map(this::importPerson); + return client.findByUsername(userName).filter(p -> p.getEmail() != null).map(this::importPerson); } catch (ClientErrorException e) { throw new ExternalImportException(e); } @@ -134,18 +131,10 @@ public class ExternalImporterDaisyImpl implements ExternalImporter, UserImportSe User supervisor = userService.findByExternalIdentifier(supervisorDTO.getId()); if (supervisor != null) { if (supervisor.getUnit() != null) { - LOGGER.info( - supervisor.getFullName() + - " is already attached to a unit and this is being overwritten." - ); + LOGGER.info(supervisor.getFullName() + " is already attached to a unit and this is being overwritten."); } se.su.dsv.scipro.system.Unit unitToAdd = unitService.findByIdentifier(unitDTO.getId()); - LOGGER.debug( - "Adding unit: " + - unitToAdd.getTitle() + - " to supervisor: " + - supervisor.getFullName() - ); + LOGGER.debug("Adding unit: " + unitToAdd.getTitle() + " to supervisor: " + supervisor.getFullName()); supervisor.setUnit(unitToAdd); } else { LOGGER.debug("Can't find supervisor: " + supervisorDTO.getId()); @@ -167,8 +156,7 @@ public class ExternalImporterDaisyImpl implements ExternalImporter, UserImportSe for (User supervisor : currentSupervisors) { if (!supervisorsWithRemoteUnit.contains(supervisor)) { LOGGER.debug( - supervisor.getFullName() + - " does not have a remote unit. Searching for local units to remove." + supervisor.getFullName() + " does not have a remote unit. Searching for local units to remove." ); supervisor.setUnit(null); LOGGER.debug("Removed units from: " + supervisor.getFullName()); @@ -185,20 +173,13 @@ public class ExternalImporterDaisyImpl implements ExternalImporter, UserImportSe if (!unitDTO.isClosed()) { se.su.dsv.scipro.system.Unit unit = unitService.findByIdentifier(unitDTO.getId()); if (unit == null) { - LOGGER.info( - "External unit: '" + unitDTO + "' has no local representation, creating" - ); + LOGGER.info("External unit: '" + unitDTO + "' has no local representation, creating"); unit = new se.su.dsv.scipro.system.Unit(); unit.setIdentifier(unitDTO.getId()); unit.setTitle(unitDTO.getName()); unitService.save(unit); } else if (!unit.getTitle().equals(unitDTO.getName())) { - LOGGER.info( - "Unit " + - unit.getTitle() + - " has changed name, renaming to: " + - unitDTO.getName() - ); + LOGGER.info("Unit " + unit.getTitle() + " has changed name, renaming to: " + unitDTO.getName()); unit.setTitle(unitDTO.getName()); } else { LOGGER.info("Unit " + unit.getTitle() + " already exists, skipping"); @@ -218,10 +199,7 @@ public class ExternalImporterDaisyImpl implements ExternalImporter, UserImportSe public void importSupervisorActiveStatus() { final UserService.Filter filter = new UserService.Filter(); filter.setRoles(Roles.SUPERVISOR); - final Iterable<User> supervisors = userService.findAll( - filter, - new PageRequest(0, Integer.MAX_VALUE) - ); + final Iterable<User> supervisors = userService.findAll(filter, new PageRequest(0, Integer.MAX_VALUE)); final List<Employee> employees = client.listEmployees(DSV); for (User supervisor : supervisors) { final boolean affiliatedWithDSV = employees diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java index dae747402c..0eca54eadf 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java @@ -52,32 +52,22 @@ public class ImporterTransactionsImpl implements ImporterTransactions { } @Override - public User importPerson( - Person person, - final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache - ) { - LOGGER.info( - "Importing person: {} {} ({})", - person.getFirstName(), - person.getLastName(), - person.getId() - ); + public User importPerson(Person person, final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache) { + LOGGER.info("Importing person: {} {} ({})", person.getFirstName(), person.getLastName(), person.getId()); User user = updatePersonData(person.getId(), person); importUsernames(person, user); importAuthorLevel(user, programCache); return user; } - private void importAuthorLevel( - final User user, - final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache - ) { + private void importAuthorLevel(final User user, final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache) { final Stream<Pair<Integer, Integer>> semesterPrograms = client .getProgramAdmissionsForStudent(user.getIdentifier()) .stream() .map(pa -> new Pair<>(pa.getAdmissionSemester(), pa.getProgram().getId())); - final List<CourseRegistration> courseRegistrations = - client.getCourseRegistrationsForStudent(user.getIdentifier()); + final List<CourseRegistration> courseRegistrations = client.getCourseRegistrationsForStudent( + user.getIdentifier() + ); final Stream<Pair<Integer, Integer>> registrationSemesters = courseRegistrations .stream() .filter(cr -> cr.getProgramId() != null) @@ -114,14 +104,9 @@ public class ImporterTransactionsImpl implements ImporterTransactions { }; } - private Optional<DegreeType> getOverrideBasedOnCourse( - List<CourseRegistration> courseRegistrations - ) { + private Optional<DegreeType> getOverrideBasedOnCourse(List<CourseRegistration> courseRegistrations) { for (CourseRegistration courseRegistration : courseRegistrations) { - if ( - courseRegistration.getCourseId() == ML304C_ID && - courseRegistration.getProgramId() == null - ) { + if (courseRegistration.getCourseId() == ML304C_ID && courseRegistration.getProgramId() == null) { return Optional.of(DegreeType.MASTER); } } @@ -130,20 +115,14 @@ public class ImporterTransactionsImpl implements ImporterTransactions { @Override @Transactional - public User importStudent( - Person person, - final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache - ) { + public User importStudent(Person person, final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache) { User user = importPerson(person, programCache); importProgramsAndMakeStudent(person, user, programCache); return user; } @Override - public User importSupervisor( - Person person, - final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache - ) { + public User importSupervisor(Person person, final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache) { User user = importPerson(person, programCache); importResearchAreasAndMakeSupervisor(person, user); return user; @@ -156,9 +135,7 @@ public class ImporterTransactionsImpl implements ImporterTransactions { ) { Response response = client.getStudent(person.getId()); if (response.getStatus() == Response.Status.OK.getStatusCode()) { - se.su.dsv.scipro.io.dto.Student student = response.readEntity( - se.su.dsv.scipro.io.dto.Student.class - ); + se.su.dsv.scipro.io.dto.Student student = response.readEntity(se.su.dsv.scipro.io.dto.Student.class); for (StudentProgramAdmission admission : client.getProgramAdmissionsForStudent( student.getPerson().getId() )) { @@ -169,10 +146,7 @@ public class ImporterTransactionsImpl implements ImporterTransactions { } } - private Program importProgram( - Integer id, - final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache - ) { + private Program importProgram(Integer id, final Map<Integer, se.su.dsv.scipro.io.dto.Program> programCache) { se.su.dsv.scipro.io.dto.Program program = getProgram(id, programCache); return programService.updateExternalProgram( program.getId(), @@ -208,12 +182,11 @@ public class ImporterTransactionsImpl implements ImporterTransactions { .filter(ResearchArea::isActive) .toList(); for (ResearchArea daisyResearchArea : researchAreas) { - se.su.dsv.scipro.system.ResearchArea researchArea = - researchAreaService.updateExternalResearchArea( - daisyResearchArea.getId(), - daisyResearchArea.getNameEn(), - daisyResearchArea.isActive() - ); + se.su.dsv.scipro.system.ResearchArea researchArea = researchAreaService.updateExternalResearchArea( + daisyResearchArea.getId(), + daisyResearchArea.getNameEn(), + daisyResearchArea.isActive() + ); employee.addResearchArea(researchArea); } employee @@ -262,10 +235,7 @@ public class ImporterTransactionsImpl implements ImporterTransactions { @Override public void importProject(Thesis thesis) { - if ( - thesis.getLevel() == EducationalLevel.FIRST_CYCLE || - thesis.getLevel() == EducationalLevel.SECOND_CYCLE - ) { + if (thesis.getLevel() == EducationalLevel.FIRST_CYCLE || thesis.getLevel() == EducationalLevel.SECOND_CYCLE) { LOGGER.info("Importing project: {} ({})", thesis.getTitle(), thesis.getId()); Set<AuthorProjectParticipant> authors = client.getAuthors(thesis.getId()); Project project = convertProjectAndSave(thesis); diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java index eae80c86b6..ac3916fd07 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java @@ -29,11 +29,7 @@ class DaisyConsentService implements PublishingConsentService { case PUBLISH_INTERNALLY -> PublishingConsentLevel.PUBLISH_INTERNALLY; case PUBLISH -> PublishingConsentLevel.PUBLIC; }; - return daisyAPI.setPublishingConsent( - project.getIdentifier(), - author.getIdentifier(), - publishingConsentLevel - ); + return daisyAPI.setPublishingConsent(project.getIdentifier(), author.getIdentifier(), publishingConsentLevel); } @Override @@ -42,8 +38,10 @@ class DaisyConsentService implements PublishingConsentService { return UNAVAILABLE; } try { - final se.su.dsv.scipro.io.dto.PublishingConsent publishingConsent = - daisyAPI.getPublishingConsent(project.getIdentifier(), author.getIdentifier()); + final se.su.dsv.scipro.io.dto.PublishingConsent publishingConsent = daisyAPI.getPublishingConsent( + project.getIdentifier(), + author.getIdentifier() + ); final Level selected = fromDaisyLevel(publishingConsent.getSelected()); final List<Level> available = publishingConsent .getAvailables() diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java index f6079d9d9e..9956543fb5 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java @@ -154,12 +154,7 @@ public class DaisyIntegrationConfiguration implements PluginConfiguration { EventBus eventBus, UserService userService ) { - return new GradingCompletedMilestoneActivator( - projectService, - daisyApi, - eventBus, - userService - ); + return new GradingCompletedMilestoneActivator(projectService, daisyApi, eventBus, userService); } @Bean @@ -196,12 +191,7 @@ public class DaisyIntegrationConfiguration implements PluginConfiguration { UserService userService, UnitService unitService ) { - return new ExternalImporterDaisyImpl( - userService, - unitService, - daisyApi, - importerTransactions - ); + return new ExternalImporterDaisyImpl(userService, unitService, daisyApi, importerTransactions); } @Bean @@ -215,10 +205,7 @@ public class DaisyIntegrationConfiguration implements PluginConfiguration { } @Bean - public DaisyUserSearchService daisyUserSearchService( - DaisyAPI daisyApi, - UserService userService - ) { + public DaisyUserSearchService daisyUserSearchService(DaisyAPI daisyApi, UserService userService) { return new DaisyUserSearchService(daisyApi, userService); } diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java index d70fd174da..ad9a87d6d0 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java @@ -34,11 +34,7 @@ public class DaisyUserSearchService implements UserSearchProvider { } @Override - public Collection<User> search( - final String term, - final Set<Roles> role, - final long maxResults - ) { + public Collection<User> search(final String term, final Set<Roles> role, final long maxResults) { if (term != null && term.length() >= 6) { try { return daisyAPI diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java index d147b4b343..72b8c84b40 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java @@ -19,10 +19,7 @@ public class DaisyWorkerInitialization { Provider<ImportNationalCategories> importNationalCategories ) { scheduler.schedule("Export projects to daisy").runBy(projectExporter).dailyAt(1, 0); - scheduler - .schedule("Remote supervisor (and projects) bulk import") - .runBy(userImportWorker) - .dailyAt(1, 30); + scheduler.schedule("Remote supervisor (and projects) bulk import").runBy(userImportWorker).dailyAt(1, 30); scheduler.schedule("Mark projects as completed").runBy(projectFinalizer).dailyAt(2, 0); scheduler .schedule("Mark the 'grading completed' milestone as completed") @@ -32,9 +29,6 @@ public class DaisyWorkerInitialization { .schedule("Reject thesis based on examiner rejection in Daisy") .runBy(rejectedThesisWorkerProvider) .every(5, TimeUnit.MINUTES); - scheduler - .schedule("Import national subject categories") - .runBy(importNationalCategories) - .dailyAt(3, 0); + scheduler.schedule("Import national subject categories").runBy(importNationalCategories).dailyAt(3, 0); } } diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java index b8811484a6..be10731801 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java @@ -16,9 +16,7 @@ import se.su.dsv.scipro.system.User; class SyncReviewerWithDaisy { - private static final System.Logger LOGGER = System.getLogger( - SyncReviewerWithDaisy.class.getName() - ); + private static final System.Logger LOGGER = System.getLogger(SyncReviewerWithDaisy.class.getName()); private final DaisyAPI daisyAPI; @@ -37,9 +35,7 @@ class SyncReviewerWithDaisy { } try { - Set<ProjectParticipant> contributors = daisyAPI.getContributors( - project.getIdentifier() - ); + Set<ProjectParticipant> contributors = daisyAPI.getContributors(project.getIdentifier()); for (ProjectParticipant contributor : contributors) { if ( Objects.equals(contributor.getPerson().getId(), reviewer.getIdentifier()) && @@ -51,10 +47,7 @@ class SyncReviewerWithDaisy { for (ProjectParticipant contributor : contributors) { if (Objects.equals(Role.REVIEWER, contributor.getRole())) { - daisyAPI.deleteThesisPerson( - project.getIdentifier(), - contributor.getPerson().getId() - ); + daisyAPI.deleteThesisPerson(project.getIdentifier(), contributor.getPerson().getId()); } } diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java index c11d58dd0a..769507253b 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java @@ -24,9 +24,7 @@ import se.su.dsv.scipro.workerthreads.AbstractWorker; @Named public class GradingCompletedMilestoneActivator extends AbstractWorker { - private static final Logger LOG = LoggerFactory.getLogger( - GradingCompletedMilestoneActivator.class - ); + private static final Logger LOG = LoggerFactory.getLogger(GradingCompletedMilestoneActivator.class); private final ProjectService projectService; private final DaisyAPI daisyAPI; @@ -50,16 +48,12 @@ public class GradingCompletedMilestoneActivator extends AbstractWorker { protected void doWork() { beginTransaction(); Iterable<Project> projects = projectService.findAll( - QProject.project.projectStatus - .eq(ProjectStatus.ACTIVE) - .and(QProject.project.identifier.isNotNull()) + QProject.project.projectStatus.eq(ProjectStatus.ACTIVE).and(QProject.project.identifier.isNotNull()) ); for (Project project : projects) { try { - Set<AuthorProjectParticipant> participatingAuthors = daisyAPI.getAuthors( - project.getIdentifier() - ); + Set<AuthorProjectParticipant> participatingAuthors = daisyAPI.getAuthors(project.getIdentifier()); for (AuthorProjectParticipant participatingAuthor : participatingAuthors) { Course course = participatingAuthor.getCourse(); Optional<String> grade = daisyAPI.getGradeForStudentInCourse( @@ -67,25 +61,16 @@ public class GradingCompletedMilestoneActivator extends AbstractWorker { course.getId() ); if (grade.isPresent()) { - User user = userService.findByExternalIdentifier( - participatingAuthor.getPerson().getId() - ); + User user = userService.findByExternalIdentifier(participatingAuthor.getPerson().getId()); eventBus.post(new GradingCompletedEvent(project, user)); } } } catch (NotFoundException ignored) { - LOG.warn( - "The project {} has been removed from Daisy, severing the connection", - project - ); + LOG.warn("The project {} has been removed from Daisy, severing the connection", project); } catch (WebApplicationException e) { LOG.info("Could not fetch authors grades from Daisy for project {}", project, e); } catch (Exception e) { - LOG.error( - "Failed to make 'grading completed' milestone as completed for project ({})", - project, - e - ); + LOG.error("Failed to make 'grading completed' milestone as completed for project ({})", project, e); } } commitTransaction(); diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java index a210f3a1be..7ba4f4989e 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java @@ -17,10 +17,7 @@ public class ImportNationalCategories extends AbstractWorker { private final NationalSubjectCategoryService nationalSubjectCategoryService; @Inject - public ImportNationalCategories( - DaisyAPI daisyAPI, - NationalSubjectCategoryService nationalSubjectCategoryService - ) { + public ImportNationalCategories(DaisyAPI daisyAPI, NationalSubjectCategoryService nationalSubjectCategoryService) { this.daisyAPI = daisyAPI; this.nationalSubjectCategoryService = nationalSubjectCategoryService; } @@ -29,8 +26,9 @@ public class ImportNationalCategories extends AbstractWorker { protected void doWork() { List<ResearchSubject> nationalResearchSubjects = daisyAPI.getNationalResearchSubjects(DSV); for (ResearchSubject researchSubject : nationalResearchSubjects) { - Optional<NationalSubjectCategory> nationalSubjectCategory = - nationalSubjectCategoryService.findByExternalId(researchSubject.getExternalID()); + Optional<NationalSubjectCategory> nationalSubjectCategory = nationalSubjectCategoryService.findByExternalId( + researchSubject.getExternalID() + ); if (nationalSubjectCategory.isEmpty()) { NationalSubjectCategory newSubjectCategory = new NationalSubjectCategory(); newSubjectCategory.setExternalId(researchSubject.getExternalID()); diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java index 5e3b411167..19a59106b5 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java @@ -98,9 +98,7 @@ public class ProjectExporter extends AbstractWorker { if (project.getIdentifier() == null) { createProject(project); } else { - final Optional<FinalThesis> finalThesis = Optional.ofNullable( - finalThesisService.findByProject(project) - ); + final Optional<FinalThesis> finalThesis = Optional.ofNullable(finalThesisService.findByProject(project)); updateProjectData(project, finalThesis); updateAuthors(project); updateHeadSupervisor(project); @@ -120,12 +118,7 @@ public class ProjectExporter extends AbstractWorker { ); updateOpponents( project.getIdentifier(), - finalSeminar - .getOppositions() - .stream() - .filter(isApproved()) - .map(toUser()) - .filter(onlyDaisyUsers()) + finalSeminar.getOppositions().stream().filter(isApproved()).map(toUser()).filter(onlyDaisyUsers()) ); } } @@ -151,11 +144,7 @@ public class ProjectExporter extends AbstractWorker { updateParticipations(projectId, participants, Role.ACTIVE_PARTICIPANT); } - private void updateParticipations( - final Integer projectId, - final Stream<User> users, - final Role role - ) { + private void updateParticipations(final Integer projectId, final Stream<User> users, final Role role) { final Set<ProjectParticipant> participants = daisyAPI.getContributors(projectId); users.forEach(user -> { if (!isParticipant(user, role, participants)) { @@ -169,17 +158,12 @@ public class ProjectExporter extends AbstractWorker { }); } - private boolean isParticipant( - final User user, - final Role role, - final Set<ProjectParticipant> contributors - ) { + private boolean isParticipant(final User user, final Role role, final Set<ProjectParticipant> contributors) { return contributors .stream() .anyMatch( contributor -> - contributor.getRole() == role && - contributor.getPerson().getId().equals(user.getIdentifier()) + contributor.getRole() == role && contributor.getPerson().getId().equals(user.getIdentifier()) ); } @@ -209,12 +193,8 @@ public class ProjectExporter extends AbstractWorker { String title = finalThesis .map(FinalThesis::getSwedishTitle) - .orElseGet(() -> - finalThesis.map(FinalThesis::getEnglishTitle).orElseGet(project::getTitle) - ); - String englishTitle = finalThesis - .map(FinalThesis::getEnglishTitle) - .orElseGet(daisyThesis::getTitleEn); + .orElseGet(() -> finalThesis.map(FinalThesis::getEnglishTitle).orElseGet(project::getTitle)); + String englishTitle = finalThesis.map(FinalThesis::getEnglishTitle).orElseGet(daisyThesis::getTitleEn); ThesisToBeUpdated thesis = new ThesisToBeUpdated(); thesis.setTitle(truncate(title)); @@ -224,9 +204,7 @@ public class ProjectExporter extends AbstractWorker { thesis.setStartDate(startDate); thesis.setEndDate(SciProUtilities.toCalendar(project.getExpectedEndDate())); final ResearchAreas researchAreas = new ResearchAreas(); - if ( - project.getResearchArea() != null && project.getResearchArea().getIdentifier() != null - ) { + if (project.getResearchArea() != null && project.getResearchArea().getIdentifier() != null) { final ResearchAreaWithID researchArea2 = new ResearchAreaWithID(); researchArea2.setId(project.getResearchArea().getIdentifier()); researchAreas.getResearchAreas().add(researchArea2); @@ -237,9 +215,7 @@ public class ProjectExporter extends AbstractWorker { } private static String truncate(String projectTitle) { - return projectTitle.length() > MAX_TITLE_LENGTH - ? projectTitle.substring(0, MAX_TITLE_LENGTH) - : projectTitle; + return projectTitle.length() > MAX_TITLE_LENGTH ? projectTitle.substring(0, MAX_TITLE_LENGTH) : projectTitle; } private void updateAuthors(Project project) throws ExternalExportException { @@ -256,10 +232,7 @@ public class ProjectExporter extends AbstractWorker { } } - private boolean authorIsMissing( - Integer identifier, - Iterable<AuthorProjectParticipant> authors - ) { + private boolean authorIsMissing(Integer identifier, Iterable<AuthorProjectParticipant> authors) { for (AuthorProjectParticipant author : authors) { if (author.getPerson().getId().equals(identifier)) { return false; @@ -282,27 +255,15 @@ public class ProjectExporter extends AbstractWorker { Set<ProjectParticipant> contributors = daisyAPI.getContributors(project.getIdentifier()); for (ProjectParticipant contributor : contributors) { if (contributor.getRole() == Role.SUPERVISOR) { - if ( - contributor - .getPerson() - .getId() - .equals(project.getHeadSupervisor().getIdentifier()) - ) { + if (contributor.getPerson().getId().equals(project.getHeadSupervisor().getIdentifier())) { add = false; } else { - daisyAPI.deleteThesisPerson( - project.getIdentifier(), - contributor.getPerson().getId() - ); + daisyAPI.deleteThesisPerson(project.getIdentifier(), contributor.getPerson().getId()); } } } if (add) { - externalExporter.addContributorToProject( - project, - project.getHeadSupervisor(), - Role.SUPERVISOR - ); + externalExporter.addContributorToProject(project, project.getHeadSupervisor(), Role.SUPERVISOR); } } @@ -313,10 +274,7 @@ public class ProjectExporter extends AbstractWorker { contributor.getRole() == Role.REVIEWER && reviewerIsRemoved(contributor.getPerson().getId(), project.getReviewers()) ) { - daisyAPI.deleteThesisPerson( - project.getIdentifier(), - contributor.getPerson().getId() - ); + daisyAPI.deleteThesisPerson(project.getIdentifier(), contributor.getPerson().getId()); } } for (User reviewer : project.getReviewers()) { @@ -354,19 +312,12 @@ public class ProjectExporter extends AbstractWorker { contributor.getRole() == Role.ASSISTANT_SUPERVISOR && coSupervisorIsRemoved(contributor.getPerson().getId(), project.getCoSupervisors()) ) { - daisyAPI.deleteThesisPerson( - project.getIdentifier(), - contributor.getPerson().getId() - ); + daisyAPI.deleteThesisPerson(project.getIdentifier(), contributor.getPerson().getId()); } } for (User coSupervisor : project.getCoSupervisors()) { if (coSupervisorIsMissing(coSupervisor, contributors)) { - externalExporter.addContributorToProject( - project, - coSupervisor, - Role.ASSISTANT_SUPERVISOR - ); + externalExporter.addContributorToProject(project, coSupervisor, Role.ASSISTANT_SUPERVISOR); } } } diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java index 4e4e049b45..26ebd3813b 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java @@ -37,9 +37,7 @@ public class ProjectFinalizer extends AbstractWorker { @Override protected void doWork() { - Iterable<Project> projects = projectService.findAll( - QProject.project.projectStatus.eq(ProjectStatus.ACTIVE) - ); + Iterable<Project> projects = projectService.findAll(QProject.project.projectStatus.eq(ProjectStatus.ACTIVE)); for (Project project : projects) { beginTransaction(); try { diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java index 92ae455aab..ab796585ec 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java @@ -45,14 +45,10 @@ public class RejectedThesisWorker extends AbstractWorker { @Override protected void doWork() { - final List<ThesisRejection> rejections = daisyAPI.getRejectedThesisSince( - getLastSuccessfulRun() - ); + final List<ThesisRejection> rejections = daisyAPI.getRejectedThesisSince(getLastSuccessfulRun()); for (ThesisRejection thesisRejection : rejections) { final Date rejectedDate = thesisRejection.getRejected().getTime(); - final Project project = projectService.findByExternalIdentifier( - thesisRejection.getThesisId().intValue() - ); + final Project project = projectService.findByExternalIdentifier(thesisRejection.getThesisId().intValue()); if (project != null) { final List<SupervisorGradingReport> supervisorGradingReports = gradingReportService.getSupervisorGradingReports(project); @@ -72,10 +68,7 @@ public class RejectedThesisWorker extends AbstractWorker { finalThesisService.reject(project, thesisRejection.getMessage()); } // Check dates here since the API call is only date-based rather than time as well. - if ( - thesisRejection.isVisibleToAuthors() && - rejectedDate.after(getLastSuccessfulRun()) - ) { + if (thesisRejection.isVisibleToAuthors() && rejectedDate.after(getLastSuccessfulRun())) { projectForumService.createThread( project, null, diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java index b18ef7b544..77845ced07 100755 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java @@ -63,9 +63,7 @@ public class UserImportWorker extends AbstractWorker { @Override protected void doWork() { long startDate = System.currentTimeMillis(); - LOGGER.info( - "Starting execution for scheduled remote user import of all remote supervisors" - ); + LOGGER.info("Starting execution for scheduled remote user import of all remote supervisors"); final Map<Integer, Program> programCache = new HashMap<>(); importResearchAreas(); @@ -110,27 +108,18 @@ public class UserImportWorker extends AbstractWorker { } } else { for (Username username : user.getUsernames()) { - Optional<Person> usernamePerson = daisyAPI.findByUsername( - username.getUsername() - ); + Optional<Person> usernamePerson = daisyAPI.findByUsername(username.getUsername()); if (usernamePerson.isPresent()) { User duplicatedUser = userService.findByExternalIdentifier( usernamePerson.get().getId() ); if (duplicatedUser != null) { - LOGGER.info( - "User {} ({}) already exist in SciPro", - user, - user.getIdentifier() - ); + LOGGER.info("User {} ({}) already exist in SciPro", user, user.getIdentifier()); mergeService.mergeUsers(user, duplicatedUser); } else { user.setIdentifier(usernamePerson.get().getId()); userService.save(user); - importerTransactions.importPerson( - usernamePerson.get(), - programCache - ); + importerTransactions.importPerson(usernamePerson.get(), programCache); } break; } @@ -158,10 +147,7 @@ public class UserImportWorker extends AbstractWorker { if (supervisor.getEmail() != null) { importerTransactions.importSupervisor(supervisor, programCache); } else { - LOGGER.info( - "Skipping supervisor because of no e-mail in Daisy: {}", - supervisor - ); + LOGGER.info("Skipping supervisor because of no e-mail in Daisy: {}", supervisor); } importAllProjectsForSupervisor(supervisor); } catch (RuntimeException e) { @@ -183,12 +169,7 @@ public class UserImportWorker extends AbstractWorker { try { importProject(project); } catch (RuntimeException e) { - LOGGER.error( - "Failed to import project: {} ({})", - project.getTitle(), - project.getId(), - e - ); + LOGGER.error("Failed to import project: {} ({})", project.getTitle(), project.getId(), e); } } } @@ -198,28 +179,17 @@ public class UserImportWorker extends AbstractWorker { importerTransactions.importProject(project); } - private void importPotentialNewStudentsAndUpdatePrograms( - final Map<Integer, Program> programCache - ) { + private void importPotentialNewStudentsAndUpdatePrograms(final Map<Integer, Program> programCache) { // clear all attached entities due to performance concerns entityManagerProvider.get().clear(); final List<Program> programs = daisyAPI.getPrograms(DSV); programs.forEach(program -> programCache.put(program.getId(), program)); for (Program program : programs) { for (Semester admissionSemester : getAdmissionSemestersToImport()) { - LOGGER.info( - "Checking for newly admitted students on {} ({})", - program.getCode(), - admissionSemester - ); - List<ProgramAdmission> admissions = daisyAPI.getProgramAdmissions( - program, - admissionSemester - ); + LOGGER.info("Checking for newly admitted students on {} ({})", program.getCode(), admissionSemester); + List<ProgramAdmission> admissions = daisyAPI.getProgramAdmissions(program, admissionSemester); for (ProgramAdmission admission : admissions) { - final User user = userService.findByExternalIdentifier( - admission.getStudentId() - ); + final User user = userService.findByExternalIdentifier(admission.getStudentId()); if (user == null) { daisyAPI .findPersonById(admission.getStudentId()) @@ -234,9 +204,7 @@ public class UserImportWorker extends AbstractWorker { ) .filter(person -> person.getEmail() != null) .peek(person -> LOGGER.info("Email set - importing")) - .forEach(person1 -> - importerTransactions.importStudent(person1, programCache) - ); + .forEach(person1 -> importerTransactions.importStudent(person1, programCache)); } else { final boolean needsProgramConnection = user .getPrograms() @@ -244,13 +212,12 @@ public class UserImportWorker extends AbstractWorker { .map(se.su.dsv.scipro.system.Program::getExternalId) .noneMatch(admission.getProgramId()::equals); if (needsProgramConnection) { - final se.su.dsv.scipro.system.Program sciproProgram = - programService.updateExternalProgram( - program.getId(), - program.getName(), - program.getNameEn(), - program.getCode() - ); + final se.su.dsv.scipro.system.Program sciproProgram = programService.updateExternalProgram( + program.getId(), + program.getName(), + program.getNameEn(), + program.getCode() + ); user.addProgram(sciproProgram); userService.save(user); } diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java index a8080c8734..90aaca25c2 100755 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java @@ -40,8 +40,7 @@ public class ExternalExporterDaisyImpl implements ExternalExporter { } @Override - public void createProject(final Project project, final Unit unit) - throws ExternalExportException { + public void createProject(final Project project, final Unit unit) throws ExternalExportException { UnitWithID unitDTO = new UnitWithID(); unitDTO.setId(unit.getIdentifier()); @@ -52,9 +51,7 @@ public class ExternalExporterDaisyImpl implements ExternalExporter { exportProjectDTO.setEndDate(SciProUtilities.toCalendar(project.getExpectedEndDate())); exportProjectDTO.setUnit(unitDTO); final ResearchAreas researchAreas = new ResearchAreas(); - if ( - project.getResearchArea() != null && project.getResearchArea().getIdentifier() != null - ) { + if (project.getResearchArea() != null && project.getResearchArea().getIdentifier() != null) { final ResearchAreaWithID researchArea2 = new ResearchAreaWithID(); researchArea2.setId(project.getResearchArea().getIdentifier()); researchAreas.getResearchAreas().add(researchArea2); @@ -76,17 +73,12 @@ public class ExternalExporterDaisyImpl implements ExternalExporter { project, response.getLocation() ); - throw new ExternalExportException( - "Failed to extract external identifier from response", - ex - ); + throw new ExternalExportException("Failed to extract external identifier from response", ex); } } private static String truncate(String projectTitle) { - return projectTitle.length() > MAX_TITLE_LENGTH - ? projectTitle.substring(0, MAX_TITLE_LENGTH) - : projectTitle; + return projectTitle.length() > MAX_TITLE_LENGTH ? projectTitle.substring(0, MAX_TITLE_LENGTH) : projectTitle; } private EducationalLevel toDaisyLevel(Project project) { @@ -120,8 +112,7 @@ public class ExternalExporterDaisyImpl implements ExternalExporter { } @Override - public void addContributorToProject(Project project, User user, Role role) - throws ExternalExportException { + public void addContributorToProject(Project project, User user, Role role) throws ExternalExportException { Person personDTO = new Person(); personDTO.setId(user.getIdentifier()); diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java index f587de8cb1..ea13a62418 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java @@ -71,9 +71,7 @@ public class GradingCompletedMilestoneActivatorTest { when( projectService.findAll( - QProject.project.projectStatus - .eq(ProjectStatus.ACTIVE) - .and(QProject.project.identifier.isNotNull()) + QProject.project.projectStatus.eq(ProjectStatus.ACTIVE).and(QProject.project.identifier.isNotNull()) ) ).thenReturn(projects); @@ -87,9 +85,7 @@ public class GradingCompletedMilestoneActivatorTest { participants.add(studentProjectParticipant); when(daisyAPI.getAuthors(anyInt())).thenReturn(participants); - when(daisyAPI.getGradeForStudentInCourse(anyLong(), anyInt())).thenReturn( - Optional.of("grade") - ); + when(daisyAPI.getGradeForStudentInCourse(anyLong(), anyInt())).thenReturn(Optional.of("grade")); } @Test diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java index d3c9ce1546..1cfcf78361 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java @@ -69,19 +69,11 @@ public class ProjectExporterTest { Unit unit = new Unit(); unit.setIdentifier(239478); - User supervisor = User.builder() - .firstName("Foo") - .lastName("Bar") - .emailAddress("foo@bar.com") - .build(); + User supervisor = User.builder().firstName("Foo").lastName("Bar").emailAddress("foo@bar.com").build(); supervisor.setIdentifier(SUPERVISOR_IDENTIFIER); supervisor.setUnit(unit); - author = User.builder() - .firstName("First name") - .lastName("Last name") - .emailAddress("foo@bar.com") - .build(); + author = User.builder().firstName("First name").lastName("Last name").emailAddress("foo@bar.com").build(); author.setIdentifier(AUTHOR_IDENTIFIER); author.setId(234L); @@ -102,9 +94,7 @@ public class ProjectExporterTest { .identifier(8) .build(); - when(projectRepo.findAll(any(Predicate.class))).thenReturn( - Arrays.asList(newProject, exportedProject) - ); + when(projectRepo.findAll(any(Predicate.class))).thenReturn(Arrays.asList(newProject, exportedProject)); when(daisyAPI.getThesis(anyInt())).thenReturn(Optional.of(new Thesis())); } @@ -131,9 +121,7 @@ public class ProjectExporterTest { person.setId(5454); AuthorProjectParticipant author = new AuthorProjectParticipant(); author.setPerson(person); - when(daisyAPI.getAuthors(exportedProject.getIdentifier())).thenReturn( - Collections.singleton(author) - ); + when(daisyAPI.getAuthors(exportedProject.getIdentifier())).thenReturn(Collections.singleton(author)); projectExporter.run(); @@ -143,9 +131,7 @@ public class ProjectExporterTest { @Test public void adds_new_author() throws Exception { exportedProject.addProjectParticipant(author); - when(daisyAPI.getAuthors(exportedProject.getIdentifier())).thenReturn( - Collections.emptySet() - ); + when(daisyAPI.getAuthors(exportedProject.getIdentifier())).thenReturn(Collections.emptySet()); projectExporter.run(); @@ -173,30 +159,19 @@ public class ProjectExporterTest { @Test public void adds_missing_co_supervisor_to_project() throws Exception { - User user = User.builder() - .firstName("co") - .lastName("supervisor") - .emailAddress("co@supervisor.com") - .build(); + User user = User.builder().firstName("co").lastName("supervisor").emailAddress("co@supervisor.com").build(); user.setIdentifier(789); user.setId(7890L); exportedProject.addCoSupervisor(user); projectExporter.run(); - verify(externalExporter).addContributorToProject( - exportedProject, - user, - Role.ASSISTANT_SUPERVISOR - ); + verify(externalExporter).addContributorToProject(exportedProject, user, Role.ASSISTANT_SUPERVISOR); } private static void assertSameData(Project project, ThesisToBeUpdated thesis) { assertEquals(project.getTitle(), thesis.getTitle()); assertEquals(project.getProjectStatus() == ProjectStatus.INACTIVE, thesis.isAborted()); - assertEquals( - project.getHeadSupervisor().getUnit().getIdentifier(), - thesis.getUnit().getId() - ); + assertEquals(project.getHeadSupervisor().getUnit().getIdentifier(), thesis.getUnit().getId()); } } diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java index cb175cbda2..133616e85a 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java @@ -40,11 +40,7 @@ public class ProjectFinalizerTest { @BeforeEach public void setup() { - projectFinalizer = new ProjectFinalizer( - projectService, - daisyAPI, - thesisApprovedHistoryService - ); + projectFinalizer = new ProjectFinalizer(projectService, daisyAPI, thesisApprovedHistoryService); projectFinalizer.setTxManager(workerTransactionManager); projectFinalizer.setWorkerDataService(workerDataService); when(workerDataService.save(any(WorkerData.class))).thenReturn(new WorkerData()); @@ -53,9 +49,7 @@ public class ProjectFinalizerTest { project.setIdentifier(234); project.setProjectStatus(ProjectStatus.ACTIVE); List<Project> projects = Collections.singletonList(project); - when( - projectService.findAll(QProject.project.projectStatus.eq(ProjectStatus.ACTIVE)) - ).thenReturn(projects); + when(projectService.findAll(QProject.project.projectStatus.eq(ProjectStatus.ACTIVE))).thenReturn(projects); Thesis thesis = new Thesis(); thesis.setStatus(STATUS.FINISHED); diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java index c8d85fc9a8..6789af1f8f 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java @@ -146,20 +146,11 @@ public class UserImportWorkerTest { } private User sciproUser() { - return User.builder() - .firstName("SciPro") - .lastName("User") - .emailAddress("scipro@dsv.su.se") - .build(); + return User.builder().firstName("SciPro").lastName("User").emailAddress("scipro@dsv.su.se").build(); } private User daisyUser() { - return User.builder() - .firstName("Daisy") - .lastName("User") - .emailAddress("daisy@dsv.su.se") - .identifier(8) - .build(); + return User.builder().firstName("Daisy").lastName("User").emailAddress("daisy@dsv.su.se").identifier(8).build(); } private void mockSupervisorProjects(Person supervisor, Thesis... theses) { diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java index 776ff3dae5..930ec58dc6 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java @@ -27,11 +27,7 @@ import se.su.dsv.scipro.system.Unit; @ExtendWith(MockitoExtension.class) public class ExternalExporterDaisyImplTest { - private static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + private static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); @Mock private DaisyAPI daisyAPI; @@ -51,11 +47,7 @@ public class ExternalExporterDaisyImplTest { public void truncates_title_length_if_too_long() throws Exception { String title = "a".repeat(ExternalExporterDaisyImpl.MAX_TITLE_LENGTH); String longerTitle = title + "more title"; - Project project = Project.builder() - .title(longerTitle) - .projectType(BACHELOR) - .startDate(LocalDate.now()) - .build(); + Project project = Project.builder().title(longerTitle).projectType(BACHELOR).startDate(LocalDate.now()).build(); final Unit unit = new Unit(); unit.setIdentifier(4); @@ -70,11 +62,7 @@ public class ExternalExporterDaisyImplTest { @Test public void application_period_start_date_on_project_to_be_exported() throws Exception { LocalDate daisyStartDate = LocalDate.now(); - Project project = Project.builder() - .title("hej") - .projectType(BACHELOR) - .startDate(daisyStartDate) - .build(); + Project project = Project.builder().title("hej").projectType(BACHELOR).startDate(daisyStartDate).build(); final Unit unit = new Unit(); unit.setIdentifier(8); diff --git a/view/src/main/java/se/su/dsv/scipro/FileSystemStore.java b/view/src/main/java/se/su/dsv/scipro/FileSystemStore.java index c4f4d3b10e..ad9f851ece 100644 --- a/view/src/main/java/se/su/dsv/scipro/FileSystemStore.java +++ b/view/src/main/java/se/su/dsv/scipro/FileSystemStore.java @@ -54,14 +54,12 @@ public class FileSystemStore implements FileStore { } private static Path getPath(final FileDescription metadata) { - return FileSystems.getDefault() - .getPath(FILE_ROOT, getSubdirectory(metadata), Long.toString(metadata.getId())); + return FileSystems.getDefault().getPath(FILE_ROOT, getSubdirectory(metadata), Long.toString(metadata.getId())); } private static String getSubdirectory(final FileDescription metaData) { return Long.toString( - (metaData.getId() / FILES_PER_SUBDIRECTORY) * FILES_PER_SUBDIRECTORY + - FILES_PER_SUBDIRECTORY + (metaData.getId() / FILES_PER_SUBDIRECTORY) * FILES_PER_SUBDIRECTORY + FILES_PER_SUBDIRECTORY ); } diff --git a/view/src/main/java/se/su/dsv/scipro/HomePage.java b/view/src/main/java/se/su/dsv/scipro/HomePage.java index 831ecccccb..b93e1d9f41 100755 --- a/view/src/main/java/se/su/dsv/scipro/HomePage.java +++ b/view/src/main/java/se/su/dsv/scipro/HomePage.java @@ -63,16 +63,12 @@ public class HomePage extends MenuPage { private boolean isSysAdmin() { return ( - SciProSession.get().authorizedForRole(Roles.SYSADMIN) && - SciProSession.get().hasActualRole(Roles.SYSADMIN) + SciProSession.get().authorizedForRole(Roles.SYSADMIN) && SciProSession.get().hasActualRole(Roles.SYSADMIN) ); } private boolean isAdmin() { - return ( - SciProSession.get().authorizedForRole(Roles.ADMIN) && - SciProSession.get().hasActualRole(Roles.ADMIN) - ); + return (SciProSession.get().authorizedForRole(Roles.ADMIN) && SciProSession.get().hasActualRole(Roles.ADMIN)); } private boolean isSupervisor() { @@ -83,23 +79,18 @@ public class HomePage extends MenuPage { } private boolean isAuthor() { - return ( - SciProSession.get().authorizedForRole(Roles.AUTHOR) && - SciProSession.get().hasActualRole(Roles.AUTHOR) - ); + return (SciProSession.get().authorizedForRole(Roles.AUTHOR) && SciProSession.get().hasActualRole(Roles.AUTHOR)); } private boolean isReviewer() { return ( - SciProSession.get().authorizedForRole(Roles.REVIEWER) && - SciProSession.get().hasActualRole(Roles.REVIEWER) + SciProSession.get().authorizedForRole(Roles.REVIEWER) && SciProSession.get().hasActualRole(Roles.REVIEWER) ); } private boolean isExaminer() { return ( - SciProSession.get().authorizedForRole(Roles.EXAMINER) && - SciProSession.get().hasActualRole(Roles.EXAMINER) + SciProSession.get().authorizedForRole(Roles.EXAMINER) && SciProSession.get().hasActualRole(Roles.EXAMINER) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/SciProApplication.java b/view/src/main/java/se/su/dsv/scipro/SciProApplication.java index 30177acafb..37f93c29e7 100755 --- a/view/src/main/java/se/su/dsv/scipro/SciProApplication.java +++ b/view/src/main/java/se/su/dsv/scipro/SciProApplication.java @@ -187,8 +187,7 @@ public class SciProApplication extends LifecycleManagedWebApplication { getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class); getApplicationSettings().setInternalErrorPage(InternalErrorPage.class); if (usesDeploymentConfig()) { - getExceptionSettings() - .setUnexpectedExceptionDisplay(ExceptionSettings.SHOW_INTERNAL_ERROR_PAGE); + getExceptionSettings().setUnexpectedExceptionDisplay(ExceptionSettings.SHOW_INTERNAL_ERROR_PAGE); } getApplicationSettings().setPageExpiredErrorPage(PageExpiredPage.class); } @@ -228,14 +227,8 @@ public class SciProApplication extends LifecycleManagedWebApplication { mountPage("supervisor/project/files", SupervisorFilePage.class); mountPage("supervisor/projectideas/newidea", SupervisorIdeaSubmissionPage.class); - mountPage( - "supervisor/projectideas/allselestudentideas", - SupervisorSelectableStudentIdeasPage.class - ); - mountPage( - "supervisor/projectideas/allsupervisorideas", - SupervisorNewAllSupervisorIdeasPage.class - ); + mountPage("supervisor/projectideas/allselestudentideas", SupervisorSelectableStudentIdeasPage.class); + mountPage("supervisor/projectideas/allsupervisorideas", SupervisorNewAllSupervisorIdeasPage.class); mountPage("supervisor/projectideas", SupervisorIdeaStartPage.class); mountPage("supervisor/projectideas/studentideas", SupervisorAllStudentIdeasPage.class); mountPage("supervisor/projectideas/details", SupervisorIdeaDetailsPage.class); @@ -337,10 +330,7 @@ public class SciProApplication extends LifecycleManagedWebApplication { mountPage("admin/match/singles", SinglesPage.class); mountPage("admin/match/applicationperiods", AdminManageMatchPeriodsPage.class); mountPage("admin/match/applicationperiods/create", AdminEditApplicationPeriodPage.class); - mountPage( - "admin/match/applicationperiods/exemptions", - AdminEditApplicationPeriodExemptionsPage.class - ); + mountPage("admin/match/applicationperiods/exemptions", AdminEditApplicationPeriodExemptionsPage.class); mountPage("admin/mail", AdminMailPage.class); mountPage("admin/mail/log", AdminMailLogPage.class); mountPage("admin/authors", AdminAuthorsStatisticsPage.class); @@ -352,14 +342,8 @@ public class SciProApplication extends LifecycleManagedWebApplication { mountPage("admin/statistics/units", AdminUnitStatisticsPage.class); mountPage("admin/statistics/ideas", AdminIdeaStatisticsPage.class); mountPage("admin/statistics/milestones", AdminMilestoneStatisticsPage.class); - mountPage( - "admin/statistics/milestonesprogress", - AdminMilestoneStatisticsProgressPage.class - ); - mountPage( - "admin/statistics/unfinishedfinalseminars", - AdminUnfinishedFinalSeminarsPage.class - ); + mountPage("admin/statistics/milestonesprogress", AdminMilestoneStatisticsProgressPage.class); + mountPage("admin/statistics/unfinishedfinalseminars", AdminUnfinishedFinalSeminarsPage.class); mountPage("admin/statistics/reviewerdeadlines", AdminReviewerDeadlinesPage.class); mountPage("admin/statistics/people", AdminPeopleStatisticsPage.class); mountPage("admin/statistics/medianmilestone", AdminMedianMilestonePage.class); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityDataProvider.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityDataProvider.java index 74c4f0f558..1c1fb9256e 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityDataProvider.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityDataProvider.java @@ -57,13 +57,9 @@ public class ActivityDataProvider extends SortableDataProvider<Activity, String> case PROJECT_ALL: return activityPlanFacade.findEventsByProject(project, pageable).iterator(); case PROJECT_PAST: - return activityPlanFacade - .findEventsByProject(project, null, new Date(), pageable) - .iterator(); + return activityPlanFacade.findEventsByProject(project, null, new Date(), pageable).iterator(); case PROJECT_FUTURE: - return activityPlanFacade - .findEventsByProject(project, new Date(), null, pageable) - .iterator(); + return activityPlanFacade.findEventsByProject(project, new Date(), null, pageable).iterator(); default: throw new IllegalStateException("Unknown search mode"); } diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java index 672d1008cd..3b7fb74056 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java @@ -158,11 +158,7 @@ public class ActivityPlanPanel extends GenericPanel<Project> { ) ); columns.add( - new LambdaColumn<>( - new ResourceModel("title").wrapOnAssignment(this), - "title", - Activity::getTitle - ) { + new LambdaColumn<>(new ResourceModel("title").wrapOnAssignment(this), "title", Activity::getTitle) { @Override public void populateItem( Item<ICellPopulator<Activity>> cellItem, @@ -173,9 +169,7 @@ public class ActivityPlanPanel extends GenericPanel<Project> { } } ); - columns.add( - new ActionColumn(new StringResourceModel("action", this).setDefaultValue("Action")) - ); + columns.add(new ActionColumn(new StringResourceModel("action", this).setDefaultValue("Action"))); columns.add( new AbstractExportableColumn<>(new ResourceModel("checklist").wrapOnAssignment(this)) { @Override @@ -209,11 +203,7 @@ public class ActivityPlanPanel extends GenericPanel<Project> { final IModel<Activity> rowModel ) { cellItem.add( - new AjaxIconLinkPanel<>( - componentId, - rowModel, - Model.of(AjaxIconLinkPanel.EDIT) - ) { + new AjaxIconLinkPanel<>(componentId, rowModel, Model.of(AjaxIconLinkPanel.EDIT)) { @Override protected void onConfigure() { super.onConfigure(); @@ -223,14 +213,8 @@ public class ActivityPlanPanel extends GenericPanel<Project> { @Override public void onClick(AjaxRequestTarget target, IModel<Activity> model) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Project.class), - getProject().getId() - ); - pp.add( - PageParameterKeys.MAP.get(Activity.class), - model.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(Project.class), getProject().getId()); + pp.add(PageParameterKeys.MAP.get(Activity.class), model.getObject().getId()); editPage(pp); } @@ -294,16 +278,12 @@ public class ActivityPlanPanel extends GenericPanel<Project> { super(id, "titleCell", ActivityPlanPanel.this, model); add(new Label("title", LambdaModel.of(model, Activity::getTitle, Activity::setTitle))); add( - new InfoPanel( - "info", - LambdaModel.of(model, Activity::getDescription, Activity::setDescription) - ) { + new InfoPanel("info", LambdaModel.of(model, Activity::getDescription, Activity::setDescription)) { @Override protected void onConfigure() { super.onConfigure(); setVisible( - model.getObject().getDescription() != null && - !model.getObject().getDescription().isEmpty() + model.getObject().getDescription() != null && !model.getObject().getDescription().isEmpty() ); } } @@ -493,9 +473,7 @@ public class ActivityPlanPanel extends GenericPanel<Project> { switch (action) { case HAND_IN: if (hasSupervisingRole() && rowModel.getObject().getFileUpload() == null) { - cellItem.add( - new Label(componentId, new ResourceModel("upload.is.for.authors")) - ); + cellItem.add(new Label(componentId, new ResourceModel("upload.is.for.authors"))); } else { cellItem.add(new ResourceCell(componentId, rowModel)); } @@ -504,18 +482,14 @@ public class ActivityPlanPanel extends GenericPanel<Project> { if (hasSupervisingRole()) { cellItem.add( LinkWrapper.apply(componentId, id -> { - PageParameters pp = SupervisorProjectDetailsPage.getPageParameters( - project - ); + PageParameters pp = SupervisorProjectDetailsPage.getPageParameters(project); BookmarkablePageLink<Void> link = new BookmarkablePageLink<>( id, SupervisorProjectDetailsPage.class, pp ); link.setBody(Model.of("View peer status")); - link.setAnchor( - new WebComponent("unused").setMarkupId("peerStatus") - ); + link.setAnchor(new WebComponent("unused").setMarkupId("peerStatus")); return link; }) ); @@ -569,10 +543,9 @@ public class ActivityPlanPanel extends GenericPanel<Project> { cellItem.add( new Label( componentId, - new StringResourceModel( - "action.not.available", - ActivityPlanPanel.this - ).setDefaultValue("n/a") + new StringResourceModel("action.not.available", ActivityPlanPanel.this).setDefaultValue( + "n/a" + ) ) ); break; diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java index 3b53c7dcc7..3876bc438c 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java @@ -40,10 +40,7 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel { public abstract void onNewClick(); - public abstract void onTitleClick( - IModel<ActivityPlanTemplate> clicked, - AjaxRequestTarget target - ); + public abstract void onTitleClick(IModel<ActivityPlanTemplate> clicked, AjaxRequestTarget target); public abstract void onEditClick(IModel<ActivityPlanTemplate> clicked); @@ -101,9 +98,7 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel { SortableDataProvider<ActivityPlanTemplate, String> provider = new SortableDataProvider<>() { @Override public Iterator<ActivityPlanTemplate> iterator(long first, long count) { - return activityPlanTemplateService - .findAll(filter, new PageAdapter(first, count, getSort())) - .iterator(); + return activityPlanTemplateService.findAll(filter, new PageAdapter(first, count, getSort())).iterator(); } @Override @@ -136,17 +131,10 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel { new AjaxLinkPanel<>( s, model, - LambdaModel.of( - model, - ActivityPlanTemplate::getTitle, - ActivityPlanTemplate::setTitle - ) + LambdaModel.of(model, ActivityPlanTemplate::getTitle, ActivityPlanTemplate::setTitle) ) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<ActivityPlanTemplate> model - ) { + public void onClick(AjaxRequestTarget target, IModel<ActivityPlanTemplate> model) { onTitleClick(model, target); } } @@ -164,16 +152,9 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel { final IModel<ActivityPlanTemplate> rowModel ) { cellItem.add( - new AjaxIconLinkPanel<>( - componentId, - rowModel, - Model.of(AjaxIconLinkPanel.EDIT) - ) { + new AjaxIconLinkPanel<>(componentId, rowModel, Model.of(AjaxIconLinkPanel.EDIT)) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<ActivityPlanTemplate> model - ) { + public void onClick(AjaxRequestTarget target, IModel<ActivityPlanTemplate> model) { onEditClick(model); target.add(dataPanel); } @@ -183,10 +164,7 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel { super.onConfigure(); setVisibilityAllowed( SciProSession.get().getUser().hasRole(Roles.SYSADMIN) || - rowModel - .getObject() - .getCreator() - .equals(SciProSession.get().getUser()) + rowModel.getObject().getCreator().equals(SciProSession.get().getUser()) ); } } @@ -211,10 +189,7 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel { getString("delete.confirmation") ) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<ActivityPlanTemplate> model - ) { + public void onClick(AjaxRequestTarget target, IModel<ActivityPlanTemplate> model) { activityPlanTemplateService.delete(model.getObject().getId()); target.add(dataPanel); } @@ -224,10 +199,7 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel { super.onConfigure(); setVisibilityAllowed( SciProSession.get().getUser().hasRole(Roles.SYSADMIN) || - rowModel - .getObject() - .getCreator() - .equals(SciProSession.get().getUser()) + rowModel.getObject().getCreator().equals(SciProSession.get().getUser()) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java index cc5467c046..88d0a9cf6d 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java @@ -20,24 +20,11 @@ public class ActivityPlanTemplateDetailsPanel extends Panel { public ActivityPlanTemplateDetailsPanel(String id, final IModel<ActivityPlanTemplate> model) { super(id, model); - add( - new Label( - "title", - LambdaModel.of( - model, - ActivityPlanTemplate::getTitle, - ActivityPlanTemplate::setTitle - ) - ) - ); + add(new Label("title", LambdaModel.of(model, ActivityPlanTemplate::getTitle, ActivityPlanTemplate::setTitle))); add( new Label( "description", - LambdaModel.of( - model, - ActivityPlanTemplate::getDescription, - ActivityPlanTemplate::setDescription - ) + LambdaModel.of(model, ActivityPlanTemplate::getDescription, ActivityPlanTemplate::setDescription) ) ); @@ -67,21 +54,13 @@ public class ActivityPlanTemplateDetailsPanel extends Panel { add( new DateLabel( "templateCreated", - LambdaModel.of( - model, - ActivityPlanTemplate::getDateCreated, - ActivityPlanTemplate::setDateCreated - ) + LambdaModel.of(model, ActivityPlanTemplate::getDateCreated, ActivityPlanTemplate::setDateCreated) ) ); add( new DateLabel( "templateUpdated", - LambdaModel.of( - model, - ActivityPlanTemplate::getLastModified, - ActivityPlanTemplate::setLastModified - ) + LambdaModel.of(model, ActivityPlanTemplate::getLastModified, ActivityPlanTemplate::setLastModified) ) ); add( @@ -99,11 +78,7 @@ public class ActivityPlanTemplateDetailsPanel extends Panel { item.add( new Label( "etTitle", - LambdaModel.of( - itemModel, - ActivityTemplate::getTitle, - ActivityTemplate::setTitle - ) + LambdaModel.of(itemModel, ActivityTemplate::getTitle, ActivityTemplate::setTitle) ) ); item.add( @@ -119,21 +94,13 @@ public class ActivityPlanTemplateDetailsPanel extends Panel { item.add( new Label( "etTimeConsumption", - LambdaModel.of( - itemModel, - ActivityTemplate::getDaysOffset, - ActivityTemplate::setDaysOffset - ) + LambdaModel.of(itemModel, ActivityTemplate::getDaysOffset, ActivityTemplate::setDaysOffset) ) ); item.add( new EnumLabel<>( "handinLabel", - LambdaModel.of( - itemModel, - ActivityTemplate::getAction, - ActivityTemplate::setAction - ) + LambdaModel.of(itemModel, ActivityTemplate::getAction, ActivityTemplate::setAction) ) ); add(item); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java index 95ab6c207f..340c565e13 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java @@ -71,10 +71,7 @@ public class AddActivitiesFromTemplatePanel extends GenericPanel<Project> { container.setOutputMarkupId(true); add(container); add( - new TextField<>( - "filter", - LambdaModel.of(filter::getFilterString, filter::setFilterString) - ) { + new TextField<>("filter", LambdaModel.of(filter::getFilterString, filter::setFilterString)) { { add( new OnChangeAjaxBehavior() { @@ -112,10 +109,7 @@ public class AddActivitiesFromTemplatePanel extends GenericPanel<Project> { @Override public void onClick(final AjaxRequestTarget target) { - DetailsFragment content = new DetailsFragment( - "content", - getModel() - ); + DetailsFragment content = new DetailsFragment("content", getModel()); AddActivitiesFromTemplatePanel.this.replace(content); target.add(content); } @@ -171,10 +165,7 @@ public class AddActivitiesFromTemplatePanel extends GenericPanel<Project> { getModelObject(), dateModel.getObject() ); - notifyChangeActivityPlan( - getModelObject().getTitle(), - ProjectEvent.Event.ACTIVITY_ADDED - ); + notifyChangeActivityPlan(getModelObject().getTitle(), ProjectEvent.Event.ACTIVITY_ADDED); } }; form.add(new BootstrapDateTimeComponent("fromDate", dateModel).setRequired(true)); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminActivityPlanTemplatesPage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminActivityPlanTemplatesPage.java index 2949c30fb9..11b2a99d43 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminActivityPlanTemplatesPage.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminActivityPlanTemplatesPage.java @@ -29,15 +29,9 @@ public class AdminActivityPlanTemplatesPage } @Override - public void onTitleClick( - IModel<ActivityPlanTemplate> clicked, - AjaxRequestTarget target - ) { + public void onTitleClick(IModel<ActivityPlanTemplate> clicked, AjaxRequestTarget target) { modalWindowPlus.setContent( - new ActivityPlanTemplateDetailsPanel( - modalWindowPlus.getContentId(), - clicked - ) + new ActivityPlanTemplateDetailsPanel(modalWindowPlus.getContentId(), clicked) ); modalWindowPlus.show(target); } @@ -45,10 +39,7 @@ public class AdminActivityPlanTemplatesPage @Override public void onEditClick(IModel<ActivityPlanTemplate> clicked) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(ActivityPlanTemplate.class), - clicked.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(ActivityPlanTemplate.class), clicked.getObject().getId()); setResponsePage(AdminEditActivityTemplatePage.class, pp); } } diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java index ad80f3cf5c..8893b5b77c 100644 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java @@ -44,21 +44,13 @@ public abstract class AdminEditActivityPanel extends Panel { add( new TextArea<>( DESCRIPTION_AREA, - LambdaModel.of( - model, - ActivityTemplate::getDescription, - ActivityTemplate::setDescription - ) + LambdaModel.of(model, ActivityTemplate::getDescription, ActivityTemplate::setDescription) ) ); TextField<Integer> daysOffset = new TextField<>( DAYS_FIELD, - LambdaModel.of( - model, - ActivityTemplate::getDaysOffset, - ActivityTemplate::setDaysOffset - ), + LambdaModel.of(model, ActivityTemplate::getDaysOffset, ActivityTemplate::setDaysOffset), Integer.class ); daysOffset.setRequired(true); @@ -66,11 +58,7 @@ public abstract class AdminEditActivityPanel extends Panel { DropDownChoice<ChecklistTemplate> checklistTemplate = new DropDownChoice<>( CHECKLIST_DROP_DOWN, - LambdaModel.of( - model, - ActivityTemplate::getChecklistTemplate, - ActivityTemplate::setChecklistTemplate - ), + LambdaModel.of(model, ActivityTemplate::getChecklistTemplate, ActivityTemplate::setChecklistTemplate), checklistTemplateService.findAll(), new LambdaChoiceRenderer<>(ChecklistTemplate::getName, ChecklistTemplate::getId) ); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java index b289346813..23f7b384d8 100644 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java @@ -24,10 +24,7 @@ public class AdminEditActivityTemplatePage add( new EditActivityTemplatePanel( PANEL, - new DetachableServiceModel<>( - activityPlanTemplateService, - new ActivityPlanTemplate() - ) + new DetachableServiceModel<>(activityPlanTemplateService, new ActivityPlanTemplate()) ) { @Override public boolean isSysAdminTemplate() { @@ -41,9 +38,7 @@ public class AdminEditActivityTemplatePage PANEL, new DetachableServiceModel<>( activityPlanTemplateService, - pageParameters - .get(PageParameterKeys.MAP.get(ActivityPlanTemplate.class)) - .toLong() + pageParameters.get(PageParameterKeys.MAP.get(ActivityPlanTemplate.class)).toLong() ) ) { @Override diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java index bbf23ceb99..b369baa883 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java @@ -68,9 +68,7 @@ public class EditActivityPanel extends Panel { add(wmc); if (model.getObject().getChecklist() != null) { - checklistTemplate = checklistTemplateService.findByName( - model.getObject().getChecklist().getName() - ); + checklistTemplate = checklistTemplateService.findByName(model.getObject().getChecklist().getName()); } TextField<String> title = new TextField<>( @@ -102,8 +100,9 @@ public class EditActivityPanel extends Panel { action.setRequired(true); add(action); - final List<ChecklistTemplate> checklistTemplates = - checklistTemplateService.findByProject(project.getObject()); + final List<ChecklistTemplate> checklistTemplates = checklistTemplateService.findByProject( + project.getObject() + ); IChoiceRenderer<ChecklistTemplate> iChoiceRenderer = new LambdaChoiceRenderer<>( ChecklistTemplate::getName, ChecklistTemplate::getId @@ -119,10 +118,7 @@ public class EditActivityPanel extends Panel { iChoiceRenderer ) { @Override - public void onNewSelection( - AjaxRequestTarget target, - ChecklistTemplate objectSelected - ) { + public void onNewSelection(AjaxRequestTarget target, ChecklistTemplate objectSelected) { target.add(wmc); } @@ -153,17 +149,11 @@ public class EditActivityPanel extends Panel { @Override protected void onSubmit() { boolean isNew = getModelObject().getId() == null; - getModelObject() - .setActivityPlan(activityPlanFacade.retrieveActivityPlan(project.getObject())); + getModelObject().setActivityPlan(activityPlanFacade.retrieveActivityPlan(project.getObject())); if (checklistTemplate != null) { - ChecklistTemplate loadedTemplate = getLoadedChecklistTemplate( - checklistTemplate - ).getObject(); - Checklist checklist = activityPlanFacade.createChecklist( - project.getObject(), - loadedTemplate - ); + ChecklistTemplate loadedTemplate = getLoadedChecklistTemplate(checklistTemplate).getObject(); + Checklist checklist = activityPlanFacade.createChecklist(project.getObject(), loadedTemplate); getModelObject().setChecklist(checklist); } else { getModelObject().setChecklist(null); @@ -184,9 +174,7 @@ public class EditActivityPanel extends Panel { @Override protected List<String> load() { if (checklistTemplate != null) { - return checklistTemplateService - .findOne(checklistTemplate.getId()) - .getQuestions(); + return checklistTemplateService.findOne(checklistTemplate.getId()).getQuestions(); } return new ArrayList<>(); } diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java index 6e82653f0b..477b511b67 100644 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java @@ -51,10 +51,7 @@ public class EditActivityTemplatePanel extends GenericPanel<ActivityPlanTemplate TemplateForm form = new TemplateForm(FORM, model); add(form); - preview = new PreviewActivityPlanTemplatePanel( - "preview", - Model.ofList(form.activityTemplates) - ); + preview = new PreviewActivityPlanTemplatePanel("preview", Model.ofList(form.activityTemplates)); preview.setOutputMarkupId(true); add(preview); } @@ -120,11 +117,7 @@ public class EditActivityTemplatePanel extends GenericPanel<ActivityPlanTemplate TextField<String> titleField = new TextField<>( TITLE_FIELD, - LambdaModel.of( - model, - ActivityPlanTemplate::getTitle, - ActivityPlanTemplate::setTitle - ) + LambdaModel.of(model, ActivityPlanTemplate::getTitle, ActivityPlanTemplate::setTitle) ); titleField.setRequired(true); add(titleField); @@ -132,11 +125,7 @@ public class EditActivityTemplatePanel extends GenericPanel<ActivityPlanTemplate add( new TextArea<>( DESCRIPTION_AREA, - LambdaModel.of( - model, - ActivityPlanTemplate::getDescription, - ActivityPlanTemplate::setDescription - ) + LambdaModel.of(model, ActivityPlanTemplate::getDescription, ActivityPlanTemplate::setDescription) ) ); @@ -150,10 +139,7 @@ public class EditActivityTemplatePanel extends GenericPanel<ActivityPlanTemplate new Model<>(new ActivityTemplate()) ) { @Override - protected void onSubmit( - AjaxRequestTarget target, - IModel<ActivityTemplate> activity - ) { + protected void onSubmit(AjaxRequestTarget target, IModel<ActivityTemplate> activity) { modalWindowPlus.close(target); addActivity(activity.getObject()); target.add(container); @@ -174,10 +160,7 @@ public class EditActivityTemplatePanel extends GenericPanel<ActivityPlanTemplate @Override public void onClick(AjaxRequestTarget ajaxRequestTarget) { modalWindowPlus.setContent( - new AdminEditActivityPanel( - modalWindowPlus.getContentId(), - item.getModel() - ) { + new AdminEditActivityPanel(modalWindowPlus.getContentId(), item.getModel()) { @Override protected void onSubmit( AjaxRequestTarget target, @@ -224,9 +207,7 @@ public class EditActivityTemplatePanel extends GenericPanel<ActivityPlanTemplate @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - item.getIndex() + 1 != activityTemplates.size() - ); + setVisibilityAllowed(item.getIndex() + 1 != activityTemplates.size()); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java index bcf5ca4d35..e4a7e31086 100644 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java @@ -24,10 +24,7 @@ public class PreviewActivityPlanTemplatePanel extends Panel { private final IModel<Date> startDate = Model.of(new Date()); - public PreviewActivityPlanTemplatePanel( - final String id, - final IModel<List<ActivityTemplate>> model - ) { + public PreviewActivityPlanTemplatePanel(final String id, final IModel<List<ActivityTemplate>> model) { super(id, model); final WebMarkupContainer container = new WebMarkupContainer("container"); container.setOutputMarkupId(true); @@ -76,16 +73,10 @@ public class PreviewActivityPlanTemplatePanel extends Panel { ); } - private static int getOffset( - List<ActivityTemplate> activityTemplates, - ActivityTemplate activityTemplate - ) { + private static int getOffset(List<ActivityTemplate> activityTemplates, ActivityTemplate activityTemplate) { final int earlierOffset = activityTemplates .stream() - .filter( - otherTemplate -> - otherTemplate.getNumberInOrder() < activityTemplate.getNumberInOrder() - ) + .filter(otherTemplate -> otherTemplate.getNumberInOrder() < activityTemplate.getNumberInOrder()) .mapToInt(ActivityTemplate::getDaysOffset) .sum(); return earlierOffset + activityTemplate.getDaysOffset(); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectActivityPlanPage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectActivityPlanPage.java index 1d868545b8..f369bd6b8c 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectActivityPlanPage.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectActivityPlanPage.java @@ -10,9 +10,7 @@ import se.su.dsv.scipro.system.ProjectModule; @Authorization(authorizedRoles = { Roles.AUTHOR }) @ProjectModuleComponent(ProjectModule.ACTIVITY_PLAN) -public class ProjectActivityPlanPage - extends AbstractProjectDetailsPage - implements MenuHighlightAuthorMyProjects { +public class ProjectActivityPlanPage extends AbstractProjectDetailsPage implements MenuHighlightAuthorMyProjects { public ProjectActivityPlanPage(final PageParameters pp) { super(pp); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java index ff012f8788..3a66ccd47c 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java @@ -17,9 +17,7 @@ import se.su.dsv.scipro.util.PageParameterKeys; @Authorization(authorizedRoles = { Roles.AUTHOR }) @ProjectModuleComponent(ProjectModule.ACTIVITY_PLAN) -public class ProjectEditActivityPage - extends AbstractProjectDetailsPage - implements MenuHighlightActivityPlan { +public class ProjectEditActivityPage extends AbstractProjectDetailsPage implements MenuHighlightActivityPlan { private static final long INVALID_ID = -1; @@ -40,17 +38,11 @@ public class ProjectEditActivityPage ); } else { final long activityId = parameter.toLong(INVALID_ID); - final IModel<Activity> activityModel = new DetachableServiceModel<>( - activityService, - activityId - ); + final IModel<Activity> activityModel = new DetachableServiceModel<>(activityService, activityId); final Activity activity = activityModel.getObject(); if ( activity == null || - !activity - .getActivityPlan() - .getProject() - .isParticipant(SciProSession.get().getUser()) + !activity.getActivityPlan().getProject().isParticipant(SciProSession.get().getUser()) ) { throw new RestartResponseException(getApplication().getHomePage()); } diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorActivityPlanTemplatesPage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorActivityPlanTemplatesPage.java index 806a66c430..0ee96c770e 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorActivityPlanTemplatesPage.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorActivityPlanTemplatesPage.java @@ -31,15 +31,9 @@ public class SupervisorActivityPlanTemplatesPage } @Override - public void onTitleClick( - IModel<ActivityPlanTemplate> clicked, - AjaxRequestTarget target - ) { + public void onTitleClick(IModel<ActivityPlanTemplate> clicked, AjaxRequestTarget target) { modalWindowPlus.setContent( - new ActivityPlanTemplateDetailsPanel( - modalWindowPlus.getContentId(), - clicked - ) + new ActivityPlanTemplateDetailsPanel(modalWindowPlus.getContentId(), clicked) ); modalWindowPlus.show(target); } @@ -47,10 +41,7 @@ public class SupervisorActivityPlanTemplatesPage @Override public void onEditClick(IModel<ActivityPlanTemplate> clicked) { PageParameters pp = new PageParameters(); - pp.set( - PageParameterKeys.MAP.get(ActivityPlanTemplate.class), - clicked.getObject().getId() - ); + pp.set(PageParameterKeys.MAP.get(ActivityPlanTemplate.class), clicked.getObject().getId()); setResponsePage(SupervisorEditActivityTemplatePage.class, pp); } } diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java index 13b4d7b7f1..0c18fe8417 100755 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java @@ -41,21 +41,14 @@ public class SupervisorEditActivityPage ); } else { final long activityId = parameter.toLong(INVALID_ID); - final IModel<Activity> activityModel = new DetachableServiceModel<>( - activityService, - activityId - ); + final IModel<Activity> activityModel = new DetachableServiceModel<>(activityService, activityId); final Activity activity = activityModel.getObject(); if (activity == null) { throw new RestartResponseException(getApplication().getHomePage()); } final Project project = activity.getActivityPlan().getProject(); final User user = SciProSession.get().getUser(); - if ( - !(project.isSupervisor(user) || - project.isCoSupervisor(user) || - project.isReviewer(user)) - ) { + if (!(project.isSupervisor(user) || project.isCoSupervisor(user) || project.isReviewer(user))) { throw new RestartResponseException(getApplication().getHomePage()); } add(new EditActivityPanel("edit", projectModel, activityModel)); diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java index e032f2652d..c1235867cd 100644 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java @@ -22,10 +22,7 @@ public class SupervisorEditActivityTemplatePage add( new EditActivityTemplatePanel( PANEL, - new DetachableServiceModel<>( - activityPlanTemplateService, - new ActivityPlanTemplate() - ) + new DetachableServiceModel<>(activityPlanTemplateService, new ActivityPlanTemplate()) ) ); } else { diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java index 26d1f2e3c0..b5c493d321 100644 --- a/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java @@ -44,11 +44,7 @@ public abstract class UpcomingActivitiesPanel extends Panel { @Override protected void populateItem(ListItem<Activity> item) { final IModel<Activity> activityModel = item.getModel(); - final IModel<String> titleModel = LambdaModel.of( - activityModel, - Activity::getTitle, - Activity::setTitle - ); + final IModel<String> titleModel = LambdaModel.of(activityModel, Activity::getTitle, Activity::setTitle); item.add( new DateLabel( DATE, @@ -66,16 +62,12 @@ public abstract class UpcomingActivitiesPanel extends Panel { }.add(new Label(AUTHOR_LABEL, titleModel)) ); item.add( - new BookmarkablePageLink<Void>( - EMPLOYEE_LINK, - SupervisorActivityPlanPage.class - ) { + new BookmarkablePageLink<Void>(EMPLOYEE_LINK, SupervisorActivityPlanPage.class) { @Override protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - !isAuthorView() && - SciProSession.get().authorizedForRole(Roles.SUPERVISOR) + !isAuthorView() && SciProSession.get().authorizedForRole(Roles.SUPERVISOR) ); } }.add(new Label(EMPLOYEE_LABEL, titleModel)) diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminSystemPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminSystemPage.java index b046695198..c925dcffbf 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminSystemPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminSystemPage.java @@ -26,30 +26,16 @@ public abstract class AbstractAdminSystemPage extends AbstractAdminPage { protected List<MenuItem> getItemList() { final List<MenuItem> items = new ArrayList<>(); items.add(new MenuItem("General settings", AdminGeneralSettingsPage.class)); - items.add( - new MenuItem("Final seminar settings", AdminFinalSeminarSettingsPage.class) - ); + items.add(new MenuItem("Final seminar settings", AdminFinalSeminarSettingsPage.class)); items.add(new MenuItem("URKUND settings", AdminUrkundSettingsPage.class)); items.add(new MenuItem("Peer settings", AdminPeerSettingsPage.class)); items.add(new MenuItem("Type settings", AdminProjectTypeSettingsPage.class)); - items.add( - new MenuItem("Notification settings", AdminNotificationSettingsPage.class) - ); + items.add(new MenuItem("Notification settings", AdminNotificationSettingsPage.class)); items.add(new MenuItem("Milestone settings", AdminMileStoneSettingsPage.class)); items.add(new MenuItem("Maintenance", SystemMaintenancePage.class)); - items.add( - new MenuItem( - "Project module settings", - AdminProjectModuleSettingsPage.class - ) - ); + items.add(new MenuItem("Project module settings", AdminProjectModuleSettingsPage.class)); items.add(new MenuItem("Footer settings", AdminFooterSettingsPage.class)); - items.add( - new MenuItem( - "Reviewer deadline settings", - AdminReviewerDeadlineSettingsPage.class - ) - ); + items.add(new MenuItem("Reviewer deadline settings", AdminReviewerDeadlineSettingsPage.class)); items.add(new MenuItem("GDPR", AdminGDPRPage.class)); return items; } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java index 02fcdb16ed..0c2acf7188 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java @@ -83,12 +83,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { ); add(new Label("title", projectModel.map(Project::getTitle))); - add( - new Label( - "research_area", - projectModel.map(Project::getResearchArea).map(ResearchArea::getTitle) - ) - ); + add(new Label("research_area", projectModel.map(Project::getResearchArea).map(ResearchArea::getTitle))); add(new UserLinkPanel("supervisor", projectModel.map(Project::getHeadSupervisor))); add( new EnumLabel<>("language", projectModel.map(Project::getLanguage)) { @@ -102,17 +97,13 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { add( new ViewAttachmentPanel( "rough_draft", - roughDraftApproval - .map(RoughDraftApproval::getCurrentThesis) - .map(FileReference::getFileDescription) + roughDraftApproval.map(RoughDraftApproval::getCurrentThesis).map(FileReference::getFileDescription) ) ); add( new DateLabel( "requested_at", - roughDraftApproval - .map(RoughDraftApproval::getCurrentDecision) - .map(Decision::getRequested), + roughDraftApproval.map(RoughDraftApproval::getCurrentDecision).map(Decision::getRequested), DateStyle.DATETIME ) { @Override @@ -123,10 +114,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { } ); add( - new ListView<>( - "authors", - projectModel.map(Project::getProjectParticipants).map(ArrayList::new) - ) { + new ListView<>("authors", projectModel.map(Project::getProjectParticipants).map(ArrayList::new)) { @Override protected void populateItem(ListItem<User> item) { item.add(new UserLinkPanel("author", item.getModel())); @@ -151,27 +139,15 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { add(new FeedbackPanel("feedback")); reviewerCandidates = LoadableDetachableModel.of(() -> - reviewerAssignmentService.getCandidatesToReview( - projectModel.getObject(), - LocalDate.now(clock) - ) + reviewerAssignmentService.getCandidatesToReview(projectModel.getObject(), LocalDate.now(clock)) ); IModel<ReviewPeriod> period = reviewerCandidates.map(ReviewerCandidates::period); - add( - new CurrentReviewerCard( - "current_reviewer", - projectModel.map(Project::getReviewer), - period - ) - ); + add(new CurrentReviewerCard("current_reviewer", projectModel.map(Project::getReviewer), period)); add( - new AutoHidingListView<>( - "good_candidates", - reviewerCandidates.map(ReviewerCandidates::good) - ) { + new AutoHidingListView<>("good_candidates", reviewerCandidates.map(ReviewerCandidates::good)) { @Override protected void populateItem(ListItem<ReviewerCandidates.Candidate> item) { item.add(new ReviewerCard("details", item.getModel(), period)); @@ -199,10 +175,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { } ); add( - new AutoHidingListView<>( - "wrong_language", - reviewerCandidates.map(ReviewerCandidates::wrongLanguage) - ) { + new AutoHidingListView<>("wrong_language", reviewerCandidates.map(ReviewerCandidates::wrongLanguage)) { @Override protected void populateItem(ListItem<ReviewerCandidates.Candidate> item) { item.add(new ReviewerCard("details", item.getModel(), period)); @@ -210,10 +183,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { } ); add( - new AutoHidingListView<>( - "busy_candidates", - reviewerCandidates.map(ReviewerCandidates::busy) - ) { + new AutoHidingListView<>("busy_candidates", reviewerCandidates.map(ReviewerCandidates::busy)) { @Override protected void populateItem(ListItem<ReviewerCandidates.Candidate> item) { item.add(new ReviewerCard("details", item.getModel(), period)); @@ -235,32 +205,14 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { private class CurrentReviewerCard extends GenericWebMarkupContainer<User> { - public CurrentReviewerCard( - String id, - IModel<User> reviewer, - IModel<ReviewPeriod> period - ) { + public CurrentReviewerCard(String id, IModel<User> reviewer, IModel<ReviewPeriod> period) { super(id, reviewer); - IModel<ReviewerAssignmentService.CurrentTarget> currentTarget = - LoadableDetachableModel.of(() -> - reviewerAssignmentService.getCurrentTarget( - reviewer.getObject(), - LocalDate.now(clock) - ) - ); + IModel<ReviewerAssignmentService.CurrentTarget> currentTarget = LoadableDetachableModel.of(() -> + reviewerAssignmentService.getCurrentTarget(reviewer.getObject(), LocalDate.now(clock)) + ); - add( - new Label( - "assigned", - currentTarget.map(ReviewerAssignmentService.CurrentTarget::assigned) - ) - ); - add( - new Label( - "target", - currentTarget.map(ReviewerAssignmentService.CurrentTarget::target) - ) - ); + add(new Label("assigned", currentTarget.map(ReviewerAssignmentService.CurrentTarget::assigned))); + add(new Label("target", currentTarget.map(ReviewerAssignmentService.CurrentTarget::target))); add(new Label("period_year", period.map(ReviewPeriod::year))); add(new EnumLabel<>("period_part", period.map(ReviewPeriod::part))); @@ -273,12 +225,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { ) { @Override protected void populateItem(ListItem<ResearchArea> item) { - item.add( - new Label( - "research_area", - item.getModel().map(ResearchArea::getTitle) - ) - ); + item.add(new Label("research_area", item.getModel().map(ResearchArea::getTitle))); } } ); @@ -292,10 +239,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { } ); add( - new AutoHidingListView<>( - "languages", - reviewer.map(User::getLanguages).map(ArrayList::new) - ) { + new AutoHidingListView<>("languages", reviewer.map(User::getLanguages).map(ArrayList::new)) { @Override protected void populateItem(ListItem<Language> item) { item.add(new EnumLabel<>("language", item.getModel())); @@ -306,9 +250,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { new Link<>("unassign", reviewer) { @Override public void onClick() { - reviewerAssignmentService.unassignReviewer( - AvailableReviewersPanel.this.getModelObject() - ); + reviewerAssignmentService.unassignReviewer(AvailableReviewersPanel.this.getModelObject()); AvailableReviewersPanel.this.success(getString("reviewer_unassigned")); } } @@ -339,18 +281,10 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { add(new EnumLabel<>("period_part", period.map(ReviewPeriod::part))); add(new Label("note", candidate.map(ReviewerCandidates.Candidate::note))); add( - new ListView<>( - "research_areas", - reviewer.map(User::getResearchAreas).map(ArrayList::new) - ) { + new ListView<>("research_areas", reviewer.map(User::getResearchAreas).map(ArrayList::new)) { @Override protected void populateItem(ListItem<ResearchArea> item) { - item.add( - new Label( - "research_area", - item.getModel().map(ResearchArea::getTitle) - ) - ); + item.add(new Label("research_area", item.getModel().map(ResearchArea::getTitle))); } } ); @@ -364,10 +298,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage { } ); add( - new ListView<>( - "languages", - reviewer.map(User::getLanguages).map(ArrayList::new) - ) { + new ListView<>("languages", reviewer.map(User::getLanguages).map(ArrayList::new)) { @Override protected void populateItem(ListItem<Language> item) { item.add(new EnumLabel<>("language", item.getModel())); diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectConfirmationPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectConfirmationPage.java index 31f68c436b..34597a7c98 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectConfirmationPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectConfirmationPage.java @@ -45,30 +45,10 @@ public class AdminCreateProjectConfirmationPage public CreateProjectForm(String id, final IModel<SerializableProject> model) { super(id, model); add(new Label("title", model.flatMap(SerializableProject::getTitle))); - add( - new Label( - "type", - model.flatMap(SerializableProject::getProjectType).map(ProjectType::getName) - ) - ); - add( - new Label( - "authors", - model.flatMap(SerializableProject::getAuthors).map(this::userFullNames) - ) - ); - add( - new Label( - "supervisor", - model.flatMap(SerializableProject::getSupervisor).map(User::getFullName) - ) - ); - add( - new Label( - "reviewers", - model.flatMap(SerializableProject::getReviewers).map(this::userFullNames) - ) - ); + add(new Label("type", model.flatMap(SerializableProject::getProjectType).map(ProjectType::getName))); + add(new Label("authors", model.flatMap(SerializableProject::getAuthors).map(this::userFullNames))); + add(new Label("supervisor", model.flatMap(SerializableProject::getSupervisor).map(User::getFullName))); + add(new Label("reviewers", model.flatMap(SerializableProject::getReviewers).map(this::userFullNames))); add( new Label( "coSupervisors", @@ -91,12 +71,7 @@ public class AdminCreateProjectConfirmationPage IModel<Project> project = item.getModel().map(Pair::getTail); item.add(new Label("student", student.map(User::getFullName))); item.add(new Label("project", project.map(Project::getTitle))); - item.add( - new Label( - "type", - project.map(Project::getProjectType).map(ProjectType::getName) - ) - ); + item.add(new Label("type", project.map(Project::getProjectType).map(ProjectType::getName))); } }; add(activeProjects); @@ -105,16 +80,8 @@ public class AdminCreateProjectConfirmationPage new Link<Void>("cancel") { @Override public void onClick() { - getSession() - .info( - getString( - "canceled", - CreateProjectForm.this.getModelObject().getTitle() - ) - ); - setResponsePage( - new AdminCreateProjectPage(CreateProjectForm.this.getModel()) - ); + getSession().info(getString("canceled", CreateProjectForm.this.getModelObject().getTitle())); + setResponsePage(new AdminCreateProjectPage(CreateProjectForm.this.getModel())); } } ); @@ -129,11 +96,7 @@ public class AdminCreateProjectConfirmationPage Project project = projectService.save(getModelObject().toProject()); getSession().info(getString("saved", getModelObject().getTitle())); - notificationController.notifyProject( - project, - ProjectEvent.Event.CREATED, - new NotificationSource() - ); + notificationController.notifyProject(project, ProjectEvent.Event.CREATED, new NotificationSource()); PageParameters pp = new PageParameters(); pp.add(PageParameterKeys.MAP.get(Project.class), project.getId()); setResponsePage(AdminEditProjectPage.class, pp); @@ -144,10 +107,7 @@ public class AdminCreateProjectConfirmationPage Collection<User> projectParticipants = project.getObject().getAuthors().getObject(); List<Pair<User, Project>> activeProjects = new ArrayList<>(); for (User student : projectParticipants) { - List<Project> byUserAndStatus = projectService.findByUserAndStatus( - student, - ProjectStatus.ACTIVE - ); + List<Project> byUserAndStatus = projectService.findByUserAndStatus(student, ProjectStatus.ACTIVE); for (Project project : byUserAndStatus) { Pair<User, Project> activeProject = new Pair<>(student, project); activeProjects.add(activeProject); diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java index 685d39ee0b..1ddd02ef36 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java @@ -42,9 +42,7 @@ import se.su.dsv.scipro.system.UserService; * EntityManager again on the next request, so they are attached and can be traversed. */ @Authorization(authorizedRoles = { Roles.SYSADMIN }) -public class AdminCreateProjectPage - extends AbstractAdminProjectPage - implements MenuHighlightAdminProjectManagement { +public class AdminCreateProjectPage extends AbstractAdminProjectPage implements MenuHighlightAdminProjectManagement { @Inject UserSearchService userSearchService; @@ -84,10 +82,7 @@ public class AdminCreateProjectPage super(id, model); add(new FeedbackPanel("feedback")); - TextField<String> titleField = new TextField<>( - "title", - getModel().flatMap(SerializableProject::getTitle) - ); + TextField<String> titleField = new TextField<>("title", getModel().flatMap(SerializableProject::getTitle)); titleField.setRequired(true); add(titleField); @@ -176,33 +171,16 @@ public class AdminCreateProjectPage if (project.getReviewers().getObject().contains(project.getSupervisor().getObject())) { get("reviewers").error(getString("can_not_add_supervisor_as_reviewer")); } - if ( - project.getCoSupervisors().getObject().contains(project.getSupervisor().getObject()) - ) { + if (project.getCoSupervisors().getObject().contains(project.getSupervisor().getObject())) { get("coSupervisors").error(getString("can_not_add_supervisor_as_co_supervisor")); } - if ( - !Collections.disjoint( - project.getAuthors().getObject(), - project.getReviewers().getObject() - ) - ) { + if (!Collections.disjoint(project.getAuthors().getObject(), project.getReviewers().getObject())) { get("reviewers").error(getString("can_not_add_author_as_reviewer")); } - if ( - !Collections.disjoint( - project.getAuthors().getObject(), - project.getCoSupervisors().getObject() - ) - ) { + if (!Collections.disjoint(project.getAuthors().getObject(), project.getCoSupervisors().getObject())) { get("coSupervisors").error(getString("can_not_add_author_as_co_supervisor")); } - if ( - !Collections.disjoint( - project.getReviewers().getObject(), - project.getCoSupervisors().getObject() - ) - ) { + if (!Collections.disjoint(project.getReviewers().getObject(), project.getCoSupervisors().getObject())) { get("coSupervisors").error(getString("can_not_add_reviewer_as_co_supervisor")); } } @@ -216,20 +194,13 @@ public class AdminCreateProjectPage Project project = getModelObject().toProject(); projectService.save(project); - notificationController.notifyProject( - project, - ProjectEvent.Event.CREATED, - new NotificationSource() - ); + notificationController.notifyProject(project, ProjectEvent.Event.CREATED, new NotificationSource()); info(getString("saved", () -> project)); } private boolean anyAuthorHasActiveProject() { for (User author : getModelObject().getAuthors().getObject()) { - final List<Project> activeProjects = projectService.findByUserAndStatus( - author, - ProjectStatus.ACTIVE - ); + final List<Project> activeProjects = projectService.findByUserAndStatus(author, ProjectStatus.ACTIVE); if (!activeProjects.isEmpty()) { return true; } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java index bef57e2bce..d34c954c7f 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java @@ -30,9 +30,7 @@ import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.util.PageParameterKeys; @Authorization(authorizedRoles = { Roles.SYSADMIN }) -public class AdminEditProjectPage - extends AbstractAdminProjectPage - implements MenuHighlightAdminProjectManagement { +public class AdminEditProjectPage extends AbstractAdminProjectPage implements MenuHighlightAdminProjectManagement { public static final String FEEDBACK = "feedback"; public static final String TITLE_FIELD = "titleField"; @@ -91,12 +89,7 @@ public class AdminEditProjectPage super(id, model); add(new FeedbackPanel(FEEDBACK)); - add( - new RequiredTextField<>( - TITLE_FIELD, - LambdaModel.of(model, Project::getTitle, Project::setTitle) - ) - ); + add(new RequiredTextField<>(TITLE_FIELD, LambdaModel.of(model, Project::getTitle, Project::setTitle))); List<ProjectType> types = projectTypeService.findAllActive(); DropDownChoice<ProjectType> projectTypeSelect = new DropDownChoice<>( @@ -122,9 +115,7 @@ public class AdminEditProjectPage }; headSupervisor.setRequired(true); add(headSupervisor); - IModel<Collection<User>> authorsModel = new DetachableServiceModelCollection<>( - userService - ); + IModel<Collection<User>> authorsModel = new DetachableServiceModelCollection<>(userService); authorsModel.setObject(getModelObject().getProjectParticipants()); authors = new DefaultSelect2MultiChoice<>( AUTHORS, @@ -133,9 +124,7 @@ public class AdminEditProjectPage ); authors.setRequired(true); add(authors); - IModel<Collection<User>> reviewersModel = new DetachableServiceModelCollection<>( - userService - ); + IModel<Collection<User>> reviewersModel = new DetachableServiceModelCollection<>(userService); reviewersModel.setObject(getModelObject().getReviewers()); reviewers = new DefaultSelect2MultiChoice<>( REVIEWERS, @@ -143,9 +132,7 @@ public class AdminEditProjectPage new AutoCompleteRoleProvider(userSearchService, EnumSet.of(Roles.REVIEWER)) ); add(reviewers); - IModel<Collection<User>> coSupervisorModel = new DetachableServiceModelCollection<>( - userService - ); + IModel<Collection<User>> coSupervisorModel = new DetachableServiceModelCollection<>(userService); coSupervisorModel.setObject(getModelObject().getCoSupervisors()); coSupervisors = new DefaultSelect2MultiChoice<>( CO_SUPERVISORS, @@ -188,11 +175,7 @@ public class AdminEditProjectPage eventBus.post(new ReviewerAssignedEvent(getModelObject(), reviewer)); } for (ProjectEvent.Event event : events) { - notificationController.notifyProject( - getModelObject(), - event, - new NotificationSource() - ); + notificationController.notifyProject(getModelObject(), event, new NotificationSource()); if (event == ProjectEvent.Event.HEAD_SUPERVISOR_CHANGED) { createSupervisorChangeMail(); } @@ -201,8 +184,7 @@ public class AdminEditProjectPage } private void createSupervisorChangeMail() { - GeneralSystemSettings settings = - generalSystemSettingsService.getGeneralSystemSettingsInstance(); + GeneralSystemSettings settings = generalSystemSettingsService.getGeneralSystemSettingsInstance(); MailEvent mailEvent = new MailEvent(); mailEvent.setFromEmail(settings.getSystemFromMail()); mailEvent.setFromName(settings.getMailFromName()); @@ -214,21 +196,9 @@ public class AdminEditProjectPage @Override protected void onValidateModelObjects() { - validateSameUser( - authors.getModelObject(), - reviewers.getModelObject(), - "reviewerAuthorSame" - ); - validateSameUser( - authors.getModelObject(), - coSupervisors.getModelObject(), - "authorCoSame" - ); - validateSameUser( - reviewers.getModelObject(), - coSupervisors.getModelObject(), - "reviewerCoSame" - ); + validateSameUser(authors.getModelObject(), reviewers.getModelObject(), "reviewerAuthorSame"); + validateSameUser(authors.getModelObject(), coSupervisors.getModelObject(), "authorCoSame"); + validateSameUser(reviewers.getModelObject(), coSupervisors.getModelObject(), "reviewerCoSame"); validateHeadSupervisorSameAs(coSupervisors.getModelObject(), "headCoSame"); validateHeadSupervisorSameAs(reviewers.getModelObject(), "headReviewerSame"); validateHeadSupervisorSameAs(authors.getModelObject(), "headAuthorSame"); @@ -271,11 +241,7 @@ public class AdminEditProjectPage } } - private void validateSameUser( - Collection<User> users, - Collection<User> otherUsers, - String errorKey - ) { + private void validateSameUser(Collection<User> users, Collection<User> otherUsers, String errorKey) { for (User user : users) { if (otherUsers.contains(user)) { error(getString(errorKey)); diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java index cca90c7dfc..67a0cdb97e 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java @@ -40,10 +40,7 @@ public class AdminMailLogPage extends AbstractAdminMailPage { public AdminMailLogPage() { IModel<MailEventService.Filter> filter = newFilter(); - SortableDataProvider<MailEvent, String> provider = new FilteredDataProvider<>( - mailEventService, - filter - ); + SortableDataProvider<MailEvent, String> provider = new FilteredDataProvider<>(mailEventService, filter); provider.setSort("dateCreated", SortOrder.DESCENDING); add(new ExportableDataPanel<>(MAIL_EVENTS, columns(), provider)); add(new FilterForm("filter", filter)); @@ -85,9 +82,7 @@ public class AdminMailLogPage extends AbstractAdminMailPage { } private AbstractExportableColumn<MailEvent, String> getNonUserRecipientsColumn() { - return new AbstractExportableColumn<>( - new ResourceModel("nonUserRecipients").wrapOnAssignment(this) - ) { + return new AbstractExportableColumn<>(new ResourceModel("nonUserRecipients").wrapOnAssignment(this)) { @Override public void populateItem( Item<ICellPopulator<MailEvent>> cellItem, @@ -98,11 +93,7 @@ public class AdminMailLogPage extends AbstractAdminMailPage { new DisplayMultiplesPanel<>( componentId, new ListAdapterModel<>( - LambdaModel.of( - rowModel, - MailEvent::getNonUserRecipients, - MailEvent::setNonUserRecipients - ) + LambdaModel.of(rowModel, MailEvent::getNonUserRecipients, MailEvent::setNonUserRecipients) ) ) { @Override @@ -115,9 +106,7 @@ public class AdminMailLogPage extends AbstractAdminMailPage { @Override public IModel<String> getDataModel(IModel<MailEvent> maileventIModel) { - return maileventIModel.map(mailEvent -> - String.join(", ", mailEvent.getNonUserRecipients()) - ); + return maileventIModel.map(mailEvent -> String.join(", ", mailEvent.getNonUserRecipients())); } }; } @@ -125,11 +114,7 @@ public class AdminMailLogPage extends AbstractAdminMailPage { private AbstractColumn<MailEvent, String> getTitleColumn() { return new AbstractColumn<>(new ResourceModel("subject").wrapOnAssignment(this), SUBJECT) { @Override - public void populateItem( - Item<ICellPopulator<MailEvent>> item, - String s, - IModel<MailEvent> iModel - ) { + public void populateItem(Item<ICellPopulator<MailEvent>> item, String s, IModel<MailEvent> iModel) { item.add( new AjaxLinkPanel<>( s, @@ -159,21 +144,13 @@ public class AdminMailLogPage extends AbstractAdminMailPage { add( new TextField<>( SUBJECT, - LambdaModel.of( - model, - MailEventService.Filter::getSubject, - MailEventService.Filter::setSubject - ) + LambdaModel.of(model, MailEventService.Filter::getSubject, MailEventService.Filter::setSubject) ) ); add( new UserAutoComplete( "user", - LambdaModel.of( - model, - MailEventService.Filter::getUser, - MailEventService.Filter::setUser - ) + LambdaModel.of(model, MailEventService.Filter::getUser, MailEventService.Filter::setUser) ) { @Override protected void action(final AjaxRequestTarget target, final User object) { @@ -184,11 +161,7 @@ public class AdminMailLogPage extends AbstractAdminMailPage { add( new DeactivatableDatePickerPanel( "sentBetween", - LambdaModel.of( - model, - MailEventService.Filter::getSentAfter, - MailEventService.Filter::setSentAfter - ), + LambdaModel.of(model, MailEventService.Filter::getSentAfter, MailEventService.Filter::setSentAfter), LambdaModel.of( model, MailEventService.Filter::getSentBefore, diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java index bb23943f86..63bbc60915 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java @@ -56,9 +56,7 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag private IModel<Year> selectedPeriod = new Model<>(); public AdminReviewerCapacityManagementPage() { - IModel<List<Unit>> units = LoadableDetachableModel.of(() -> - reviewerCapacityService.getUnitsWithReviewers() - ); + IModel<List<Unit>> units = LoadableDetachableModel.of(() -> reviewerCapacityService.getUnitsWithReviewers()); selectedUnit = new DetachableServiceModel<>(unitService); DropDownChoice<Unit> unitDropDownChoice = new DropDownChoice<>( @@ -78,11 +76,7 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag ); add(unitDropDownChoice); - DropDownChoice<Year> periods = new DropDownChoice<>( - "periods", - selectedPeriod, - getPeriods() - ); + DropDownChoice<Year> periods = new DropDownChoice<>("periods", selectedPeriod, getPeriods()); periods.add( new AjaxFormComponentUpdatingBehavior("change") { @Override @@ -98,9 +92,7 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag if (selectedUnit.getObject() == null) { users.addAll(reviewerCapacityService.getAllActiveReviewers()); } else { - users.addAll( - reviewerCapacityService.getActiveReviewersOnUnit(selectedUnit.getObject()) - ); + users.addAll(reviewerCapacityService.getActiveReviewersOnUnit(selectedUnit.getObject())); } users.sort(Comparator.comparing(User::getLastName)); return users; @@ -153,18 +145,13 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag target.add(this); } }; - expandToggle.add( - AttributeModifier.append("class", () -> expanded.isVisible() ? "rotate-90" : "") - ); + expandToggle.add(AttributeModifier.append("class", () -> expanded.isVisible() ? "rotate-90" : "")); expandToggle.setOutputMarkupId(true); add(expandToggle); expanded.add(new AssignTargetForm("form", reviewer)); IModel<List<TargetHistory>> history = LoadableDetachableModel.of(() -> - reviewerCapacityService.getTargetHistory( - reviewer.getObject(), - selectedPeriod.getObject() - ) + reviewerCapacityService.getTargetHistory(reviewer.getObject(), selectedPeriod.getObject()) ); ListView<TargetHistory> historyComponent = new ListView<>("history", history) { @Override @@ -172,18 +159,8 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag item.add(new Label("year", item.getModel().map(TargetHistory::year))); item.add(new Label("spring", item.getModel().map(TargetHistory::springTarget))); item.add(new Label("autumn", item.getModel().map(TargetHistory::autumnTarget))); - item.add( - new Label( - "completed_in_spring", - item.getModel().map(TargetHistory::completedInSpring) - ) - ); - item.add( - new Label( - "completed_in_autumn", - item.getModel().map(TargetHistory::completedInAutumn) - ) - ); + item.add(new Label("completed_in_spring", item.getModel().map(TargetHistory::completedInSpring))); + item.add(new Label("completed_in_autumn", item.getModel().map(TargetHistory::completedInAutumn))); } }; historyComponent.setViewSize(3); @@ -201,15 +178,10 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag add(new FencedFeedbackPanel("feedback", this)); springTarget = LoadableDetachableModel.of(() -> - reviewerCapacityService - .getTarget(reviewer.getObject(), selectedPeriod.getObject()) - .spring() + reviewerCapacityService.getTarget(reviewer.getObject(), selectedPeriod.getObject()).spring() ); - Label springHours = new Label( - "springHours", - springTarget.map(i -> i * HOURS_PER_REVIEW) - ); + Label springHours = new Label("springHours", springTarget.map(i -> i * HOURS_PER_REVIEW)); springHours.setOutputMarkupId(true); add(springHours); @@ -220,22 +192,15 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag ); springtargetField.setMinimum(0); springtargetField.add( - AjaxFormComponentUpdatingBehavior.onUpdate("change", target -> - target.add(springHours) - ) + AjaxFormComponentUpdatingBehavior.onUpdate("change", target -> target.add(springHours)) ); add(springtargetField); autumnTarget = LoadableDetachableModel.of(() -> - reviewerCapacityService - .getTarget(reviewer.getObject(), selectedPeriod.getObject()) - .autumn() + reviewerCapacityService.getTarget(reviewer.getObject(), selectedPeriod.getObject()).autumn() ); - Label autumnHours = new Label( - "autumnHours", - autumnTarget.map(i -> i * HOURS_PER_REVIEW) - ); + Label autumnHours = new Label("autumnHours", autumnTarget.map(i -> i * HOURS_PER_REVIEW)); autumnHours.setOutputMarkupId(true); add(autumnHours); @@ -246,26 +211,19 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag ); autumnTargetField.setMinimum(0); autumnTargetField.add( - AjaxFormComponentUpdatingBehavior.onUpdate("change", target -> - target.add(autumnHours) - ) + AjaxFormComponentUpdatingBehavior.onUpdate("change", target -> target.add(autumnHours)) ); add(autumnTargetField); IModel<RemainingTargets> remainingTargets = LoadableDetachableModel.of(() -> - reviewerCapacityService.getRemainingTargets( - reviewer.getObject(), - selectedPeriod.getObject() - ) + reviewerCapacityService.getRemainingTargets(reviewer.getObject(), selectedPeriod.getObject()) ); add(new Label("remainingSpring", remainingTargets.map(RemainingTargets::spring))); add(new Label("remainingAutumn", remainingTargets.map(RemainingTargets::autumn))); note = LoadableDetachableModel.of(() -> - reviewerCapacityService - .getTarget(reviewer.getObject(), selectedPeriod.getObject()) - .note() + reviewerCapacityService.getTarget(reviewer.getObject(), selectedPeriod.getObject()).note() ); TextArea<String> noteField = new TextArea<>("note", note); add(noteField); @@ -275,12 +233,7 @@ public class AdminReviewerCapacityManagementPage extends AbstractAdminProjectPag protected void onSubmit() { int spring = Objects.requireNonNullElse(springTarget.getObject(), 0); int autumn = Objects.requireNonNullElse(autumnTarget.getObject(), 0); - Target target = new Target( - selectedPeriod.getObject(), - spring, - autumn, - note.getObject() - ); + Target target = new Target(selectedPeriod.getObject(), spring, autumn, note.getObject()); reviewerCapacityService.assignTarget(getModelObject(), target); success("Target assigned"); diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java index 2573a916e5..a27ee57ca9 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java @@ -59,17 +59,13 @@ public class AdminSurveyPage extends AbstractAdminProjectPage { protected void onUpdate(final AjaxRequestTarget ajaxRequestTarget) { ajaxRequestTarget.addListener(new AjaxFeedbackPanelUpdater()); success( - getModelObject() - ? getString("survey.made.available") - : getString("survey.made.unavailable") + getModelObject() ? getString("survey.made.available") : getString("survey.made.unavailable") ); } } ); - final IModel<List<Question>> questionModel = LoadableDetachableModel.of( - surveyService::getQuestions - ); + final IModel<List<Question>> questionModel = LoadableDetachableModel.of(surveyService::getQuestions); questionEditingForm = new QuestionEditingForm("addNew", Model.of(new Question())); add(questionEditingForm); @@ -104,8 +100,7 @@ public class AdminSurveyPage extends AbstractAdminProjectPage { super.onConfigure(); final Question.Type type = item.getModel().getObject().getType(); setVisible( - type == Question.Type.MULTIPLE_CHOICE || - type == Question.Type.SINGLE_CHOICE + type == Question.Type.MULTIPLE_CHOICE || type == Question.Type.SINGLE_CHOICE ); } @@ -171,20 +166,14 @@ public class AdminSurveyPage extends AbstractAdminProjectPage { super.onConfigure(); final Question.Type selectedType = questionModel.getObject().getType(); setVisible( - selectedType == Question.Type.MULTIPLE_CHOICE || - selectedType == Question.Type.SINGLE_CHOICE + selectedType == Question.Type.MULTIPLE_CHOICE || selectedType == Question.Type.SINGLE_CHOICE ); } }; choiceContainer.setOutputMarkupPlaceholderTag(true); add(choiceContainer); - add( - new RequiredTextField<>( - "text", - LambdaModel.of(getModel(), Question::getText, Question::setText) - ) - ); + add(new RequiredTextField<>("text", LambdaModel.of(getModel(), Question::getText, Question::setText))); final var type = new AjaxDropDownChoice<>( "type", LambdaModel.of(getModel(), Question::getType, Question::setType), @@ -192,10 +181,7 @@ public class AdminSurveyPage extends AbstractAdminProjectPage { new EnumChoiceRenderer<>(this) ) { @Override - public void onNewSelection( - final AjaxRequestTarget target, - final Question.Type objectSelected - ) { + public void onNewSelection(final AjaxRequestTarget target, final Question.Type objectSelected) { target.add(choiceContainer); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java index 5e3db0c18c..aa2edf603f 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java @@ -42,38 +42,22 @@ public class AdminSurveyStatisticsPage extends AbstractAdminStatisticsPage { this.statisticsContainer.setOutputMarkupPlaceholderTag(true); add(statisticsContainer); - this.statisticsContainer.add( - new Label("respondents", statistics.map(SurveyStatistics::respondents)) - ); + this.statisticsContainer.add(new Label("respondents", statistics.map(SurveyStatistics::respondents))); this.statisticsContainer.add( new ListView<>("questions", statistics.map(SurveyStatistics::questions)) { @Override protected void populateItem(ListItem<SurveyStatistics.Question> item) { - item.add( - new Label( - "question", - item.getModel().map(SurveyStatistics.Question::text) - ) - ); + item.add(new Label("question", item.getModel().map(SurveyStatistics.Question::text))); item.add( - new SingleChoicePanel( - "single", - item.getModel().as(SurveyStatistics.Question.Single.class) - ) + new SingleChoicePanel("single", item.getModel().as(SurveyStatistics.Question.Single.class)) ); item.add( - new MultiChoicePanel( - "multi", - item.getModel().as(SurveyStatistics.Question.Multi.class) - ) + new MultiChoicePanel("multi", item.getModel().as(SurveyStatistics.Question.Multi.class)) ); item.add( - new FreeTextPanel( - "free_text", - item.getModel().as(SurveyStatistics.Question.Text.class) - ) + new FreeTextPanel("free_text", item.getModel().as(SurveyStatistics.Question.Text.class)) ); } } @@ -105,22 +89,12 @@ public class AdminSurveyStatisticsPage extends AbstractAdminStatisticsPage { new ListView<>("choices", choices) { @Override protected void populateItem(ListItem<SurveyStatistics.Question.Choice> item) { - item.add( - new Label( - "answer", - item.getModel().map(SurveyStatistics.Question.Choice::answer) - ) - ); - IModel<Long> count = item - .getModel() - .map(SurveyStatistics.Question.Choice::count); + item.add(new Label("answer", item.getModel().map(SurveyStatistics.Question.Choice::answer))); + IModel<Long> count = item.getModel().map(SurveyStatistics.Question.Choice::count); item.add(new Label("count", count)); item.add( - new Label( - "percent", - totalAnswers.combineWith(count, (total, c) -> (100 * c) / total) - ) + new Label("percent", totalAnswers.combineWith(count, (total, c) -> (100 * c) / total)) ); } } @@ -148,22 +122,12 @@ public class AdminSurveyStatisticsPage extends AbstractAdminStatisticsPage { new ListView<>("choices", choices) { @Override protected void populateItem(ListItem<SurveyStatistics.Question.Choice> item) { - item.add( - new Label( - "answer", - item.getModel().map(SurveyStatistics.Question.Choice::answer) - ) - ); - IModel<Long> count = item - .getModel() - .map(SurveyStatistics.Question.Choice::count); + item.add(new Label("answer", item.getModel().map(SurveyStatistics.Question.Choice::answer))); + IModel<Long> count = item.getModel().map(SurveyStatistics.Question.Choice::count); item.add(new Label("count", count)); item.add( - new Label( - "percent", - totalAnswers.combineWith(count, (total, c) -> (100 * c) / total) - ) + new Label("percent", totalAnswers.combineWith(count, (total, c) -> (100 * c) / total)) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java index 8ef71de999..b554ba0bf6 100755 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java @@ -43,9 +43,7 @@ public class SystemMaintenancePage extends AbstractAdminSystemPage { private Scheduler scheduler; private final WebMarkupContainer runningContainer = new WebMarkupContainer("runningContainer"); - private final WebMarkupContainer scheduledContainer = new WebMarkupContainer( - "scheduledContainer" - ); + private final WebMarkupContainer scheduledContainer = new WebMarkupContainer("scheduledContainer"); public SystemMaintenancePage() { add(new SystemNoticeForm("systemNoticeForm")); @@ -93,9 +91,7 @@ public class SystemMaintenancePage extends AbstractAdminSystemPage { item.add(new Label("runningThread", item.getModel().map(Task::getDescription))); } }; - runningContainer.add( - new Label("noneLabel", "None").add(new OppositeVisibility(runningListView)) - ); + runningContainer.add(new Label("noneLabel", "None").add(new OppositeVisibility(runningListView))); runningContainer.add(runningListView); } @@ -117,15 +113,9 @@ public class SystemMaintenancePage extends AbstractAdminSystemPage { .getModel() .map(Task::getWorkerName) .map(workerDataService::getWorkerDataByName); + item.add(new DateLabel("lastRun", wd.map(WorkerData::getLastRun), DateStyle.DATETIME)); item.add( - new DateLabel("lastRun", wd.map(WorkerData::getLastRun), DateStyle.DATETIME) - ); - item.add( - new DateLabel( - "lastSuccessfulRun", - wd.map(WorkerData::getLastSuccessfulRun), - DateStyle.DATETIME - ) + new DateLabel("lastSuccessfulRun", wd.map(WorkerData::getLastSuccessfulRun), DateStyle.DATETIME) ); item.add( new Label( @@ -167,8 +157,7 @@ public class SystemMaintenancePage extends AbstractAdminSystemPage { if (noticeModel.getObject() == null) { getApplication().setMetaData(SystemNoticePanel.SYSTEM_NOTICE, ""); } else { - getApplication() - .setMetaData(SystemNoticePanel.SYSTEM_NOTICE, noticeModel.getObject()); + getApplication().setMetaData(SystemNoticePanel.SYSTEM_NOTICE, noticeModel.getObject()); } } } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateCreationPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateCreationPage.java index a4835fbb13..6fe634af45 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateCreationPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateCreationPage.java @@ -44,20 +44,17 @@ public class AdminGradingTemplateCreationPage @Override protected void onSubmit() { super.onSubmit(); - GradingReportTemplateUpdate update = AdminGradingTemplateEditPage.toUpdate( - editingGradingTemplateModel - ); + GradingReportTemplateUpdate update = AdminGradingTemplateEditPage.toUpdate(editingGradingTemplateModel); try { - GradingReportTemplate gradingReportTemplate = - gradingReportTemplateService.create(projectTypeModel.getObject(), update); + GradingReportTemplate gradingReportTemplate = gradingReportTemplateService.create( + projectTypeModel.getObject(), + update + ); getSession().success(getString("template_created", projectTypeModel)); PageParameters pageParameters = AdminGradingTemplateEditPage.getPageParameters( gradingReportTemplate ); - throw new RestartResponseException( - AdminGradingTemplateEditPage.class, - pageParameters - ); + throw new RestartResponseException(AdminGradingTemplateEditPage.class, pageParameters); } catch (ValidDateMustBeInTheFutureException e) { error(getString("valid_from_must_be_in_the_future", () -> e)); } catch (DuplicateDateException e) { diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java index 1db340270b..0b80c08570 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java @@ -23,9 +23,7 @@ import se.su.dsv.scipro.report.TemplateLockedException; import se.su.dsv.scipro.report.ValidDateMustBeInTheFutureException; import se.su.dsv.scipro.system.ProjectType; -public class AdminGradingTemplateEditPage - extends AbstractAdminProjectPage - implements MenuHighlightGradingTemplates { +public class AdminGradingTemplateEditPage extends AbstractAdminProjectPage implements MenuHighlightGradingTemplates { private static final String GRADING_REPORT_TEMPLATE_ID_PARAMETER = "id"; public static final GradingReportTemplateUpdate.Criteria.Requirement ZERO_REQUIREMENT = @@ -49,12 +47,7 @@ public class AdminGradingTemplateEditPage IModel<GradingReportTemplate> model = LoadableDetachableModel.of(() -> gradingReportTemplateService.getTemplate(id) ); - add( - new Label( - "project_type_name", - model.map(GradingReportTemplate::getProjectType).map(ProjectType::getName) - ) - ); + add(new Label("project_type_name", model.map(GradingReportTemplate::getProjectType).map(ProjectType::getName))); Form<EditingGradingTemplate> form = new Form<>("form") { @Override @@ -63,10 +56,7 @@ public class AdminGradingTemplateEditPage try { GradingReportTemplateUpdate update = toUpdate(editingGradingTemplate); - GradingReportTemplate newTemplate = gradingReportTemplateService.update( - id, - update - ); + GradingReportTemplate newTemplate = gradingReportTemplateService.update(id, update); editingGradingTemplate = new EditingGradingTemplate(newTemplate); success(getString("template_updated")); } catch (ValidDateMustBeInTheFutureException e) { @@ -124,11 +114,8 @@ public class AdminGradingTemplateEditPage ); } - private static GradingReportTemplateUpdate.Criteria toCriteria( - EditingGradingTemplate.Criteria criteria - ) { - ArrayList<GradingReportTemplateUpdate.Criteria.Requirement> requirements = - new ArrayList<>(); + private static GradingReportTemplateUpdate.Criteria toCriteria(EditingGradingTemplate.Criteria criteria) { + ArrayList<GradingReportTemplateUpdate.Criteria.Requirement> requirements = new ArrayList<>(); requirements.add(ZERO_REQUIREMENT); for (int i = 0; i < criteria.getPoints().size(); i++) { EditingGradingTemplate.Criteria.Point point = criteria.getPoints().get(i); @@ -151,9 +138,7 @@ public class AdminGradingTemplateEditPage ); } - private static GradingReportTemplateUpdate.Criteria.Flag getFlag( - EditingGradingTemplate.Criteria criteria - ) { + private static GradingReportTemplateUpdate.Criteria.Flag getFlag(EditingGradingTemplate.Criteria criteria) { if (criteria.getFlag() == null) { return null; } @@ -164,13 +149,8 @@ public class AdminGradingTemplateEditPage }; } - private static GradingReportTemplateUpdate.GradeLimit toGrade( - GradeLimits.GradeLimit gradeLimit - ) { - return new GradingReportTemplateUpdate.GradeLimit( - gradeLimit.getGrade(), - gradeLimit.getLowerLimit() - ); + private static GradingReportTemplateUpdate.GradeLimit toGrade(GradeLimits.GradeLimit gradeLimit) { + return new GradingReportTemplateUpdate.GradeLimit(gradeLimit.getGrade(), gradeLimit.getLowerLimit()); } public static PageParameters getPageParameters(GradingReportTemplate gradingReportTemplate) { diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java index a443f1053c..609ddc16f5 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java @@ -21,9 +21,7 @@ import se.su.dsv.scipro.report.GradingCriterionTemplate; import se.su.dsv.scipro.report.GradingReportTemplate; import se.su.dsv.scipro.system.ProjectType; -public class AdminGradingTemplatePage - extends AbstractAdminProjectPage - implements MenuHighlightGradingTemplates { +public class AdminGradingTemplatePage extends AbstractAdminProjectPage implements MenuHighlightGradingTemplates { private static final String TEMPLATE_ID_PARAMETER = "id"; @@ -54,12 +52,7 @@ public class AdminGradingTemplatePage public TemplateDetailsPanel(String id, IModel<GradingReportTemplate> model) { super(id, model); - add( - new Label( - "project_type", - model.map(GradingReportTemplate::getProjectType).map(ProjectType::getName) - ) - ); + add(new Label("project_type", model.map(GradingReportTemplate::getProjectType).map(ProjectType::getName))); IModel<String> validPeriod = () -> { GradingReportTemplate template = model.getObject(); @@ -78,39 +71,21 @@ public class AdminGradingTemplatePage new ListView<>("criteria", model.map(this::getCriteria)) { @Override protected void populateItem(ListItem<GradingCriterionTemplate> item) { - item.add( - new Label( - "title", - item.getModel().map(GradingCriterionTemplate::getTitle) - ) - ); + item.add(new Label("title", item.getModel().map(GradingCriterionTemplate::getTitle))); item.add( new ListView<>( "points", - item - .getModel() - .map( - GradingCriterionTemplate::getGradingCriterionPointTemplates - ) + item.getModel().map(GradingCriterionTemplate::getGradingCriterionPointTemplates) ) { @Override - protected void populateItem( - ListItem<GradingCriterionPointTemplate> item - ) { + protected void populateItem(ListItem<GradingCriterionPointTemplate> item) { item.add( - new Label( - "point", - item - .getModel() - .map(GradingCriterionPointTemplate::getPoint) - ) + new Label("point", item.getModel().map(GradingCriterionPointTemplate::getPoint)) ); item.add( new Label( "description", - item - .getModel() - .map(GradingCriterionPointTemplate::getDescription) + item.getModel().map(GradingCriterionPointTemplate::getDescription) ) ); } @@ -121,12 +96,8 @@ public class AdminGradingTemplatePage ); } - private List<GradingCriterionTemplate> getCriteria( - GradingReportTemplate gradingReportTemplate - ) { - ArrayList<GradingCriterionTemplate> criteria = new ArrayList<>( - gradingReportTemplate.getCriteria() - ); + private List<GradingCriterionTemplate> getCriteria(GradingReportTemplate gradingReportTemplate) { + ArrayList<GradingCriterionTemplate> criteria = new ArrayList<>(gradingReportTemplate.getCriteria()); criteria.sort(Comparator.comparing(GradingCriterionTemplate::getSortOrder)); return Collections.unmodifiableList(criteria); } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java index 86f0667548..06d39bfb1d 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java @@ -40,9 +40,7 @@ public class AdminGradingTemplatesOverviewPage extends AbstractAdminProjectPage public TemplatesPanel(String id, IModel<ProjectType> model) { super(id, model); - IModel<GradingReportTemplate> currentTemplate = model.map( - gradingReportTemplateService::getCurrentTemplate - ); + IModel<GradingReportTemplate> currentTemplate = model.map(gradingReportTemplateService::getCurrentTemplate); add(new Label("valid_from", currentTemplate.map(GradingReportTemplate::getValidFrom))); add(new NonEmptyLabel("note", currentTemplate.map(GradingReportTemplate::getNote))); @@ -61,25 +59,13 @@ public class AdminGradingTemplatesOverviewPage extends AbstractAdminProjectPage new ListView<>("upcoming_templates", upcomingTemplates) { @Override protected void populateItem(ListItem<GradingReportTemplate> item) { - item.add( - new Label( - "valid_from", - item.getModel().map(GradingReportTemplate::getValidFrom) - ) - ); - item.add( - new NonEmptyLabel( - "note", - item.getModel().map(GradingReportTemplate::getNote) - ) - ); + item.add(new Label("valid_from", item.getModel().map(GradingReportTemplate::getValidFrom))); + item.add(new NonEmptyLabel("note", item.getModel().map(GradingReportTemplate::getNote))); item.add( new BookmarkablePageLink<>( "edit_template", AdminGradingTemplateEditPage.class, - AdminGradingTemplateEditPage.getPageParameters( - item.getModelObject() - ) + AdminGradingTemplateEditPage.getPageParameters(item.getModelObject()) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java index 8f800b6b36..f9712113c6 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java @@ -24,10 +24,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe private final Label maxPointsAvailable; - EditingGradingTemplateComponentPanel( - String id, - IModel<EditingGradingTemplate> editingGradingTemplateModel - ) { + EditingGradingTemplateComponentPanel(String id, IModel<EditingGradingTemplate> editingGradingTemplateModel) { super(id, editingGradingTemplateModel); setOutputMarkupId(true); @@ -74,10 +71,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe add(maxPointsAvailable); add( - new ListView<>( - "criteria", - editingGradingTemplateModel.map(EditingGradingTemplate::getCriteria) - ) { + new ListView<>("criteria", editingGradingTemplateModel.map(EditingGradingTemplate::getCriteria)) { { setReuseItems(true); } @@ -88,10 +82,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe new AjaxLink<>("remove") { @Override public void onClick(AjaxRequestTarget target) { - editingGradingTemplateModel - .getObject() - .getCriteria() - .remove(item.getModelObject()); + editingGradingTemplateModel.getObject().getCriteria().remove(item.getModelObject()); target.add(EditingGradingTemplateComponentPanel.this); onTemplateChanged(target); } @@ -149,26 +140,25 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe } ); - AjaxDropDownChoice<EditingGradingTemplate.Criteria.Type> typeChoice = - new AjaxDropDownChoice<>( - "type", - LambdaModel.of( - model, - EditingGradingTemplate.Criteria::getType, - EditingGradingTemplate.Criteria::setType - ), - List.of(EditingGradingTemplate.Criteria.Type.values()), - new EnumChoiceRenderer<>(this) + AjaxDropDownChoice<EditingGradingTemplate.Criteria.Type> typeChoice = new AjaxDropDownChoice<>( + "type", + LambdaModel.of( + model, + EditingGradingTemplate.Criteria::getType, + EditingGradingTemplate.Criteria::setType + ), + List.of(EditingGradingTemplate.Criteria.Type.values()), + new EnumChoiceRenderer<>(this) + ) { + @Override + public void onNewSelection( + AjaxRequestTarget target, + EditingGradingTemplate.Criteria.Type objectSelected ) { - @Override - public void onNewSelection( - AjaxRequestTarget target, - EditingGradingTemplate.Criteria.Type objectSelected - ) { - // auto save - onTemplateChanged(target); - } - }; + // auto save + onTemplateChanged(target); + } + }; typeChoice.setRequired(true); add(typeChoice); @@ -186,26 +176,25 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe pointsRequiredToPass.add(new AutoSave()); add(pointsRequiredToPass); - AjaxDropDownChoice<EditingGradingTemplate.Criteria.Flag> flagChoice = - new AjaxDropDownChoice<>( - "flag", - LambdaModel.of( - model, - EditingGradingTemplate.Criteria::getFlag, - EditingGradingTemplate.Criteria::setFlag - ), - List.of(EditingGradingTemplate.Criteria.Flag.values()), - new EnumChoiceRenderer<>(this) + AjaxDropDownChoice<EditingGradingTemplate.Criteria.Flag> flagChoice = new AjaxDropDownChoice<>( + "flag", + LambdaModel.of( + model, + EditingGradingTemplate.Criteria::getFlag, + EditingGradingTemplate.Criteria::setFlag + ), + List.of(EditingGradingTemplate.Criteria.Flag.values()), + new EnumChoiceRenderer<>(this) + ) { + @Override + public void onNewSelection( + AjaxRequestTarget target, + EditingGradingTemplate.Criteria.Flag objectSelected ) { - @Override - public void onNewSelection( - AjaxRequestTarget target, - EditingGradingTemplate.Criteria.Flag objectSelected - ) { - // auto save - onTemplateChanged(target); - } - }; + // auto save + onTemplateChanged(target); + } + }; flagChoice.setNullValid(true); add(flagChoice); @@ -216,9 +205,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe } @Override - protected void populateItem( - ListItem<EditingGradingTemplate.Criteria.Point> item - ) { + protected void populateItem(ListItem<EditingGradingTemplate.Criteria.Point> item) { item.add(new PointEditingPanel("point", item)); } } @@ -248,13 +235,9 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe ); } - private class PointEditingPanel - extends GenericWebMarkupContainer<EditingGradingTemplate.Criteria.Point> { + private class PointEditingPanel extends GenericWebMarkupContainer<EditingGradingTemplate.Criteria.Point> { - public PointEditingPanel( - String id, - ListItem<EditingGradingTemplate.Criteria.Point> item - ) { + public PointEditingPanel(String id, ListItem<EditingGradingTemplate.Criteria.Point> item) { super(id, item.getModel()); IModel<EditingGradingTemplate.Criteria.Point> model = item.getModel(); @@ -288,8 +271,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe new AjaxLink<>("remove") { @Override public void onClick(AjaxRequestTarget target) { - EditingGradingTemplate.Criteria criteria = - CriteriaEditingPanel.this.getModelObject(); + EditingGradingTemplate.Criteria criteria = CriteriaEditingPanel.this.getModelObject(); criteria.getPoints().remove(model.getObject()); target.add(CriteriaEditingPanel.this); onTemplateChanged(target); @@ -309,11 +291,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe add( new RequiredTextField<>( "failing_grade", - LambdaModel.of( - model, - GradeLimits::getFailingGrade, - GradeLimits::setFailingGrade - ) + LambdaModel.of(model, GradeLimits::getFailingGrade, GradeLimits::setFailingGrade) ) { { add(new AutoSave()); @@ -347,18 +325,13 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe ); } - private class GradeLimitEditingPanel - extends GenericWebMarkupContainer<GradeLimits.GradeLimit> { + private class GradeLimitEditingPanel extends GenericWebMarkupContainer<GradeLimits.GradeLimit> { public GradeLimitEditingPanel(String id, IModel<GradeLimits.GradeLimit> model) { super(id, model); NumberTextField<Integer> minimum = new NumberTextField<>( "minimum", - LambdaModel.of( - model, - GradeLimits.GradeLimit::getLowerLimit, - GradeLimits.GradeLimit::setLowerLimit - ), + LambdaModel.of(model, GradeLimits.GradeLimit::getLowerLimit, GradeLimits.GradeLimit::setLowerLimit), Integer.class ); minimum.setRequired(true); @@ -367,11 +340,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe TextField<String> grade = new TextField<>( "grade", - LambdaModel.of( - model, - GradeLimits.GradeLimit::getGrade, - GradeLimits.GradeLimit::setGrade - ) + LambdaModel.of(model, GradeLimits.GradeLimit::getGrade, GradeLimits.GradeLimit::setGrade) ); grade.setRequired(true); grade.add(new AutoSave()); diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/GradeLimits.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/GradeLimits.java index 1296e91d29..095b37d366 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/GradeLimits.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/GradeLimits.java @@ -79,11 +79,7 @@ class GradeLimits implements Serializable { @Override public boolean equals(Object o) { - return ( - o instanceof GradeLimit that && - lowerLimit == that.lowerLimit && - Objects.equals(grade, that.grade) - ); + return (o instanceof GradeLimit that && lowerLimit == that.lowerLimit && Objects.equals(grade, that.grade)); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java index 9fda939ce7..299e0a688b 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java @@ -61,10 +61,7 @@ public class AdminProjectModuleSettingsPage extends AbstractAdminSystemPage { item.add( new CheckBox( CHECKBOX, - new ModuleModel( - item.getModel(), - moduleItem.getModelObject() - ) + new ModuleModel(item.getModel(), moduleItem.getModelObject()) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java index 122a0d50cf..52e304fb15 100755 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java @@ -37,10 +37,7 @@ public class AdminProjectTypeSettingsPage extends AbstractAdminSystemPage { activeWmc.setOutputMarkupId(true); add(activeWmc); - final ListView<ProjectType> listView = new ListView<>( - "projectTypeList", - activeProjectType - ) { + final ListView<ProjectType> listView = new ListView<>("projectTypeList", activeProjectType) { @Override protected void populateItem(ListItem<ProjectType> item) { final IModel<ProjectType> model = item.getModel(); @@ -51,9 +48,7 @@ public class AdminProjectTypeSettingsPage extends AbstractAdminSystemPage { AjaxLink<Void> editLink = new AjaxLink<>("editLink") { @Override public void onClick(AjaxRequestTarget target) { - modalWindowPlus.setContent( - new AdminProjectTypePanel(modalWindowPlus.getContentId(), model) - ); + modalWindowPlus.setContent(new AdminProjectTypePanel(modalWindowPlus.getContentId(), model)); modalWindowPlus.setTitle("Edit"); modalWindowPlus.show(target); } @@ -74,10 +69,7 @@ public class AdminProjectTypeSettingsPage extends AbstractAdminSystemPage { deletedWmc.setOutputMarkupId(true); add(deletedWmc); - final ListView<ProjectType> listViewDeleted = new ListView<>( - "projectTypeListDel", - deletedProjectType - ) { + final ListView<ProjectType> listViewDeleted = new ListView<>("projectTypeListDel", deletedProjectType) { @Override protected void populateItem(ListItem<ProjectType> item) { final IModel<ProjectType> model = item.getModel(); @@ -104,9 +96,7 @@ public class AdminProjectTypeSettingsPage extends AbstractAdminSystemPage { AjaxLink<Void> createLink = new AjaxLink<>("createLink") { @Override public void onClick(AjaxRequestTarget target) { - modalWindowPlus.setContent( - new AdminProjectTypePanel(modalWindowPlus.getContentId()) - ); + modalWindowPlus.setContent(new AdminProjectTypePanel(modalWindowPlus.getContentId())); modalWindowPlus.setTitle("Create new type"); modalWindowPlus.show(target); } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java index 7d5939b391..be971e9b7a 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java @@ -34,29 +34,18 @@ public class AdminUrkundSettingsPage extends AbstractAdminSystemPage { public UrkundSettingsForm(final String id, final IModel<UrkundSettings> settings) { super(id, settings); add( - new CheckBox( - "enabled", - LambdaModel.of(settings, UrkundSettings::isEnabled, UrkundSettings::setEnabled) - ) + new CheckBox("enabled", LambdaModel.of(settings, UrkundSettings::isEnabled, UrkundSettings::setEnabled)) ); add( new TextField<>( "username", - LambdaModel.of( - settings, - UrkundSettings::getUsername, - UrkundSettings::setUsername - ) + LambdaModel.of(settings, UrkundSettings::getUsername, UrkundSettings::setUsername) ) ); add( new TextField<>( "password", - LambdaModel.of( - settings, - UrkundSettings::getPassword, - UrkundSettings::setPassword - ) + LambdaModel.of(settings, UrkundSettings::getPassword, UrkundSettings::setPassword) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java index 43fe245981..0a879b3261 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java @@ -38,11 +38,7 @@ public class AdminEditFooterAddressPanel extends Panel { add(title); address = new RequiredTextField<>( "address", - LambdaModel.of( - footerAddressModel, - FooterAddress::getAddress, - FooterAddress::setAddress - ) + LambdaModel.of(footerAddressModel, FooterAddress::getAddress, FooterAddress::setAddress) ); add(address); } diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java index b5915a2d23..ab1349ac1d 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java @@ -115,17 +115,9 @@ public class AdminEditFooterColumnPanel extends Panel { this.footerColumn = footerColumn; setModel(Model.of(new FooterLink())); add( - new RequiredTextField<>( - "title", - LambdaModel.of(getModel(), FooterLink::getTitle, FooterLink::setTitle) - ) - ); - add( - new RequiredTextField<>( - "url", - LambdaModel.of(getModel(), FooterLink::getUrl, FooterLink::setUrl) - ) + new RequiredTextField<>("title", LambdaModel.of(getModel(), FooterLink::getTitle, FooterLink::setTitle)) ); + add(new RequiredTextField<>("url", LambdaModel.of(getModel(), FooterLink::getUrl, FooterLink::setUrl))); help = new WebMarkupContainer("urlHelp"); add(help); @@ -137,17 +129,9 @@ public class AdminEditFooterColumnPanel extends Panel { public void renderHead(IHeaderResponse response) { super.renderHead(response); response.render( - OnEventHeaderItem.forComponent( - toggle, - "click", - String.format("$('#%s').toggle();", help.getMarkupId()) - ) - ); - response.render( - OnDomReadyHeaderItem.forScript( - String.format("$('#%s').hide();", help.getMarkupId()) - ) + OnEventHeaderItem.forComponent(toggle, "click", String.format("$('#%s').toggle();", help.getMarkupId())) ); + response.render(OnDomReadyHeaderItem.forScript(String.format("$('#%s').hide();", help.getMarkupId()))); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java index 59c2464f7b..bd487d2cb4 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java @@ -113,12 +113,7 @@ public class AdminMailPanel extends Panel { this(id, userSetIn, Model.of(""), Model.of("")); } - public AdminMailPanel( - String id, - Set<User> userSetIn, - IModel<String> presetSubject, - IModel<String> presetContent - ) { + public AdminMailPanel(String id, Set<User> userSetIn, IModel<String> presetSubject, IModel<String> presetContent) { super(id); this.presetSubject = presetSubject; this.presetContent = presetContent; @@ -194,10 +189,7 @@ public class AdminMailPanel extends Panel { ideaChoice = new IdeaMailChoice("ideaChoices"); projectChoice = new ProjectMailChoiceNew("projectChoices"); EnclosureContainer ideaEnclosure = new EnclosureContainer("ideaEnclosure", ideaChoice); - EnclosureContainer projectEnclosure = new EnclosureContainer( - "projectEnclosure", - projectChoice - ); + EnclosureContainer projectEnclosure = new EnclosureContainer("projectEnclosure", projectChoice); userList = new ArrayList<>(getRecipients(selectedRecipientSet, projectTypeList)); ideaChoice.setVisible(false); filterContainer.add(choice); @@ -210,38 +202,35 @@ public class AdminMailPanel extends Panel { } private void addChoiceBehaviors() { - AjaxFormChoiceComponentUpdatingBehavior projectChoiceBehavior = - new AjaxFormChoiceComponentUpdatingBehavior() { - @Override - protected void onUpdate(AjaxRequestTarget target) { + AjaxFormChoiceComponentUpdatingBehavior projectChoiceBehavior = new AjaxFormChoiceComponentUpdatingBehavior() { + @Override + protected void onUpdate(AjaxRequestTarget target) { + selectedRecipientSet = projectChoice.getModelObject(); + updateUserSet(target); + } + }; + AjaxFormChoiceComponentUpdatingBehavior ideaChoiceBehavior = new AjaxFormChoiceComponentUpdatingBehavior() { + @Override + protected void onUpdate(AjaxRequestTarget target) { + selectedRecipientSet = ideaChoice.getModelObject(); + updateUserSet(target); + } + }; + AjaxFormChoiceComponentUpdatingBehavior mainChoiceBehavior = new AjaxFormChoiceComponentUpdatingBehavior() { + @Override + protected void onUpdate(AjaxRequestTarget target) { + if (choice.getModelObject().equals(PROJECTS)) { selectedRecipientSet = projectChoice.getModelObject(); - updateUserSet(target); - } - }; - AjaxFormChoiceComponentUpdatingBehavior ideaChoiceBehavior = - new AjaxFormChoiceComponentUpdatingBehavior() { - @Override - protected void onUpdate(AjaxRequestTarget target) { + showIdeaAndProject(false, true); + } else { selectedRecipientSet = ideaChoice.getModelObject(); - updateUserSet(target); + showIdeaAndProject(true, false); } - }; - AjaxFormChoiceComponentUpdatingBehavior mainChoiceBehavior = - new AjaxFormChoiceComponentUpdatingBehavior() { - @Override - protected void onUpdate(AjaxRequestTarget target) { - if (choice.getModelObject().equals(PROJECTS)) { - selectedRecipientSet = projectChoice.getModelObject(); - showIdeaAndProject(false, true); - } else { - selectedRecipientSet = ideaChoice.getModelObject(); - showIdeaAndProject(true, false); - } - target.add(choiceContainer); - target.add(labelContainer); - updateUserSet(target); - } - }; + target.add(choiceContainer); + target.add(labelContainer); + updateUserSet(target); + } + }; ideaChoice.add(ideaChoiceBehavior); projectChoice.add(projectChoiceBehavior); choice.add(mainChoiceBehavior); @@ -277,8 +266,7 @@ public class AdminMailPanel extends Panel { public MailForm(String id) { super(id); - GeneralSystemSettings gsettings = - generalSystemSettingsService.getGeneralSystemSettingsInstance(); + GeneralSystemSettings gsettings = generalSystemSettingsService.getGeneralSystemSettingsInstance(); fromName = gsettings.getMailFromName(); fromEmail = gsettings.getSystemFromMail(); @@ -322,10 +310,7 @@ public class AdminMailPanel extends Panel { } @Override - public Recipient getObject( - final String id, - final IModel<? extends List<? extends Recipient>> choices - ) { + public Recipient getObject(final String id, final IModel<? extends List<? extends Recipient>> choices) { return choices.getObject().get(Integer.parseInt(id)); } }; @@ -379,16 +364,10 @@ public class AdminMailPanel extends Panel { StringBuilder str = new StringBuilder(); Collection<Recipient> selectedChoices = palette.getModelCollection(); for (Recipient user : selectedChoices) { - str - .append(user.accept(new DisplayingVisitor())) - .append(',') - .append(separator); + str.append(user.accept(new DisplayingVisitor())).append(',').append(separator); } modalWindowPlus.setContent( - new CopyTextPanel( - modalWindowPlus.getContentId(), - Model.of(str.toString()) - ) + new CopyTextPanel(modalWindowPlus.getContentId(), Model.of(str.toString())) ); modalWindowPlus.show(target); } @@ -399,9 +378,7 @@ public class AdminMailPanel extends Panel { @Override protected void onSubmit() { try { - List<Recipient> selected = SciProUtilities.copyIterator( - palette.getSelectedChoices() - ); + List<Recipient> selected = SciProUtilities.copyIterator(palette.getSelectedChoices()); if (!selected.isEmpty()) { for (List<Recipient> list : Lists.partition(selected, RECIPIENTS_PER_MAIL)) { MailEvent me = new MailEvent( diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java index afb693206a..e7b5403e75 100755 --- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java @@ -32,11 +32,7 @@ public class AdminProjectTypePanel extends Panel { IModel<ProjectType> projectTypeModel; - public ProjectTypeSettingsForm( - String id, - final IModel<ProjectType> model, - final boolean editMode - ) { + public ProjectTypeSettingsForm(String id, final IModel<ProjectType> model, final boolean editMode) { super(id, model); projectTypeModel = model; @@ -93,11 +89,7 @@ public class AdminProjectTypePanel extends Panel { NumberTextField<Integer> minimumAuthors = new NumberTextField<>( "minimum_authors", - LambdaModel.of( - settings, - ProjectTypeSettings::getMinAuthors, - ProjectTypeSettings::setMinAuthors - ), + LambdaModel.of(settings, ProjectTypeSettings::getMinAuthors, ProjectTypeSettings::setMinAuthors), Integer.class ); minimumAuthors.setMinimum(1); @@ -106,11 +98,7 @@ public class AdminProjectTypePanel extends Panel { NumberTextField<Integer> maximumAuthors = new NumberTextField<>( "maximum_authors", - LambdaModel.of( - settings, - ProjectTypeSettings::getMaxAuthors, - ProjectTypeSettings::setMaxAuthors - ), + LambdaModel.of(settings, ProjectTypeSettings::getMaxAuthors, ProjectTypeSettings::setMaxAuthors), Integer.class ); maximumAuthors.setMinimum(1); diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java index cb4bf0ddeb..307d7858f3 100755 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java @@ -36,9 +36,7 @@ import se.su.dsv.scipro.util.PageParameterKeys; public class AdminApplicationPeriodsPanel extends Panel { - private static final Logger LOGGER = LoggerFactory.getLogger( - AdminApplicationPeriodsPanel.class - ); + private static final Logger LOGGER = LoggerFactory.getLogger(AdminApplicationPeriodsPanel.class); private final ExportableDataPanel<ApplicationPeriod, String> dp; @Inject @@ -70,9 +68,7 @@ public class AdminApplicationPeriodsPanel extends Panel { } } ); - GenericDataProvider<ApplicationPeriod> provider = new GenericDataProvider<>( - applicationPeriodService - ); + GenericDataProvider<ApplicationPeriod> provider = new GenericDataProvider<>(applicationPeriodService); provider.setSort("startDate", SortOrder.DESCENDING); dp = new ExportableDataPanel<>("dp", createColumns(), provider); add(dp); @@ -98,11 +94,7 @@ public class AdminApplicationPeriodsPanel extends Panel { } ); columns.add( - new LambdaColumn<>( - Model.of("Course start"), - "courseStartDate", - ApplicationPeriod::getCourseStartDate - ) { + new LambdaColumn<>(Model.of("Course start"), "courseStartDate", ApplicationPeriod::getCourseStartDate) { @Override public String getCssClass() { return "text-nowrap"; @@ -140,10 +132,7 @@ public class AdminApplicationPeriodsPanel extends Panel { ) ) { @Override - public Component getComponent( - String componentId, - IModel<ProjectType> t - ) { + public Component getComponent(String componentId, IModel<ProjectType> t) { return new Label( componentId, LambdaModel.of(t, ProjectType::getName, ProjectType::setName) @@ -170,10 +159,7 @@ public class AdminApplicationPeriodsPanel extends Panel { columns.add( new ClickableIconColumn<>(Model.of("Edit"), null, ClickableIconColumn.EDIT) { @Override - protected void onClick( - IModel<ApplicationPeriod> applicationPeriodModel, - AjaxRequestTarget target - ) { + protected void onClick(IModel<ApplicationPeriod> applicationPeriodModel, AjaxRequestTarget target) { PageParameters pp = new PageParameters(); pp.add( PageParameterKeys.MAP.get(ApplicationPeriod.class), @@ -231,9 +217,7 @@ public class AdminApplicationPeriodsPanel extends Panel { new ApplicationPeriodActivityPlanTemplateColumnPanel(s, iModel) { @Override public void onClick(AjaxRequestTarget target) { - iModel.setObject( - applicationPeriodService.findOne(iModel.getObject().getId()) - ); + iModel.setObject(applicationPeriodService.findOne(iModel.getObject().getId())); modalWindowPlus.setContent( new EditApplicationPeriodActivityPlanTemplatePanel( modalWindowPlus.getContentId(), @@ -253,20 +237,13 @@ public class AdminApplicationPeriodsPanel extends Panel { Set<ProjectType> projectTypes = rowModel.getObject().getProjectTypes(); for (ProjectType projectType : projectTypes) { ApplicationPeriodProjectType applicationPeriodProjectType = - applicationPeriodProjectTypeService.findOne( - rowModel.getObject(), - projectType - ); + applicationPeriodProjectTypeService.findOne(rowModel.getObject(), projectType); ActivityPlanTemplate activityPlanTemplate = applicationPeriodProjectType.getActivityPlanTemplate(); s .append(projectType.getName()) .append(": ") - .append( - activityPlanTemplate != null - ? activityPlanTemplate.getTitle() - : "None" - ) + .append(activityPlanTemplate != null ? activityPlanTemplate.getTitle() : "None") .append(' '); } return Model.of(s.toString()); @@ -284,10 +261,7 @@ public class AdminApplicationPeriodsPanel extends Panel { "Are you sure you want to delete this application period?" ) { @Override - protected void onClick( - IModel<ApplicationPeriod> clicked, - AjaxRequestTarget target - ) { + protected void onClick(IModel<ApplicationPeriod> clicked, AjaxRequestTarget target) { try { applicationPeriodService.delete(clicked.getObject().getId()); info("Deleted application period"); @@ -315,15 +289,9 @@ public class AdminApplicationPeriodsPanel extends Panel { item.add( new LabelAndLinkColumn<>(componentId, model, "Edit exemptions", true) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<ApplicationPeriod> model - ) { + public void onClick(AjaxRequestTarget target, IModel<ApplicationPeriod> model) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(ApplicationPeriod.class), - model.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(ApplicationPeriod.class), model.getObject().getId()); setResponsePage(AdminEditApplicationPeriodExemptionsPage.class, pp); } @@ -331,10 +299,7 @@ public class AdminApplicationPeriodsPanel extends Panel { public String labelString() { ApplicationPeriod object = model.getObject(); return ( - object.noOfExemptions() + - " (" + - object.noOfExemptedStudents() + - " student(s)) " + object.noOfExemptions() + " (" + object.noOfExemptedStudents() + " student(s)) " ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java index a4a094db22..b5f468bfa8 100644 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java @@ -62,9 +62,7 @@ public class AdminEditApplicationPeriodExemptionsPage .map(ApplicationPeriod::getApplicationPeriodExemptions) .map(ArrayList::new) .map(list -> { - list.sort( - Comparator.comparing(ApplicationPeriodExemption::getGrantedOn).reversed() - ); + list.sort(Comparator.comparing(ApplicationPeriodExemption::getGrantedOn).reversed()); return list; }); @@ -74,50 +72,24 @@ public class AdminEditApplicationPeriodExemptionsPage new ListView<>(EXEMPTIONS, exemptionsModel) { @Override protected void populateItem(final ListItem<ApplicationPeriodExemption> item) { + item.add(new UserLinkPanel("user", item.getModel().map(ApplicationPeriodExemption::getUser))); + item.add(new EnumLabel<>("type", item.getModel().map(ApplicationPeriodExemption::getType))); + item.add(new NoBreakLabel("newDate", item.getModel().map(ApplicationPeriodExemption::getEndDate))); item.add( - new UserLinkPanel( - "user", - item.getModel().map(ApplicationPeriodExemption::getUser) - ) + new MultiLineLabel("comment", item.getModel().map(ApplicationPeriodExemption::getComment)) ); item.add( - new EnumLabel<>( - "type", - item.getModel().map(ApplicationPeriodExemption::getType) - ) + new UserLinkPanel("grantedBy", item.getModel().map(ApplicationPeriodExemption::getGrantedBy)) ); item.add( - new NoBreakLabel( - "newDate", - item.getModel().map(ApplicationPeriodExemption::getEndDate) - ) - ); - item.add( - new MultiLineLabel( - "comment", - item.getModel().map(ApplicationPeriodExemption::getComment) - ) - ); - item.add( - new UserLinkPanel( - "grantedBy", - item.getModel().map(ApplicationPeriodExemption::getGrantedBy) - ) - ); - item.add( - new NoBreakLabel( - "grantedOn", - item.getModel().map(ApplicationPeriodExemption::getGrantedOn) - ) + new NoBreakLabel("grantedOn", item.getModel().map(ApplicationPeriodExemption::getGrantedOn)) ); item.add( new Link<>(DELETE, item.getModel()) { @Override public void onClick() { - model - .getObject() - .removeApplicationPeriodExemption(item.getModelObject()); + model.getObject().removeApplicationPeriodExemption(item.getModelObject()); applicationPeriodService.save(model.getObject()); getSession().info(getString("deleted")); setResponsePage(getPageClass(), getPageParameters()); @@ -145,9 +117,7 @@ public class AdminEditApplicationPeriodExemptionsPage super(id, model); add(new FeedbackPanel("feedback")); - final Model<ApplicationPeriodExemption> exemptionModel = Model.of( - new ApplicationPeriodExemption() - ); + final Model<ApplicationPeriodExemption> exemptionModel = Model.of(new ApplicationPeriodExemption()); final AuthorAutoComplete exemptedAuthor = new AuthorAutoComplete("author") { @Override @@ -155,11 +125,7 @@ public class AdminEditApplicationPeriodExemptionsPage }; exemptedAuthor.setRequired(true); exemptedAuthor.setModel( - LambdaModel.of( - exemptionModel, - ApplicationPeriodExemption::getUser, - ApplicationPeriodExemption::setUser - ) + LambdaModel.of(exemptionModel, ApplicationPeriodExemption::getUser, ApplicationPeriodExemption::setUser) ); add(exemptedAuthor); @@ -169,9 +135,7 @@ public class AdminEditApplicationPeriodExemptionsPage add(dateContainer); dateContainer.add(new Label("periodEnd", model.map(ApplicationPeriod::getEndDate))); - dateContainer.add( - new Label("courseStart", model.map(ApplicationPeriod::getCourseStartDate)) - ); + dateContainer.add(new Label("courseStart", model.map(ApplicationPeriod::getCourseStartDate))); TextField<LocalDate> newDate = new TextField<>( "endDate", @@ -186,25 +150,22 @@ public class AdminEditApplicationPeriodExemptionsPage newDate.add(new BootstrapDatePicker()); dateContainer.add(newDate); - final DropDownChoice<ApplicationPeriodExemption.Type> exemptionType = - new DropDownChoice<>( - "type", - LambdaModel.of( - exemptionModel, - ApplicationPeriodExemption::getType, - ApplicationPeriodExemption::setType - ), - List.of(ApplicationPeriodExemption.Type.values()), - new EnumChoiceRenderer<>(this) - ); + final DropDownChoice<ApplicationPeriodExemption.Type> exemptionType = new DropDownChoice<>( + "type", + LambdaModel.of( + exemptionModel, + ApplicationPeriodExemption::getType, + ApplicationPeriodExemption::setType + ), + List.of(ApplicationPeriodExemption.Type.values()), + new EnumChoiceRenderer<>(this) + ); exemptionType.setRequired(true); exemptionType.add( new AjaxFormComponentUpdatingBehavior("input") { @Override protected void onUpdate(AjaxRequestTarget target) { - dateContainer.setVisible( - exemptionType.getConvertedInput().requiresEndDate() - ); + dateContainer.setVisible(exemptionType.getConvertedInput().requiresEndDate()); if (dateContainer.isVisible()) { newDate.setModelObject(getModelObject().getEndDate()); } else { @@ -263,8 +224,7 @@ public class AdminEditApplicationPeriodExemptionsPage @Override public void validate(Form<?> form) { - for (ApplicationPeriodExemption ape : getModelObject() - .getApplicationPeriodExemptions()) { + for (ApplicationPeriodExemption ape : getModelObject().getApplicationPeriodExemptions()) { if ( ape.getUser().equals(author.getConvertedInput()) && ape.getType().equals(exemptionType.getConvertedInput()) diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java index a26cfac88d..2409d13d83 100644 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java @@ -67,10 +67,9 @@ public class AdminEditApplicationPeriodPage @Override protected void populateItem(ListItem<ProjectType> item) { item.add( - new CheckBox( - CHECKBOX, - new ProjectTypeSelectionModel(item.getModel()) - ).setOutputMarkupId(true) + new CheckBox(CHECKBOX, new ProjectTypeSelectionModel(item.getModel())).setOutputMarkupId( + true + ) ); item.add(new Label("name", item.getModel().map(ProjectType::getName))); } @@ -78,35 +77,19 @@ public class AdminEditApplicationPeriodPage ); final FormComponent<LocalDate> startDate = addDateField( START_DATE, - LambdaModel.of( - getModel(), - ApplicationPeriod::getStartDate, - ApplicationPeriod::setStartDate - ) + LambdaModel.of(getModel(), ApplicationPeriod::getStartDate, ApplicationPeriod::setStartDate) ); final FormComponent<LocalDate> endDate = addDateField( END_DATE, - LambdaModel.of( - getModel(), - ApplicationPeriod::getEndDate, - ApplicationPeriod::setEndDate - ) + LambdaModel.of(getModel(), ApplicationPeriod::getEndDate, ApplicationPeriod::setEndDate) ); final FormComponent<LocalDate> courseStartDate = addDateField( COURSE_START_DATE, - LambdaModel.of( - getModel(), - ApplicationPeriod::getCourseStartDate, - ApplicationPeriod::setCourseStartDate - ) + LambdaModel.of(getModel(), ApplicationPeriod::getCourseStartDate, ApplicationPeriod::setCourseStartDate) ); final FormComponent<LocalDate> courseEndDate = addDateField( "courseEndDate", - LambdaModel.of( - getModel(), - ApplicationPeriod::getCourseEndDate, - ApplicationPeriod::setCourseEndDate - ) + LambdaModel.of(getModel(), ApplicationPeriod::getCourseEndDate, ApplicationPeriod::setCourseEndDate) ); courseEndDate.setRequired(false); final RequiredTextField<LocalTime> courseStartTime = new RequiredTextField<>( diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java index a47ad55229..6e4af88c9c 100644 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java @@ -31,9 +31,7 @@ import se.su.dsv.scipro.springdata.services.SupervisorService.FilterParams; import se.su.dsv.scipro.springdata.services.UnitService; import se.su.dsv.scipro.system.*; -public class AdminEditTargetsPage - extends AbstractAdminMatchPage - implements MenuHighlightAdminApplicationPeriod { +public class AdminEditTargetsPage extends AbstractAdminMatchPage implements MenuHighlightAdminApplicationPeriod { private static final String FILTER_FORM = "filterForm"; static final String HEADER = "header"; @@ -92,8 +90,10 @@ public class AdminEditTargetsPage sendMailLink.setOutputMarkupPlaceholderTag(true); add(sendMailLink); final IModel<List<ApplicationPeriod>> periods = LoadableDetachableModel.of(() -> { - final Collection<ApplicationPeriod> previousPeriods = - applicationPeriodService.getPreviousPeriods(model.getObject(), 2); + final Collection<ApplicationPeriod> previousPeriods = applicationPeriodService.getPreviousPeriods( + model.getObject(), + 2 + ); final List<ApplicationPeriod> all = new ArrayList<>(previousPeriods); all.add(0, model.getObject()); return all; @@ -103,10 +103,7 @@ public class AdminEditTargetsPage @Override protected void populateItem(ListItem<ApplicationPeriod> item) { final IModel<ApplicationPeriod> applicationPeriod = item.getModel(); - final Label name = new Label( - "name", - applicationPeriod.map(ApplicationPeriod::getName) - ); + final Label name = new Label("name", applicationPeriod.map(ApplicationPeriod::getName)); name.add( AttributeModifier.replace( "colspan", @@ -124,15 +121,11 @@ public class AdminEditTargetsPage item.add( new ListView<>( "projectTypes", - new ListAdapterModel<>( - item.getModel().map(ApplicationPeriod::getProjectTypes) - ) + new ListAdapterModel<>(item.getModel().map(ApplicationPeriod::getProjectTypes)) ) { @Override protected void populateItem(ListItem<ProjectType> item) { - item.add( - new Label("name", item.getModel().map(ProjectType::getName)) - ); + item.add(new Label("name", item.getModel().map(ProjectType::getName))); } } ); @@ -147,12 +140,7 @@ public class AdminEditTargetsPage final IModel<User> user = item.getModel(); item.add(new UserLabel("name", user)); item.add(new Label("unit", user.map(User::getUnit).map(Unit::getTitle))); - item.add( - new Label( - "researchAreas", - user.map(user_ -> getGetResearchAreaNames(user_)) - ) - ); + item.add(new Label("researchAreas", user.map(user_ -> getGetResearchAreaNames(user_)))); item.add( new ListView<>("applicationPeriods", periods) { @Override @@ -162,9 +150,7 @@ public class AdminEditTargetsPage new ListView<>( "projectTypes", new ListAdapterModel<>( - applicationPeriod.map( - ApplicationPeriod::getProjectTypes - ) + applicationPeriod.map(ApplicationPeriod::getProjectTypes) ) ) { @Override @@ -182,10 +168,7 @@ public class AdminEditTargetsPage currentPeriod ) { @Override - public void update( - AjaxRequestTarget ajaxTarget, - User e - ) { + public void update(AjaxRequestTarget ajaxTarget, User e) { success(getString("saved", user)); ajaxTarget.add(feedback); } @@ -232,11 +215,7 @@ public class AdminEditTargetsPage } private String getGetResearchAreaNames(User user) { - return user - .getResearchAreas() - .stream() - .map(ResearchArea::getTitle) - .collect(Collectors.joining(", ")); + return user.getResearchAreas().stream().map(ResearchArea::getTitle).collect(Collectors.joining(", ")); } private class FilterForm extends Form<FilterParams> { @@ -272,19 +251,12 @@ public class AdminEditTargetsPage add( new AjaxDropDownChoice<>( "researchArea", - LambdaModel.of( - model, - FilterParams::getResearchArea, - FilterParams::setResearchArea - ), + LambdaModel.of(model, FilterParams::getResearchArea, FilterParams::setResearchArea), researchAreaService.findNotDeleted(), new LambdaChoiceRenderer<>(ResearchArea::getTitle, ResearchArea::getId) ) { @Override - public void onNewSelection( - AjaxRequestTarget target, - ResearchArea objectSelected - ) { + public void onNewSelection(AjaxRequestTarget target, ResearchArea objectSelected) { target.add(table, sendMailLink); } }.setNullValid(true) diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java index d98e5323a6..461d938f53 100644 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java @@ -28,20 +28,16 @@ public abstract class ApplicationPeriodActivityPlanTemplateColumnPanel extends P protected ListView<ProjectType> list; - public ApplicationPeriodActivityPlanTemplateColumnPanel( - String id, - final IModel<ApplicationPeriod> model - ) { + public ApplicationPeriodActivityPlanTemplateColumnPanel(String id, final IModel<ApplicationPeriod> model) { super(id, model); list = new ListView<>(LIST, new ArrayList<>(model.getObject().getProjectTypes())) { @Override protected void populateItem(ListItem<ProjectType> item) { item.add(new Label(PC, item.getModelObject().getName())); - ApplicationPeriodProjectType applicationPeriodProjectType = - applicationPeriodProjectTypeService.findOne( - model.getObject(), - item.getModelObject() - ); + ApplicationPeriodProjectType applicationPeriodProjectType = applicationPeriodProjectTypeService.findOne( + model.getObject(), + item.getModelObject() + ); item.add( new Label( TEMPLATE, diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanel.java index d73a89a696..7dfa15c1cc 100644 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanel.java @@ -35,11 +35,6 @@ public class ApplicationPeriodInfoPanel extends Panel { add(new Label(START_DATE, applicationPeriod.map(ApplicationPeriod::getStartDate))); add(new Label(END_DATE, applicationPeriod.map(ApplicationPeriod::getEndDate))); - add( - new Label( - COURSE_START_DATE, - applicationPeriod.map(ApplicationPeriod::getCourseStartDate) - ) - ); + add(new Label(COURSE_START_DATE, applicationPeriod.map(ApplicationPeriod::getCourseStartDate))); } } diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java index e644583872..fa9024caee 100644 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java @@ -48,12 +48,11 @@ public class ApplicationPeriodSupervisorPanel extends Panel { item.add(new Label(TARGET, Integer.toString(getTarget(item.getModelObject())))); item.add(new Label(CURRENT, Long.toString(getCurrent(item.getModelObject())))); - final int ideasLeftToCreateToMeetTarget = - targetService.ideasLeftToCreateToMeetTarget( - model.getObject(), - employee, - item.getModelObject() - ); + final int ideasLeftToCreateToMeetTarget = targetService.ideasLeftToCreateToMeetTarget( + model.getObject(), + employee, + item.getModelObject() + ); item.add( new Label( diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java index bfb0bb1a97..bb25245768 100644 --- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java @@ -35,10 +35,7 @@ public class EditApplicationPeriodActivityPlanTemplatePanel extends Panel { protected ListView<ApplicationPeriodProjectType> list; - public EditApplicationPeriodActivityPlanTemplatePanel( - String id, - final IModel<ApplicationPeriod> model - ) { + public EditApplicationPeriodActivityPlanTemplatePanel(String id, final IModel<ApplicationPeriod> model) { super(id, model); add(new EditForm(FORM, model)); } @@ -53,10 +50,7 @@ public class EditApplicationPeriodActivityPlanTemplatePanel extends Panel { item.add( new Label( PC, - item - .getModel() - .map(ApplicationPeriodProjectType::getProjectType) - .map(ProjectType::getName) + item.getModel().map(ApplicationPeriodProjectType::getProjectType).map(ProjectType::getName) ) ); item.add( @@ -68,10 +62,7 @@ public class EditApplicationPeriodActivityPlanTemplatePanel extends Panel { ApplicationPeriodProjectType::setActivityPlanTemplate ), new ListAdapterModel<>(getTemplates()), - new LambdaChoiceRenderer<>( - ActivityPlanTemplate::getTitle, - ActivityPlanTemplate::getId - ) + new LambdaChoiceRenderer<>(ActivityPlanTemplate::getTitle, ActivityPlanTemplate::getId) ).setNullValid(true) ); } @@ -88,12 +79,8 @@ public class EditApplicationPeriodActivityPlanTemplatePanel extends Panel { }; } - private IModel<List<ApplicationPeriodProjectType>> getProjectTypes( - IModel<ApplicationPeriod> model - ) { - return new ListAdapterModel<>( - model.map(ApplicationPeriod::getApplicationPeriodProjectTypes) - ); + private IModel<List<ApplicationPeriodProjectType>> getProjectTypes(IModel<ApplicationPeriod> model) { + return new ListAdapterModel<>(model.map(ApplicationPeriod::getApplicationPeriodProjectTypes)); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/basepages/BasePage.java b/view/src/main/java/se/su/dsv/scipro/basepages/BasePage.java index b7d3654f2e..1b7275afff 100755 --- a/view/src/main/java/se/su/dsv/scipro/basepages/BasePage.java +++ b/view/src/main/java/se/su/dsv/scipro/basepages/BasePage.java @@ -43,31 +43,17 @@ public abstract class BasePage extends WebPage implements IAjaxIndicatorAware { new WebjarsJavaScriptResourceReference("bootstrap/current/css/bootstrap.min.css") ) ); + response.render(CssHeaderItem.forReference(new ContextRelativeResourceReference("css/scipro_m.css", false))); response.render( - CssHeaderItem.forReference( - new ContextRelativeResourceReference("css/scipro_m.css", false) - ) + JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference()) ); response.render( - JavaScriptHeaderItem.forReference( - getApplication().getJavaScriptLibrarySettings().getJQueryReference() - ) + JavaScriptHeaderItem.forReference(new ContextRelativeResourceReference("js/scroll-sneak.js", false)) ); + response.render(JavaScriptHeaderItem.forReference(new ContextRelativeResourceReference("js/scipro.js", false))); response.render( JavaScriptHeaderItem.forReference( - new ContextRelativeResourceReference("js/scroll-sneak.js", false) - ) - ); - response.render( - JavaScriptHeaderItem.forReference( - new ContextRelativeResourceReference("js/scipro.js", false) - ) - ); - response.render( - JavaScriptHeaderItem.forReference( - new WebjarsJavaScriptResourceReference( - "bootstrap/current/js/bootstrap.bundle.min.js" - ) + new WebjarsJavaScriptResourceReference("bootstrap/current/js/bootstrap.bundle.min.js") ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java b/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java index 4584cf9479..642dd88f91 100755 --- a/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java @@ -45,19 +45,12 @@ public class FooterPanel extends Panel { WebMarkupContainer wmc = new WebMarkupContainer("addresses"); wmc.setOutputMarkupId(true); wmc.add( - new Label( - "title", - LambdaModel.of(footerAddress, FooterAddress::getTitle, FooterAddress::setTitle) - ) + new Label("title", LambdaModel.of(footerAddress, FooterAddress::getTitle, FooterAddress::setTitle)) ); wmc.add( new Label( "address", - LambdaModel.of( - footerAddress, - FooterAddress::getAddress, - FooterAddress::setAddress - ) + LambdaModel.of(footerAddress, FooterAddress::getAddress, FooterAddress::setAddress) ) ); add(wmc); @@ -81,16 +74,8 @@ public class FooterPanel extends Panel { item.add( new ExternalLink( "link", - LambdaModel.of( - item.getModel(), - FooterLink::getUrl, - FooterLink::setUrl - ), - LambdaModel.of( - item.getModel(), - FooterLink::getTitle, - FooterLink::setTitle - ) + LambdaModel.of(item.getModel(), FooterLink::getUrl, FooterLink::setUrl), + LambdaModel.of(item.getModel(), FooterLink::getTitle, FooterLink::setTitle) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java index 665ea3f05f..1deabf1acc 100755 --- a/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java @@ -23,9 +23,7 @@ public class NotificationsMenuPanel extends Panel { final IModel<String> unreadModel = new LoadableDetachableModel<>() { @Override protected String load() { - long unreadNotifications = notificationService.countUnread( - SciProSession.get().getUser() - ); + long unreadNotifications = notificationService.countUnread(SciProSession.get().getUser()); return unreadNotifications == 0 ? HIDE_BADGE : String.valueOf(unreadNotifications); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/AdminChecklistPage.java b/view/src/main/java/se/su/dsv/scipro/checklists/AdminChecklistPage.java index 5420f6011d..6f13ac745a 100755 --- a/view/src/main/java/se/su/dsv/scipro/checklists/AdminChecklistPage.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/AdminChecklistPage.java @@ -6,9 +6,7 @@ import se.su.dsv.scipro.security.auth.Authorization; import se.su.dsv.scipro.security.auth.roles.Roles; @Authorization(authorizedRoles = { Roles.SYSADMIN, Roles.ADMIN }) -public class AdminChecklistPage - extends AbstractAdminProjectPage - implements MenuHighlightAdminChecklist { +public class AdminChecklistPage extends AbstractAdminProjectPage implements MenuHighlightAdminChecklist { public AdminChecklistPage() { add(new ChecklistTemplateDataPanel("datapanel")); diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java index 0c47c5bfe5..4b597d35df 100644 --- a/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java @@ -33,9 +33,7 @@ import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectTypeService; import se.su.dsv.scipro.util.PageParameterKeys; -public class AdminEditChecklistTemplatePage - extends AbstractAdminProjectPage - implements MenuHighlightAdminChecklist { +public class AdminEditChecklistTemplatePage extends AbstractAdminProjectPage implements MenuHighlightAdminChecklist { public static final String FEEDBACK = "feedback"; public static final String FORM = "form"; @@ -56,16 +54,12 @@ public class AdminEditChecklistTemplatePage public AdminEditChecklistTemplatePage(PageParameters pp) { add(new FencedFeedbackPanel(FEEDBACK, this)); - final IModel<ChecklistTemplate> model = new DetachableServiceModel<>( - checklistTemplateService - ); + final IModel<ChecklistTemplate> model = new DetachableServiceModel<>(checklistTemplateService); if (pp.get(PageParameterKeys.MAP.get(ChecklistTemplate.class)).isNull()) { model.setObject(new ChecklistTemplate()); } else { model.setObject( - checklistTemplateService.findOne( - pp.get(PageParameterKeys.MAP.get(ChecklistTemplate.class)).toLong() - ) + checklistTemplateService.findOne(pp.get(PageParameterKeys.MAP.get(ChecklistTemplate.class)).toLong()) ); } @@ -91,38 +85,23 @@ public class AdminEditChecklistTemplatePage add( new TextArea<>( DESCRIPTION, - LambdaModel.of( - model, - ChecklistTemplate::getDescription, - ChecklistTemplate::setDescription - ) + LambdaModel.of(model, ChecklistTemplate::getDescription, ChecklistTemplate::setDescription) ) ); add( new BootstrapCheckBoxMultipleChoice<>( CATEGORIES, - LambdaModel.of( - model, - ChecklistTemplate::getCategories, - ChecklistTemplate::setCategories - ), + LambdaModel.of(model, ChecklistTemplate::getCategories, ChecklistTemplate::setCategories), checklistCategoryRepo.findAll(), - new LambdaChoiceRenderer<>( - ChecklistCategory::getCategoryName, - ChecklistCategory::getId - ) + new LambdaChoiceRenderer<>(ChecklistCategory::getCategoryName, ChecklistCategory::getId) ) ); add( new BootstrapCheckBoxMultipleChoice<>( PROJECT_TYPES, - LambdaModel.of( - model, - ChecklistTemplate::getProjectTypes, - ChecklistTemplate::setProjectTypes - ), + LambdaModel.of(model, ChecklistTemplate::getProjectTypes, ChecklistTemplate::setProjectTypes), getRelevantProjectTypes(), new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) ) @@ -213,9 +192,7 @@ public class AdminEditChecklistTemplatePage template.setCreator(SciProSession.get().getUser()); } if (template.getTemplateNumber() == ChecklistTemplate.DEFAULT_TEMPLATE_NUMBER) { - template.setTemplateNumber( - SciProUtilities.safeLongToInt(checklistTemplateService.count()) - ); + template.setTemplateNumber(SciProUtilities.safeLongToInt(checklistTemplateService.count())); } setModelObject(checklistTemplateService.save(EditForm.this.getModelObject())); success(getString("success")); diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/AnswerPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/AnswerPanel.java index f3441712ac..47cd8b60dd 100644 --- a/view/src/main/java/se/su/dsv/scipro/checklists/AnswerPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/AnswerPanel.java @@ -26,10 +26,7 @@ public abstract class AnswerPanel extends Panel { ANSWER_IMAGES.put(ChecklistAnswerEnum.GREEN, "images/icons/bullet_ball_glass_green.png"); ANSWER_IMAGES.put(ChecklistAnswerEnum.YELLOW, "images/icons/bullet_ball_glass_yellow.png"); ANSWER_IMAGES.put(ChecklistAnswerEnum.RED, "images/icons/bullet_ball_glass_red.png"); - ANSWER_IMAGES.put( - ChecklistAnswerEnum.NOT_APPLICABLE, - "images/icons/bullet_ball_glass_grey.png" - ); + ANSWER_IMAGES.put(ChecklistAnswerEnum.NOT_APPLICABLE, "images/icons/bullet_ball_glass_grey.png"); } public static final String CLICK_ICON = "images/icons/bullet_ball_glass_click.png"; @@ -37,11 +34,7 @@ public abstract class AnswerPanel extends Panel { private ModalWindowPlus dialog; - public AnswerPanel( - String id, - final IModel<ChecklistQuestion> question, - final IModel<User> user - ) { + public AnswerPanel(String id, final IModel<ChecklistQuestion> question, final IModel<User> user) { super(id); dialog = new ModalWindowPlus("dialog"); add(dialog); diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java index b8a0123e6e..3fab1fc4c8 100644 --- a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java @@ -71,9 +71,7 @@ public class ChecklistOverviewPanel extends GenericPanel<Project> { ); } - private LoadableDetachableModel<Long> countAnswers( - final ChecklistAnswerEnum checklistAnswerEnum - ) { + private LoadableDetachableModel<Long> countAnswers(final ChecklistAnswerEnum checklistAnswerEnum) { return new LoadableDetachableModel<>() { @Override protected Long load() { diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java index d20aba543b..0788a57d45 100755 --- a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java @@ -62,10 +62,7 @@ public class ChecklistQuestionPanel extends GenericPanel<Checklist> { new ListView<>(QUESTIONS, checklistModel.map(Checklist::getQuestions)) { @Override protected void populateItem(ListItem<ChecklistQuestion> item) { - Label label = new Label( - QUESTION_LABEL, - item.getModel().map(ChecklistQuestion::getQuestion) - ); + Label label = new Label(QUESTION_LABEL, item.getModel().map(ChecklistQuestion::getQuestion)); label.add(new AttributeAppender("id", Model.of(item.getModelObject().getId()))); item.add(label); item.add(new ChecklistAnswerCommentPanel(QUESTION, item.getModel())); @@ -76,20 +73,14 @@ public class ChecklistQuestionPanel extends GenericPanel<Checklist> { } private IModel<List<User>> getAuthors() { - return new ListAdapterModel<>( - getModel().map(Checklist::getProject).map(Project::getProjectParticipants) - ); + return new ListAdapterModel<>(getModel().map(Checklist::getProject).map(Project::getProjectParticipants)); } private class AnswerListView extends ListView<User> { private final IModel<ChecklistQuestion> question; - public AnswerListView( - String id, - IModel<List<User>> model, - IModel<ChecklistQuestion> question - ) { + public AnswerListView(String id, IModel<List<User>> model, IModel<ChecklistQuestion> question) { super(id, model); this.question = question; setOutputMarkupId(true); @@ -118,20 +109,13 @@ public class ChecklistQuestionPanel extends GenericPanel<Checklist> { Checklist checklist = ChecklistQuestionPanel.this.getModelObject(); PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Project.class), - String.valueOf(checklist.getProject().getId()) - ); + pp.add(PageParameterKeys.MAP.get(Project.class), String.valueOf(checklist.getProject().getId())); pp.add(PageParameterKeys.MAP.get(Checklist.class), String.valueOf(checklist.getId())); NotificationSource source = new NotificationSource(); source.setMessage(checklist.getName()); - notificationController.notifyProject( - checklist.getProject(), - ProjectEvent.Event.CHECKLIST_ANSWERED, - source - ); + notificationController.notifyProject(checklist.getProject(), ProjectEvent.Event.CHECKLIST_ANSWERED, source); } } } diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java index 8226253cc2..2a7e5e1076 100755 --- a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java @@ -68,17 +68,9 @@ public class ChecklistTemplateDataPanel extends Panel { List<IColumn<ChecklistTemplate, String>> columns = new ArrayList<>(); columns.add( - new ClickableOrderColumn<>( - Model.of("Order"), - ChecklistTemplate::getTemplateNumber, - "templateNumber" - ) { + new ClickableOrderColumn<>(Model.of("Order"), ChecklistTemplate::getTemplateNumber, "templateNumber") { @Override - protected void onClick( - IModel<ChecklistTemplate> clicked, - AjaxRequestTarget target, - boolean up - ) { + protected void onClick(IModel<ChecklistTemplate> clicked, AjaxRequestTarget target, boolean up) { if (up) { checklistTemplateService.upChecklistTemplate(clicked.getObject()); } else { @@ -106,22 +98,12 @@ public class ChecklistTemplateDataPanel extends Panel { new AjaxLinkPanel<>( s, model, - LambdaModel.of( - model, - ChecklistTemplate::getName, - ChecklistTemplate::setName - ) + LambdaModel.of(model, ChecklistTemplate::getName, ChecklistTemplate::setName) ) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<ChecklistTemplate> model - ) { + public void onClick(AjaxRequestTarget target, IModel<ChecklistTemplate> model) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(ChecklistTemplate.class), - model.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(ChecklistTemplate.class), model.getObject().getId()); setResponsePage(AdminEditChecklistTemplatePage.class, pp); } } @@ -137,9 +119,7 @@ public class ChecklistTemplateDataPanel extends Panel { String id, IModel<ChecklistTemplate> checklistTemplateIModel ) { - item.add( - new Label(id, formatProjectTypeNames(checklistTemplateIModel.getObject())) - ); + item.add(new Label(id, formatProjectTypeNames(checklistTemplateIModel.getObject()))); } @Override @@ -153,10 +133,7 @@ public class ChecklistTemplateDataPanel extends Panel { columns.add( new ClickableIconColumn<>(Model.of("Delete"), null, ClickableIconColumn.DELETE) { @Override - protected void onClick( - IModel<ChecklistTemplate> clicked, - AjaxRequestTarget target - ) { + protected void onClick(IModel<ChecklistTemplate> clicked, AjaxRequestTarget target) { checklistTemplateService.safeDeleteChecklistTemplate(clicked.getObject()); target.add(dataTable); } @@ -187,10 +164,6 @@ public class ChecklistTemplateDataPanel extends Panel { } private String formatProjectTypeNames(ChecklistTemplate checklistTemplate) { - return checklistTemplate - .getProjectTypes() - .stream() - .map(ProjectType::getName) - .collect(Collectors.joining(", ")); + return checklistTemplate.getProjectTypes().stream().map(ProjectType::getName).collect(Collectors.joining(", ")); } } diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java index 21da96a229..51db95c318 100644 --- a/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java @@ -23,11 +23,7 @@ public abstract class EditAnswerPanel extends Panel { final IModel<ChecklistQuestion> question; - public EditAnswerPanel( - String id, - IModel<ChecklistQuestion> question, - IModel<ChecklistAnswer> answer - ) { + public EditAnswerPanel(String id, IModel<ChecklistQuestion> question, IModel<ChecklistAnswer> answer) { super(id); this.question = question; add(new EditAnswerForm("form", answer)); diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java b/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java index f2cdb653c6..9c36c83f80 100755 --- a/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java @@ -15,18 +15,14 @@ import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.util.PageParameterKeys; @Authorization(authorizedRoles = { Roles.AUTHOR }) -public class ProjectViewChecklistPage - extends AbstractProjectDetailsPage - implements MenuHighlightActivityPlan { +public class ProjectViewChecklistPage extends AbstractProjectDetailsPage implements MenuHighlightActivityPlan { @Inject ChecklistService checklistService; public ProjectViewChecklistPage(PageParameters pp) { super(pp); - final Long checklistId = pp - .get(PageParameterKeys.MAP.get(Checklist.class)) - .toOptionalLong(); + final Long checklistId = pp.get(PageParameterKeys.MAP.get(Checklist.class)).toOptionalLong(); if (checklistId == null) { noSuchChecklist(); } @@ -36,10 +32,7 @@ public class ProjectViewChecklistPage noSuchChecklist(); } - final IModel<Checklist> checklistModel = new DetachableServiceModel<>( - checklistService, - checklist - ); + final IModel<Checklist> checklistModel = new DetachableServiceModel<>(checklistService, checklist); add(new ChecklistQuestionPanel("viewChecklistPanel", checklistModel)); } diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java b/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java index f9d0ce27b5..9beb9c70e3 100755 --- a/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java @@ -25,10 +25,7 @@ public class SupervisorViewChecklistPage public SupervisorViewChecklistPage(PageParameters pp) { super(pp); Long checklistId = pp.get(PageParameterKeys.MAP.get(Checklist.class)).toLong(); - final IModel<Checklist> checklistModel = new DetachableServiceModel<>( - checklistService, - checklistId - ); + final IModel<Checklist> checklistModel = new DetachableServiceModel<>(checklistService, checklistId); add(new ChecklistQuestionPanel("questions", checklistModel)); } } diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/TrafficLightPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/TrafficLightPanel.java index ee8b92fba1..623b87390c 100644 --- a/view/src/main/java/se/su/dsv/scipro/checklists/TrafficLightPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/TrafficLightPanel.java @@ -34,22 +34,10 @@ public class TrafficLightPanel extends FormComponentPanel<ChecklistAnswerEnum> { } private void setUpImages() { - greenImage = new ContextImage( - "greenImage", - new Model<>("images/icons/bullet_ball_glass_green.png") - ); - yellowImage = new ContextImage( - "yellowImage", - new Model<>("images/icons/bullet_ball_glass_yellow.png") - ); - redImage = new ContextImage( - "redImage", - new Model<>("images/icons/bullet_ball_glass_red.png") - ); - noAnswerImage = new ContextImage( - "noAnswerImage", - new Model<>("images/icons/bullet_ball_glass_grey.png") - ); + greenImage = new ContextImage("greenImage", new Model<>("images/icons/bullet_ball_glass_green.png")); + yellowImage = new ContextImage("yellowImage", new Model<>("images/icons/bullet_ball_glass_yellow.png")); + redImage = new ContextImage("redImage", new Model<>("images/icons/bullet_ball_glass_red.png")); + noAnswerImage = new ContextImage("noAnswerImage", new Model<>("images/icons/bullet_ball_glass_grey.png")); selectedGreen = new ContextImage( "greenImage", @@ -59,10 +47,7 @@ public class TrafficLightPanel extends FormComponentPanel<ChecklistAnswerEnum> { "yellowImage", new Model<>("images/icons/bullet_ball_glass_yellow_with_border.png") ); - selectedRed = new ContextImage( - "redImage", - new Model<>("images/icons/bullet_ball_glass_red_with_border.png") - ); + selectedRed = new ContextImage("redImage", new Model<>("images/icons/bullet_ball_glass_red_with_border.png")); selectedNotApplicable = new ContextImage( "noAnswerImage", new Model<>("images/icons/bullet_ball_glass_grey_with_border.png") @@ -75,19 +60,9 @@ public class TrafficLightPanel extends FormComponentPanel<ChecklistAnswerEnum> { } private void setUpLinks() { - greenLink = new TrafficLightLink( - "greenLink", - ChecklistAnswerEnum.GREEN, - selectedGreen, - greenImage - ); + greenLink = new TrafficLightLink("greenLink", ChecklistAnswerEnum.GREEN, selectedGreen, greenImage); redLink = new TrafficLightLink("redLink", ChecklistAnswerEnum.RED, selectedRed, redImage); - yellowLink = new TrafficLightLink( - "yellowLink", - ChecklistAnswerEnum.YELLOW, - selectedYellow, - yellowImage - ); + yellowLink = new TrafficLightLink("yellowLink", ChecklistAnswerEnum.YELLOW, selectedYellow, yellowImage); noAnswerLink = new TrafficLightLink( "noAnswerLink", ChecklistAnswerEnum.NOT_APPLICABLE, @@ -137,11 +112,7 @@ public class TrafficLightPanel extends FormComponentPanel<ChecklistAnswerEnum> { noAnswerLink.replace(noAnswerImage); } - private void swapImages( - ChecklistAnswerEnum answer, - ContextImage selectedImage, - TrafficLightLink link - ) { + private void swapImages(ChecklistAnswerEnum answer, ContextImage selectedImage, TrafficLightLink link) { selected = answer; link.replace(selectedImage); } diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ViewChecklistTemplatePanelPeer.java b/view/src/main/java/se/su/dsv/scipro/checklists/ViewChecklistTemplatePanelPeer.java index e193a7efd1..1b4f23c05e 100755 --- a/view/src/main/java/se/su/dsv/scipro/checklists/ViewChecklistTemplatePanelPeer.java +++ b/view/src/main/java/se/su/dsv/scipro/checklists/ViewChecklistTemplatePanelPeer.java @@ -12,20 +12,11 @@ public class ViewChecklistTemplatePanelPeer extends Panel { public ViewChecklistTemplatePanelPeer(String id, final IModel<ChecklistTemplate> clt) { super(id); - add( - new Label( - "templateName", - LambdaModel.of(clt, ChecklistTemplate::getName, ChecklistTemplate::setName) - ) - ); + add(new Label("templateName", LambdaModel.of(clt, ChecklistTemplate::getName, ChecklistTemplate::setName))); add( new ListView<>( "questions", - LambdaModel.of( - clt, - ChecklistTemplate::getQuestions, - ChecklistTemplate::setQuestions - ) + LambdaModel.of(clt, ChecklistTemplate::getQuestions, ChecklistTemplate::setQuestions) ) { @Override protected void populateItem(ListItem<String> item) { diff --git a/view/src/main/java/se/su/dsv/scipro/components/AbstractMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/components/AbstractMenuPanel.java index 5f24c2249e..9f0cc89bc9 100755 --- a/view/src/main/java/se/su/dsv/scipro/components/AbstractMenuPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AbstractMenuPanel.java @@ -68,9 +68,7 @@ public abstract class AbstractMenuPanel extends Panel { final WebMarkupContainer menuContainer = new WebMarkupContainer("menuContainer"); - menuContainer.add( - new AttributeAppender("class", Model.of(CSS_CLASS.get(getMenuType())), " ") - ); + menuContainer.add(new AttributeAppender("class", Model.of(CSS_CLASS.get(getMenuType())), " ")); final ListView<MenuItem> tabList = new ListView<>("menuList", getItemList()) { @Override @@ -90,10 +88,7 @@ public abstract class AbstractMenuPanel extends Panel { highLightAsCurrentByInterface || mi.getTargetClass().equals(containerClass) || (mi.getTargetClass().getSuperclass().isAssignableFrom(containerClass) && - !mi - .getTargetClass() - .getSuperclass() - .equals(menuContainerCommonSuperClass) && + !mi.getTargetClass().getSuperclass().equals(menuContainerCommonSuperClass) && !mi.isPopUp()) ) { item.add(new AttributeAppender("class", Model.of("current"), " ")); @@ -152,11 +147,7 @@ public abstract class AbstractMenuPanel extends Panel { this(name, targetClass, menuHilightInterface, null, false); } - public MenuItem( - final String name, - final Class<? extends Page> targetClass, - PageParameters pp - ) { + public MenuItem(final String name, final Class<? extends Page> targetClass, PageParameters pp) { this(name, targetClass, null, pp, false); } diff --git a/view/src/main/java/se/su/dsv/scipro/components/AbstractUploadForm.java b/view/src/main/java/se/su/dsv/scipro/components/AbstractUploadForm.java index 5f4540d731..dfc74e21b7 100755 --- a/view/src/main/java/se/su/dsv/scipro/components/AbstractUploadForm.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AbstractUploadForm.java @@ -68,8 +68,7 @@ public abstract class AbstractUploadForm<T> extends Form<T> { error(message); LOGGER.info(message, ise); } catch (final Exception ioe) { //Use explicit error handling for uploading causing IOExceptions - String message = - "An error occurred while uploading the resource, please try again"; + String message = "An error occurred while uploading the resource, please try again"; error(message); LOGGER.info(message, ioe); } diff --git a/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java b/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java index c367e40989..d5f0d3bf59 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java @@ -74,12 +74,7 @@ public class AddUsersPanel extends GenericPanel<Set<User>> { users = new ListView<>("users", new ListAdapterModel<>(model)) { @Override protected void populateItem(final ListItem<User> item) { - item.add( - new UserLinkPanel( - "user", - new DetachableServiceModel<>(userService, item.getModelObject()) - ) - ); + item.add(new UserLinkPanel("user", new DetachableServiceModel<>(userService, item.getModelObject()))); item.add( new AjaxLink<>("remove", item.getModel()) { @Override diff --git a/view/src/main/java/se/su/dsv/scipro/components/AjaxDropDownChoice.java b/view/src/main/java/se/su/dsv/scipro/components/AjaxDropDownChoice.java index 017d91a558..4556beefbb 100755 --- a/view/src/main/java/se/su/dsv/scipro/components/AjaxDropDownChoice.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AjaxDropDownChoice.java @@ -13,12 +13,7 @@ public abstract class AjaxDropDownChoice<T> extends DropDownChoice<T> { super(id, model, choices); } - public AjaxDropDownChoice( - String id, - IModel<T> model, - IModel<List<T>> choices, - IChoiceRenderer<T> renderer - ) { + public AjaxDropDownChoice(String id, IModel<T> model, IModel<List<T>> choices, IChoiceRenderer<T> renderer) { super(id, model, choices, renderer); } diff --git a/view/src/main/java/se/su/dsv/scipro/components/AjaxFeedbackPanelUpdater.java b/view/src/main/java/se/su/dsv/scipro/components/AjaxFeedbackPanelUpdater.java index addc1a87d9..6000c966b4 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/AjaxFeedbackPanelUpdater.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AjaxFeedbackPanelUpdater.java @@ -20,10 +20,7 @@ public class AjaxFeedbackPanelUpdater implements AjaxRequestTarget.IListener { .visitChildren( FeedbackPanel.class, (IVisitor<FeedbackPanel, Void>) (feedback, visit) -> { - if ( - feedback.getOutputMarkupId() && - (feedback.anyMessage() || feedback.isVisibleInHierarchy()) - ) { + if (feedback.getOutputMarkupId() && (feedback.anyMessage() || feedback.isVisibleInHierarchy())) { target.add(feedback); } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/AjaxIconLinkPanel.java b/view/src/main/java/se/su/dsv/scipro/components/AjaxIconLinkPanel.java index 9f5acae5c0..30e2986d8f 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/AjaxIconLinkPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AjaxIconLinkPanel.java @@ -28,12 +28,7 @@ public abstract class AjaxIconLinkPanel<T> extends GenericPanel<T> { this.iconString = iconString; } - public AjaxIconLinkPanel( - String id, - final IModel<T> model, - IModel<String> iconString, - String confirmationMessage - ) { + public AjaxIconLinkPanel(String id, final IModel<T> model, IModel<String> iconString, String confirmationMessage) { super(id, model); this.iconString = iconString; this.confirmationMessage = confirmationMessage; @@ -69,9 +64,7 @@ public abstract class AjaxIconLinkPanel<T> extends GenericPanel<T> { super.updateAjaxAttributes(attributes); if (confirmationMessage != null) { AjaxCallListener ajaxCallListener = new AjaxCallListener(); - ajaxCallListener.onPrecondition( - "return confirm('" + confirmationMessage + "');" - ); + ajaxCallListener.onPrecondition("return confirm('" + confirmationMessage + "');"); attributes.getAjaxCallListeners().add(ajaxCallListener); } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/AjaxRadioChoice.java b/view/src/main/java/se/su/dsv/scipro/components/AjaxRadioChoice.java index e3393b6f2f..36935b6ccc 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/AjaxRadioChoice.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AjaxRadioChoice.java @@ -12,12 +12,7 @@ public abstract class AjaxRadioChoice<T> extends BootstrapRadioChoice<T> { private String confirmationMessage; - public AjaxRadioChoice( - String id, - IModel<T> model, - List<? extends T> choices, - IChoiceRenderer<? super T> renderer - ) { + public AjaxRadioChoice(String id, IModel<T> model, List<? extends T> choices, IChoiceRenderer<? super T> renderer) { super(id, model, choices, renderer); } diff --git a/view/src/main/java/se/su/dsv/scipro/components/AutoSavingBehaviour.java b/view/src/main/java/se/su/dsv/scipro/components/AutoSavingBehaviour.java index 19483be20d..18047dfac8 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/AutoSavingBehaviour.java +++ b/view/src/main/java/se/su/dsv/scipro/components/AutoSavingBehaviour.java @@ -27,10 +27,7 @@ public abstract class AutoSavingBehaviour extends AjaxFormComponentUpdatingBehav super.updateAjaxAttributes(attributes); attributes.setThrottlingSettings( - new ThrottlingSettings( - getComponent().getPath(), - Duration.ofSeconds(AUTO_SAVE_INTERVAL_IN_SECONDS) - ) + new ThrottlingSettings(getComponent().getPath(), Duration.ofSeconds(AUTO_SAVE_INTERVAL_IN_SECONDS)) ); attributes .getAjaxCallListeners() diff --git a/view/src/main/java/se/su/dsv/scipro/components/BootstrapCardTabbedPanel.java b/view/src/main/java/se/su/dsv/scipro/components/BootstrapCardTabbedPanel.java index 81324008e5..59a96b263e 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/BootstrapCardTabbedPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/BootstrapCardTabbedPanel.java @@ -15,9 +15,7 @@ public class BootstrapCardTabbedPanel<T extends ITab> extends AjaxTabbedPanel<T> @Override protected WebMarkupContainer newLink(String linkId, int index) { WebMarkupContainer components = super.newLink(linkId, index); - components.add( - AttributeModifier.append("class", () -> getSelectedTab() == index ? "active" : "") - ); + components.add(AttributeModifier.append("class", () -> getSelectedTab() == index ? "active" : "")); return components; } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/BootstrapDatePicker.java b/view/src/main/java/se/su/dsv/scipro/components/BootstrapDatePicker.java index 722b114994..a83d2b72f2 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/BootstrapDatePicker.java +++ b/view/src/main/java/se/su/dsv/scipro/components/BootstrapDatePicker.java @@ -33,18 +33,12 @@ public class BootstrapDatePicker extends Behavior { super.renderHead(component, response); response.render( JavaScriptReferenceHeaderItem.forReference( - new JQueryPluginResourceReference( - BootstrapDatePicker.class, - "bootstrap-datetimepicker.js" - ) + new JQueryPluginResourceReference(BootstrapDatePicker.class, "bootstrap-datetimepicker.js") ) ); response.render( CssReferenceHeaderItem.forReference( - new PackageResourceReference( - BootstrapDatePicker.class, - "bootstrap-datetimepicker.css" - ) + new PackageResourceReference(BootstrapDatePicker.class, "bootstrap-datetimepicker.css") ) ); String javascript = String.format("$('#%s').focus();", component.getMarkupId()); diff --git a/view/src/main/java/se/su/dsv/scipro/components/BootstrapDateTimeComponent.java b/view/src/main/java/se/su/dsv/scipro/components/BootstrapDateTimeComponent.java index 8ee3755307..0dfd377975 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/BootstrapDateTimeComponent.java +++ b/view/src/main/java/se/su/dsv/scipro/components/BootstrapDateTimeComponent.java @@ -83,9 +83,7 @@ public class BootstrapDateTimeComponent extends FormComponentPanel<Date> { if (date == null || time == null) { setConvertedInput(null); } else { - Instant instant = LocalDateTime.of(date, time) - .atZone(ZoneId.systemDefault()) - .toInstant(); + Instant instant = LocalDateTime.of(date, time).atZone(ZoneId.systemDefault()).toInstant(); setConvertedInput(Date.from(instant)); } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/BootstrapTabs.java b/view/src/main/java/se/su/dsv/scipro/components/BootstrapTabs.java index 7320236a32..b3c234b14e 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/BootstrapTabs.java +++ b/view/src/main/java/se/su/dsv/scipro/components/BootstrapTabs.java @@ -23,11 +23,7 @@ public abstract class BootstrapTabs<T> extends GenericPanel<List<T>> { protected void populateItem(final ListItem<T> item) { final IModel<String> labelModel = getLabelModel(item.getModel()); final String href = "#" + BootstrapTabs.this.getHref(labelModel); - final ExternalLink tab = new ExternalLink( - "tabLink", - Model.of(href), - labelModel - ); + final ExternalLink tab = new ExternalLink("tabLink", Model.of(href), labelModel); if (item.getIndex() == 0) { item.add(ACTIVE); tab.add(ACTIVE); diff --git a/view/src/main/java/se/su/dsv/scipro/components/BootstrapTimePicker.java b/view/src/main/java/se/su/dsv/scipro/components/BootstrapTimePicker.java index 86be44396a..94c5930bf8 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/BootstrapTimePicker.java +++ b/view/src/main/java/se/su/dsv/scipro/components/BootstrapTimePicker.java @@ -28,15 +28,10 @@ public class BootstrapTimePicker extends Behavior { ); response.render( JavaScriptHeaderItem.forReference( - new JQueryPluginResourceReference( - BootstrapTimePicker.class, - "bootstrap-clockpicker.js" - ) + new JQueryPluginResourceReference(BootstrapTimePicker.class, "bootstrap-clockpicker.js") ) ); - response.render( - OnDomReadyHeaderItem.forScript(initializeClockpickerJavascript(component.getMarkupId())) - ); + response.render(OnDomReadyHeaderItem.forScript(initializeClockpickerJavascript(component.getMarkupId()))); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/components/CSPPalette.java b/view/src/main/java/se/su/dsv/scipro/components/CSPPalette.java index 949113ab5d..e262ac457f 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/CSPPalette.java +++ b/view/src/main/java/se/su/dsv/scipro/components/CSPPalette.java @@ -46,18 +46,14 @@ public class CSPPalette<T> extends Palette<T> { @Override protected Component newChoicesComponent() { final Component component = super.newChoicesComponent(); - component.add( - replaceAttributeWithEventHandler(this::getAddOnClickJS, this::getChoicesOnFocusJS) - ); + component.add(replaceAttributeWithEventHandler(this::getAddOnClickJS, this::getChoicesOnFocusJS)); return component; } @Override protected Component newSelectionComponent() { final Component component = super.newSelectionComponent(); - component.add( - replaceAttributeWithEventHandler(this::getRemoveOnClickJS, this::getSelectionOnFocusJS) - ); + component.add(replaceAttributeWithEventHandler(this::getRemoveOnClickJS, this::getSelectionOnFocusJS)); return component; } @@ -68,9 +64,7 @@ public class CSPPalette<T> extends Palette<T> { return new Behavior() { @Override public void renderHead(final Component component, final IHeaderResponse response) { - response.render( - OnEventHeaderItem.forComponent(component, "dblclick", ondblclick.get()) - ); + response.render(OnEventHeaderItem.forComponent(component, "dblclick", ondblclick.get())); final String focus = onfocus.get(); if (focus != null) { response.render(OnEventHeaderItem.forComponent(component, "focus", focus)); diff --git a/view/src/main/java/se/su/dsv/scipro/components/CounterTextArea.java b/view/src/main/java/se/su/dsv/scipro/components/CounterTextArea.java index 8aee2dc8be..864b6f9358 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/CounterTextArea.java +++ b/view/src/main/java/se/su/dsv/scipro/components/CounterTextArea.java @@ -39,10 +39,7 @@ public class CounterTextArea extends FormComponentPanel<String> { } private void addFeedbackPanel() { - ComponentFeedbackPanel componentFeedbackPanel = new ComponentFeedbackPanel( - "feedback", - this - ); + ComponentFeedbackPanel componentFeedbackPanel = new ComponentFeedbackPanel("feedback", this); add(componentFeedbackPanel.setOutputMarkupId(true)); } @@ -52,9 +49,7 @@ public class CounterTextArea extends FormComponentPanel<String> { return max - (text != null ? text.length() : 0); }); countLabel.setOutputMarkupId(true); - AjaxFormComponentUpdatingBehavior behavior = new AjaxFormComponentUpdatingBehavior( - "keyup" - ) { + AjaxFormComponentUpdatingBehavior behavior = new AjaxFormComponentUpdatingBehavior("keyup") { @Override protected void onUpdate(AjaxRequestTarget target) { updateCount(target); diff --git a/view/src/main/java/se/su/dsv/scipro/components/DateColumn.java b/view/src/main/java/se/su/dsv/scipro/components/DateColumn.java index 54b04ae054..4c6caba018 100755 --- a/view/src/main/java/se/su/dsv/scipro/components/DateColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/components/DateColumn.java @@ -17,20 +17,12 @@ public class DateColumn<T, S> extends LambdaColumn<T, S> { this(displayModel, dateFunction, DateStyle.DATE); } - public DateColumn( - IModel<String> displayModel, - SerializableFunction<T, Date> dateFunction, - DateStyle dateStyle - ) { + public DateColumn(IModel<String> displayModel, SerializableFunction<T, Date> dateFunction, DateStyle dateStyle) { super(displayModel, dateFunction); this.dateStyle = dateStyle; } - public DateColumn( - IModel<String> displayModel, - SerializableFunction<T, Date> dateFunction, - S sort - ) { + public DateColumn(IModel<String> displayModel, SerializableFunction<T, Date> dateFunction, S sort) { this(displayModel, dateFunction, sort, DateStyle.DATE); } @@ -51,9 +43,7 @@ public class DateColumn<T, S> extends LambdaColumn<T, S> { if (date == null) { return null; } else { - final SimpleDateFormat simpleDateFormat = new SimpleDateFormat( - dateStyle.getFormat() - ); + final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateStyle.getFormat()); return simpleDateFormat.format(date); } }; @@ -61,13 +51,7 @@ public class DateColumn<T, S> extends LambdaColumn<T, S> { @Override @SuppressWarnings("unchecked") - public void populateItem( - Item<ICellPopulator<T>> cellItem, - String componentId, - IModel<T> rowModel - ) { - cellItem.add( - new DateLabel(componentId, (IModel<Date>) super.getDataModel(rowModel), dateStyle) - ); + public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId, IModel<T> rowModel) { + cellItem.add(new DateLabel(componentId, (IModel<Date>) super.getDataModel(rowModel), dateStyle)); } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java b/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java index d82e365671..6707b60507 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java @@ -29,11 +29,7 @@ public class DateLabel extends Label { @Override public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) { - replaceComponentTagBody( - markupStream, - openTag, - "<nobr>" + getDefaultModelObjectAsString() + "</nobr>" - ); + replaceComponentTagBody(markupStream, openTag, "<nobr>" + getDefaultModelObjectAsString() + "</nobr>"); } @Override @@ -49,9 +45,7 @@ public class DateLabel extends Label { @Override public Date convertToObject(String value, Locale locale) { - throw new UnsupportedOperationException( - "DateLabel should not be converting back to date" - ); + throw new UnsupportedOperationException("DateLabel should not be converting back to date"); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/components/DatesValidator.java b/view/src/main/java/se/su/dsv/scipro/components/DatesValidator.java index 83fa6cb5b5..4c73749218 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/DatesValidator.java +++ b/view/src/main/java/se/su/dsv/scipro/components/DatesValidator.java @@ -11,10 +11,7 @@ public class DatesValidator extends AbstractFormValidator { private final FormComponent<LocalDate> firstDateComponent; private final FormComponent<LocalDate> secondDateComponent; - public DatesValidator( - FormComponent<LocalDate> formComponent1, - FormComponent<LocalDate> formComponent2 - ) { + public DatesValidator(FormComponent<LocalDate> formComponent1, FormComponent<LocalDate> formComponent2) { firstDateComponent = Args.notNull(formComponent1, "formComponent1"); secondDateComponent = Args.notNull(formComponent2, "formComponent2"); } diff --git a/view/src/main/java/se/su/dsv/scipro/components/DefaultSelect2MultiChoice.java b/view/src/main/java/se/su/dsv/scipro/components/DefaultSelect2MultiChoice.java index ef3b88b0ba..af43efad7e 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/DefaultSelect2MultiChoice.java +++ b/view/src/main/java/se/su/dsv/scipro/components/DefaultSelect2MultiChoice.java @@ -7,11 +7,7 @@ import org.wicketstuff.select2.Select2MultiChoice; public class DefaultSelect2MultiChoice<T> extends Select2MultiChoice<T> { - public DefaultSelect2MultiChoice( - String id, - IModel<Collection<T>> model, - ChoiceProvider<T> provider - ) { + public DefaultSelect2MultiChoice(String id, IModel<Collection<T>> model, ChoiceProvider<T> provider) { super(id, model, provider); } diff --git a/view/src/main/java/se/su/dsv/scipro/components/EnumLambdaColumn.java b/view/src/main/java/se/su/dsv/scipro/components/EnumLambdaColumn.java index 7c2821f0e8..dca3faa2b7 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/EnumLambdaColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/components/EnumLambdaColumn.java @@ -11,11 +11,7 @@ public class EnumLambdaColumn<T, S, E extends Enum<E>> extends LambdaColumn<T, S private final SerializableFunction<T, E> function; - public EnumLambdaColumn( - IModel<String> displayModel, - S sortProperty, - SerializableFunction<T, E> function - ) { + public EnumLambdaColumn(IModel<String> displayModel, S sortProperty, SerializableFunction<T, E> function) { super(displayModel, sortProperty, function); this.function = function; } @@ -26,11 +22,7 @@ public class EnumLambdaColumn<T, S, E extends Enum<E>> extends LambdaColumn<T, S } @Override - public void populateItem( - Item<ICellPopulator<T>> cellItem, - String componentId, - IModel<T> rowModel - ) { + public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId, IModel<T> rowModel) { cellItem.add(new EnumLabel<>(componentId, rowModel.map(function))); } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/ExportableDataPanel.java b/view/src/main/java/se/su/dsv/scipro/components/ExportableDataPanel.java index 0754e6b3c6..628fc5c644 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/ExportableDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/ExportableDataPanel.java @@ -21,11 +21,9 @@ public class ExportableDataPanel<T, S> extends DefaultDataPanel<T, S> { protected void onInitialize() { super.onInitialize(); addBottomToolbar( - new ExportToolbar( - this, - new Model<>("Download as"), - new Model<>("excel") - ).addDataExporter(new ExcelExporter()) + new ExportToolbar(this, new Model<>("Download as"), new Model<>("excel")).addDataExporter( + new ExcelExporter() + ) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/NoBreakLabel.java b/view/src/main/java/se/su/dsv/scipro/components/NoBreakLabel.java index 892e3b671b..f45188dac0 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/NoBreakLabel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/NoBreakLabel.java @@ -13,10 +13,6 @@ public class NoBreakLabel extends Label { @Override public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { - replaceComponentTagBody( - markupStream, - openTag, - "<nobr>" + getDefaultModelObjectAsString() + "</nobr>" - ); + replaceComponentTagBody(markupStream, openTag, "<nobr>" + getDefaultModelObjectAsString() + "</nobr>"); } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/ResearchAreasModel.java b/view/src/main/java/se/su/dsv/scipro/components/ResearchAreasModel.java index 517962abf9..a11366292a 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/ResearchAreasModel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/ResearchAreasModel.java @@ -17,9 +17,7 @@ public class ResearchAreasModel extends LoadableDetachableModel<List<ResearchAre @Override protected List<ResearchArea> load() { List<ResearchArea> all = researchAreaService.findAll(); - all.sort( - Comparator.comparing(ResearchArea::isDeleted).thenComparing(ResearchArea::getTitle) - ); + all.sort(Comparator.comparing(ResearchArea::isDeleted).thenComparing(ResearchArea::getTitle)); return all; } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/SmarterLinkMultiLineLabel.java b/view/src/main/java/se/su/dsv/scipro/components/SmarterLinkMultiLineLabel.java index 1b26e96e83..17d770f541 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/SmarterLinkMultiLineLabel.java +++ b/view/src/main/java/se/su/dsv/scipro/components/SmarterLinkMultiLineLabel.java @@ -29,16 +29,12 @@ public class SmarterLinkMultiLineLabel extends SmartLinkMultiLineLabel { * with the addition of ";" to the accepted characters in the URL. * This enables proper linking of escaped URLs. */ - private static final String urlPattern = - "([a-zA-Z]+://[\\w\\.\\-\\:\\/~]+)[\\w\\.:\\-/?!&=%;]*"; + private static final String urlPattern = "([a-zA-Z]+://[\\w\\.\\-\\:\\/~]+)[\\w\\.:\\-/?!&=%;]*"; private EscapedLinkParser() { addLinkRenderStrategy(emailPattern, DefaultLinkParser.EMAIL_RENDER_STRATEGY); // Render the complete link including what's after the ? - addLinkRenderStrategy( - urlPattern, - linkTarget -> "<a href=\"" + linkTarget + "\">" + linkTarget + "</a>" - ); + addLinkRenderStrategy(urlPattern, linkTarget -> "<a href=\"" + linkTarget + "\">" + linkTarget + "</a>"); } } } diff --git a/view/src/main/java/se/su/dsv/scipro/components/TemporalColumn.java b/view/src/main/java/se/su/dsv/scipro/components/TemporalColumn.java index 6c16a960f1..56bbebf42a 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/TemporalColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/components/TemporalColumn.java @@ -13,11 +13,7 @@ public class TemporalColumn<T, S> extends LambdaColumn<T, S> { super(displayModel, function); } - public TemporalColumn( - IModel<String> displayModel, - S sortProperty, - SerializableFunction<T, Temporal> function - ) { + public TemporalColumn(IModel<String> displayModel, S sortProperty, SerializableFunction<T, Temporal> function) { super(displayModel, sortProperty, function); } diff --git a/view/src/main/java/se/su/dsv/scipro/components/datatables/MultipleUsersColumn.java b/view/src/main/java/se/su/dsv/scipro/components/datatables/MultipleUsersColumn.java index 17c884db00..7cd59335c8 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/datatables/MultipleUsersColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/components/datatables/MultipleUsersColumn.java @@ -35,12 +35,7 @@ public abstract class MultipleUsersColumn<T, S> extends AbstractExportableColumn @Override public IModel<?> getDataModel(final IModel<T> rowModel) { - return () -> - getUsers(rowModel) - .getObject() - .stream() - .map(User::getFullName) - .collect(Collectors.joining(", ")); + return () -> getUsers(rowModel).getObject().stream().map(User::getFullName).collect(Collectors.joining(", ")); } protected abstract IModel<? extends List<User>> getUsers(final IModel<T> rowModel); diff --git a/view/src/main/java/se/su/dsv/scipro/components/datatables/UserColumn.java b/view/src/main/java/se/su/dsv/scipro/components/datatables/UserColumn.java index a8140464cc..9f2a557510 100644 --- a/view/src/main/java/se/su/dsv/scipro/components/datatables/UserColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/components/datatables/UserColumn.java @@ -12,29 +12,18 @@ public class UserColumn<T, S> extends AbstractExportableColumn<T, S> { private final SerializableFunction<T, User> toUser; - public UserColumn( - final IModel<String> displayModel, - final SerializableFunction<T, User> toUser - ) { + public UserColumn(final IModel<String> displayModel, final SerializableFunction<T, User> toUser) { super(displayModel); this.toUser = toUser; } - public UserColumn( - final IModel<String> displayModel, - S sortProperty, - final SerializableFunction<T, User> toUser - ) { + public UserColumn(final IModel<String> displayModel, S sortProperty, final SerializableFunction<T, User> toUser) { super(displayModel, sortProperty); this.toUser = toUser; } @Override - public void populateItem( - Item<ICellPopulator<T>> cellItem, - String componentId, - IModel<T> rowModel - ) { + public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId, IModel<T> rowModel) { cellItem.add(new UserLinkPanel(componentId, rowModel.map(toUser))); } diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java index 554e72f468..87db35401c 100644 --- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java +++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java @@ -42,11 +42,7 @@ public class ForwardPhase2Feedback { ReviewerApproval reviewerApproval = event.reviewerApproval(); Set<Attachment> attachments = getAttachments(reviewerApproval); String subject = localizer.getString("phase2.rejected.subject", null); - String content = localizer.getString( - "phase2.rejected.content", - null, - Model.of(reviewerApproval) - ); + String content = localizer.getString("phase2.rejected.content", null, Model.of(reviewerApproval)); projectForumService.createThread(event.getProject(), null, subject, content, attachments); } @@ -56,11 +52,7 @@ public class ForwardPhase2Feedback { ReviewerApproval reviewerApproval = event.process(); Set<Attachment> attachments = getAttachments(reviewerApproval); String subject = localizer.getString("phase2.approved.subject", null); - String content = localizer.getString( - "phase2.approved.content", - null, - Model.of(reviewerApproval) - ); + String content = localizer.getString("phase2.approved.content", null, Model.of(reviewerApproval)); projectForumService.createThread(event.getProject(), null, subject, content, attachments); } diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/NotifyFailedReflection.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/NotifyFailedReflection.java index 146b92cebc..8ccd579fd9 100644 --- a/view/src/main/java/se/su/dsv/scipro/crosscutting/NotifyFailedReflection.java +++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/NotifyFailedReflection.java @@ -16,10 +16,7 @@ public class NotifyFailedReflection { private final NotificationController notificationController; @Inject - public NotifyFailedReflection( - NotificationController notificationController, - EventBus eventBus - ) { + public NotifyFailedReflection(NotificationController notificationController, EventBus eventBus) { this.notificationController = notificationController; eventBus.register(this); } diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java index 62f7896461..349cdd6ad9 100644 --- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java +++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java @@ -55,11 +55,6 @@ public class ReviewerAssignedNotifications { } private Consumer<ReviewerApproval> sendNotification(ProjectEvent.Event event) { - return approval -> - notificationController.notifyProject( - approval.getProject(), - event, - new NotificationSource() - ); + return approval -> notificationController.notifyProject(approval.getProject(), event, new NotificationSource()); } } diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java index f60c2d9b47..d13bf829c2 100644 --- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java +++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java @@ -35,48 +35,31 @@ public class ReviewerSupportMailer { } @Subscribe - public void onFinalSeminarApprovalRequest( - final FinalSeminarApprovalRequestEvent finalSeminarApprovalRequestEvent - ) { + public void onFinalSeminarApprovalRequest(final FinalSeminarApprovalRequestEvent finalSeminarApprovalRequestEvent) { final Project project = finalSeminarApprovalRequestEvent.getProject(); if (project.getReviewer() == null) { final String comment = finalSeminarApprovalRequestEvent .getFinalSeminarApproval() .getCurrentDecision() .getComment(); - sendMailToReviewerSupport( - project, - comment, - ProjectEvent.Event.FINAL_SEMINAR_APPROVAL_REQUESTED - ); + sendMailToReviewerSupport(project, comment, ProjectEvent.Event.FINAL_SEMINAR_APPROVAL_REQUESTED); } } @Subscribe - public void onRoughDraftApprovalRequest( - final RoughDraftApprovalRequestedEvent roughDraftApprovalRequestedEvent - ) { + public void onRoughDraftApprovalRequest(final RoughDraftApprovalRequestedEvent roughDraftApprovalRequestedEvent) { final Project project = roughDraftApprovalRequestedEvent.getProject(); if (project.getReviewer() == null) { final String comment = roughDraftApprovalRequestedEvent .getRoughDraftApproval() .getCurrentDecision() .getComment(); - sendMailToReviewerSupport( - project, - comment, - ProjectEvent.Event.ROUGH_DRAFT_APPROVAL_REQUESTED - ); + sendMailToReviewerSupport(project, comment, ProjectEvent.Event.ROUGH_DRAFT_APPROVAL_REQUESTED); } } - private void sendMailToReviewerSupport( - Project project, - final String comment, - ProjectEvent.Event event - ) { - GeneralSystemSettings systemSettings = - systemSettingsService.getGeneralSystemSettingsInstance(); + private void sendMailToReviewerSupport(Project project, final String comment, ProjectEvent.Event event) { + GeneralSystemSettings systemSettings = systemSettingsService.getGeneralSystemSettingsInstance(); MailEvent mail = new MailEvent(); mail.setFromEmail(systemSettings.getSystemFromMail()); @@ -102,11 +85,7 @@ public class ReviewerSupportMailer { (project.getLanguage() != null ? project.getLanguage() : "Unknown") + "\n" + " Authors: " + - project - .getProjectParticipants() - .stream() - .map(User::getFullName) - .collect(Collectors.joining(" ,")) + + project.getProjectParticipants().stream().map(User::getFullName).collect(Collectors.joining(" ,")) + "\n" + " Comment: " + comment + diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java index 8e09fc73e8..907166612c 100644 --- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java +++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java @@ -42,9 +42,7 @@ public class ReviewingNotifications { } @Subscribe - public void onFinalSeminarApprovalRequest( - final FinalSeminarApprovalRequestEvent finalSeminarApprovalRequestEvent - ) { + public void onFinalSeminarApprovalRequest(final FinalSeminarApprovalRequestEvent finalSeminarApprovalRequestEvent) { notificationController.notifyProject( finalSeminarApprovalRequestEvent.getProject(), ProjectEvent.Event.FINAL_SEMINAR_APPROVAL_REQUESTED, @@ -75,9 +73,7 @@ public class ReviewingNotifications { } @Subscribe - public void onRoughDraftApprovalRequest( - final RoughDraftApprovalRequestedEvent roughDraftApprovalRequestedEvent - ) { + public void onRoughDraftApprovalRequest(final RoughDraftApprovalRequestedEvent roughDraftApprovalRequestedEvent) { notificationController.notifyProject( roughDraftApprovalRequestedEvent.getProject(), ProjectEvent.Event.ROUGH_DRAFT_APPROVAL_REQUESTED, @@ -86,9 +82,7 @@ public class ReviewingNotifications { } @Subscribe - public void onRoughDraftApprovalRejected( - final RoughDraftApprovalRejectedEvent roughDraftApprovalRejectedEvent - ) { + public void onRoughDraftApprovalRejected(final RoughDraftApprovalRejectedEvent roughDraftApprovalRejectedEvent) { notificationController.notifyProject( roughDraftApprovalRejectedEvent.getProject(), ProjectEvent.Event.ROUGH_DRAFT_APPROVAL_REJECTED, @@ -97,16 +91,11 @@ public class ReviewingNotifications { } @Subscribe - public void onRoughDraftApprovalApproved( - final RoughDraftApprovalApprovedEvent roughDraftApprovalApprovedEvent - ) { + public void onRoughDraftApprovalApproved(final RoughDraftApprovalApprovedEvent roughDraftApprovalApprovedEvent) { final PageParameters pageParameters = SupervisorGradingPage.getPageParameters( roughDraftApprovalApprovedEvent.getProject() ); - final PageProvider pageProvider = new PageProvider( - SupervisorGradingPage.class, - pageParameters - ); + final PageProvider pageProvider = new PageProvider(SupervisorGradingPage.class, pageParameters); final Url relativeUrl = application .getRootRequestMapper() .mapHandler(new BookmarkablePageRequestHandler(pageProvider)); @@ -121,9 +110,7 @@ public class ReviewingNotifications { } private String makeAbsolute(Url relativeUrl) { - final String sciproURL = generalSystemSettingsService - .getGeneralSystemSettingsInstance() - .getSciproURL(); + final String sciproURL = generalSystemSettingsService.getGeneralSystemSettingsInstance().getSciproURL(); return sciproURL + relativeUrl; } } diff --git a/view/src/main/java/se/su/dsv/scipro/data/DetachableServiceModelCollection.java b/view/src/main/java/se/su/dsv/scipro/data/DetachableServiceModelCollection.java index 9e4abbbf33..19b4f17be1 100755 --- a/view/src/main/java/se/su/dsv/scipro/data/DetachableServiceModelCollection.java +++ b/view/src/main/java/se/su/dsv/scipro/data/DetachableServiceModelCollection.java @@ -7,8 +7,7 @@ import org.apache.wicket.model.IModel; import se.su.dsv.scipro.system.DomainObject; import se.su.dsv.scipro.system.GenericService; -public final class DetachableServiceModelCollection<DO extends DomainObject> - implements IModel<Collection<DO>> { +public final class DetachableServiceModelCollection<DO extends DomainObject> implements IModel<Collection<DO>> { private static final long serialVersionUID = -7932592734004059133L; @@ -50,10 +49,7 @@ public final class DetachableServiceModelCollection<DO extends DomainObject> } private void reload() { - final Collection<DO> objects = ids - .stream() - .map(service::findOne) - .collect(Collectors.toSet()); + final Collection<DO> objects = ids.stream().map(service::findOne).collect(Collectors.toSet()); setObject(objects); } } diff --git a/view/src/main/java/se/su/dsv/scipro/dataproviders/PageAdapter.java b/view/src/main/java/se/su/dsv/scipro/dataproviders/PageAdapter.java index 01936db3c2..ee815feedd 100644 --- a/view/src/main/java/se/su/dsv/scipro/dataproviders/PageAdapter.java +++ b/view/src/main/java/se/su/dsv/scipro/dataproviders/PageAdapter.java @@ -20,10 +20,7 @@ public class PageAdapter extends PageRequest { return null; } - return new Sort( - sort.isAscending() ? Sort.Direction.ASC : Sort.Direction.DESC, - sort.getProperty() - ); + return new Sort(sort.isAscending() ? Sort.Direction.ASC : Sort.Direction.DESC, sort.getProperty()); } @Override @@ -31,11 +28,7 @@ public class PageAdapter extends PageRequest { if (o == this) return true; if (!(o instanceof PageAdapter)) return false; final PageAdapter other = (PageAdapter) o; - return ( - other.canEqual(this) && - super.equals(o) && - Objects.equals(this.getSort(), other.getSort()) - ); + return (other.canEqual(this) && super.equals(o) && Objects.equals(this.getSort(), other.getSort())); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/ClickableIconColumn.java b/view/src/main/java/se/su/dsv/scipro/datatables/ClickableIconColumn.java index e1a9a0de7d..adc3f460ac 100755 --- a/view/src/main/java/se/su/dsv/scipro/datatables/ClickableIconColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/ClickableIconColumn.java @@ -24,23 +24,14 @@ public abstract class ClickableIconColumn<T> extends AbstractColumn<T, String> { this(displayModel, sort, iconString, null); } - public ClickableIconColumn( - IModel<String> displayModel, - String sort, - String iconString, - String confirmMessage - ) { + public ClickableIconColumn(IModel<String> displayModel, String sort, String iconString, String confirmMessage) { super(displayModel, sort); this.iconString = iconString; this.confirmMessage = confirmMessage; } @Override - public void populateItem( - Item<ICellPopulator<T>> cellItem, - String componentId, - IModel<T> rowModel - ) { + public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId, IModel<T> rowModel) { cellItem.add(new LinkPanel(componentId, rowModel, getIconString())); } diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/ClickableOrderColumn.java b/view/src/main/java/se/su/dsv/scipro/datatables/ClickableOrderColumn.java index 313bba1492..980ffebd83 100755 --- a/view/src/main/java/se/su/dsv/scipro/datatables/ClickableOrderColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/ClickableOrderColumn.java @@ -21,21 +21,13 @@ public abstract class ClickableOrderColumn<T> private final SerializableFunction<T, ?> function; - public ClickableOrderColumn( - IModel<String> displayModel, - SerializableFunction<T, ?> function, - String sort - ) { + public ClickableOrderColumn(IModel<String> displayModel, SerializableFunction<T, ?> function, String sort) { super(displayModel, sort); this.function = function; } @Override - public void populateItem( - Item<ICellPopulator<T>> cellItem, - String componentId, - IModel<T> rowModel - ) { + public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId, IModel<T> rowModel) { cellItem.add(new LinkPanel(componentId, rowModel, rowModel.map(function))); } diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/LabelAndLinkColumn.java b/view/src/main/java/se/su/dsv/scipro/datatables/LabelAndLinkColumn.java index 297a131501..cb206a952d 100755 --- a/view/src/main/java/se/su/dsv/scipro/datatables/LabelAndLinkColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/LabelAndLinkColumn.java @@ -61,12 +61,7 @@ public abstract class LabelAndLinkColumn<T> extends Panel { * Use this constructor if you don't want the link to have a confirmation dialog when clicking * */ - public LabelAndLinkColumn( - String id, - final IModel<T> model, - String linkString, - boolean showLinks - ) { + public LabelAndLinkColumn(String id, final IModel<T> model, String linkString, boolean showLinks) { this(id, model, linkString, null, showLinks); } } diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java index 8803f02abf..04b5d7b3f8 100644 --- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java @@ -83,10 +83,7 @@ public class ProjectDataPanel extends Panel { } private void addDataTable() { - SortableDataProvider<Project, String> provider = new FilteredDataProvider<>( - projectService, - Model.of(filter) - ); + SortableDataProvider<Project, String> provider = new FilteredDataProvider<>(projectService, Model.of(filter)); provider.setSort("dateCreated", SortOrder.DESCENDING); exportableDataPanel = new ExportableDataPanel<>("dataTable", createColumns(), provider); add(exportableDataPanel); @@ -101,25 +98,17 @@ public class ProjectDataPanel extends Panel { } else { columns.add(new LambdaColumn<>(Model.of("Title"), "title", Project::getTitle)); } - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName)); columns.add(authorsColumn()); - columns.add( - new EnumLambdaColumn<>(Model.of("Status"), "projectStatus", Project::getProjectStatus) - ); + columns.add(new EnumLambdaColumn<>(Model.of("Status"), "projectStatus", Project::getProjectStatus)); columns.add(supervisorColumn()); if (isAdmin) { columns.add(reviewerColumn()); } else { - columns.add( - new UserColumn<>(Model.of("Reviewer"), "reviewer.fullName", Project::getReviewer) - ); + columns.add(new UserColumn<>(Model.of("Reviewer"), "reviewer.fullName", Project::getReviewer)); } columns.add( - new LambdaColumn<>(Model.of("Research area"), project -> - getGetResearchAreaName(project.getResearchArea()) - ) + new LambdaColumn<>(Model.of("Research area"), project -> getGetResearchAreaName(project.getResearchArea())) ); if (isAdmin) { columns.add(inactivateCheckbox()); @@ -136,11 +125,7 @@ public class ProjectDataPanel extends Panel { } private AbstractColumn<Project, String> supervisorColumn() { - return new UserColumn<>( - Model.of("Head Superv."), - "headSupervisor.fullName", - Project::getHeadSupervisor - ); + return new UserColumn<>(Model.of("Head Superv."), "headSupervisor.fullName", Project::getHeadSupervisor); } private AbstractColumn<Project, String> authorsColumn() { @@ -148,11 +133,7 @@ public class ProjectDataPanel extends Panel { @Override public IModel<? extends List<User>> getUsers(final IModel<Project> rowModel) { return new ListAdapterModel<>( - LambdaModel.of( - rowModel, - Project::getProjectParticipants, - Project::setProjectParticipants - ) + LambdaModel.of(rowModel, Project::getProjectParticipants, Project::setProjectParticipants) ); } }; @@ -161,11 +142,7 @@ public class ProjectDataPanel extends Panel { private AbstractColumn<Project, String> titleColumn() { return new LambdaColumn<>(Model.of("Title"), "title", Project::getTitle) { @Override - public void populateItem( - Item<ICellPopulator<Project>> components, - String s, - final IModel<Project> model - ) { + public void populateItem(Item<ICellPopulator<Project>> components, String s, final IModel<Project> model) { components.add( LinkWrapper.apply(s, id -> { final PageParameters pp = new PageParameters(); @@ -232,10 +209,7 @@ public class ProjectDataPanel extends Panel { } private void addCreateNewProjectLink() { - AbstractLink newLink = new BookmarkablePageLink<Void>( - "newLink", - AdminCreateProjectPage.class - ) { + AbstractLink newLink = new BookmarkablePageLink<Void>("newLink", AdminCreateProjectPage.class) { @Override protected void onConfigure() { super.onConfigure(); @@ -257,11 +231,7 @@ public class ProjectDataPanel extends Panel { AdminAssignReviewerPage.class, pp ); - link.setBody(() -> - project.getObject().getReviewer() == null - ? "(assign reviewer)" - : "(change reviewer)" - ); + link.setBody(() -> project.getObject().getReviewer() == null ? "(assign reviewer)" : "(change reviewer)"); add(link); } } diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java index e03c55de32..7994440982 100644 --- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java @@ -61,10 +61,7 @@ public class ProjectExternalOrganisationPanel extends Panel { } private void addDataTable() { - SortableDataProvider<Project, String> provider = new FilteredDataProvider<>( - projectService, - Model.of(filter) - ); + SortableDataProvider<Project, String> provider = new FilteredDataProvider<>(projectService, Model.of(filter)); provider.setSort("dateCreated", SortOrder.DESCENDING); exportableDataPanel = new ExportableDataPanel<>("dataTable", createColumns(), provider); add(exportableDataPanel); @@ -74,12 +71,8 @@ public class ProjectExternalOrganisationPanel extends Panel { List<IColumn<Project, String>> columns = new ArrayList<>(); columns.add(new TemporalColumn<>(Model.of("Started"), "startDate", Project::getStartDate)); columns.add(titleColumn()); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName) - ); - columns.add( - new EnumLambdaColumn<>(Model.of("Status"), "projectStatus", Project::getProjectStatus) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName)); + columns.add(new EnumLambdaColumn<>(Model.of("Status"), "projectStatus", Project::getProjectStatus)); columns.add(supervisorColumn()); columns.add( new LambdaColumn<>(Model.of("External organisation"), "externalOrganization.name", p -> @@ -90,27 +83,15 @@ public class ProjectExternalOrganisationPanel extends Panel { } private AbstractColumn<Project, String> supervisorColumn() { - return new UserColumn<>( - Model.of("Head Superv."), - "headSupervisor.fullName", - Project::getHeadSupervisor - ); + return new UserColumn<>(Model.of("Head Superv."), "headSupervisor.fullName", Project::getHeadSupervisor); } private AbstractColumn<Project, String> titleColumn() { return new LambdaColumn<>(Model.of("Title"), Project::getTitle) { @Override - public void populateItem( - Item<ICellPopulator<Project>> components, - String s, - final IModel<Project> model - ) { + public void populateItem(Item<ICellPopulator<Project>> components, String s, final IModel<Project> model) { components.add( - new AjaxLinkPanel<>( - s, - model, - LambdaModel.of(model, Project::getTitle, Project::setTitle) - ) { + new AjaxLinkPanel<>(s, model, LambdaModel.of(model, Project::getTitle, Project::setTitle)) { @Override public void onClick(AjaxRequestTarget target, IModel<Project> model) { openCRUDPanel(model); @@ -199,10 +180,7 @@ public class ProjectExternalOrganisationPanel extends Panel { private void addProjectTitleFilter() { TextField<String> titleField = new TextField<>( "titleFilter", - LambdaModel.<String>of( - () -> titleString, - newTitleFilter -> titleString = newTitleFilter - ) + LambdaModel.<String>of(() -> titleString, newTitleFilter -> titleString = newTitleFilter) ); titleField.add( new AjaxFormComponentUpdatingBehavior("keyup") { @@ -255,19 +233,18 @@ public class ProjectExternalOrganisationPanel extends Panel { } private void addProjectStatusFilter() { - AjaxCheckBoxMultipleChoice<ProjectStatus> projectStatus = - new AjaxCheckBoxMultipleChoice<>( - "statusFilter", - new ArrayList<>(Collections.singletonList(ProjectStatus.ACTIVE)), - asList(ProjectStatus.values()), - new EnumChoiceRenderer<>(this) - ) { - @Override - public void onUpdate(AjaxRequestTarget target) { - filter.setStatuses(new HashSet<>(getModelObject())); - target.add(exportableDataPanel); - } - }; + AjaxCheckBoxMultipleChoice<ProjectStatus> projectStatus = new AjaxCheckBoxMultipleChoice<>( + "statusFilter", + new ArrayList<>(Collections.singletonList(ProjectStatus.ACTIVE)), + asList(ProjectStatus.values()), + new EnumChoiceRenderer<>(this) + ) { + @Override + public void onUpdate(AjaxRequestTarget target) { + filter.setStatuses(new HashSet<>(getModelObject())); + target.add(exportableDataPanel); + } + }; add(projectStatus); filter.setStatuses(new HashSet<>(projectStatus.getModelObject())); diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java index cc5577bec3..67cecff2e2 100644 --- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java @@ -35,11 +35,7 @@ public abstract class ProjectFilterPanel extends Panel { add( new AjaxCheckBox( "noReviewer", - LambdaModel.of( - model, - ProjectService.Filter::isNoReviewer, - ProjectService.Filter::setNoReviewer - ) + LambdaModel.of(model, ProjectService.Filter::isNoReviewer, ProjectService.Filter::setNoReviewer) ) { @Override protected void onUpdate(final AjaxRequestTarget target) { @@ -64,16 +60,8 @@ public abstract class ProjectFilterPanel extends Panel { add( new DeactivatableDatePickerPanel( "dateFilter", - LambdaModel.of( - filter, - ProjectService.Filter::getCreatedAfter, - ProjectService.Filter::setCreatedAfter - ), - LambdaModel.of( - filter, - ProjectService.Filter::getCreatedBefore, - ProjectService.Filter::setCreatedBefore - ) + LambdaModel.of(filter, ProjectService.Filter::getCreatedAfter, ProjectService.Filter::setCreatedAfter), + LambdaModel.of(filter, ProjectService.Filter::getCreatedBefore, ProjectService.Filter::setCreatedBefore) ) { @Override protected void datesChanged(AjaxRequestTarget target) { @@ -86,11 +74,7 @@ public abstract class ProjectFilterPanel extends Panel { private void addRedStateFilter(final IModel<ProjectService.Filter> filter) { TextField<Integer> redStateField = new TextField<>( "redStateFilter", - LambdaModel.of( - filter, - ProjectService.Filter::getRedStateTime, - ProjectService.Filter::setRedStateTime - ), + LambdaModel.of(filter, ProjectService.Filter::getRedStateTime, ProjectService.Filter::setRedStateTime), Integer.class ); redStateField.add( @@ -108,11 +92,7 @@ public abstract class ProjectFilterPanel extends Panel { add( new EmployeeAutoComplete( "supervisorFilter", - LambdaModel.of( - filter, - ProjectService.Filter::getSupervisor, - ProjectService.Filter::setSupervisor - ) + LambdaModel.of(filter, ProjectService.Filter::getSupervisor, ProjectService.Filter::setSupervisor) ) { @Override protected void action(AjaxRequestTarget target, User newSelection) { @@ -126,11 +106,7 @@ public abstract class ProjectFilterPanel extends Panel { add( new EmployeeAutoComplete( "reviewerFilter", - LambdaModel.of( - filter, - ProjectService.Filter::getReviewer, - ProjectService.Filter::setReviewer - ) + LambdaModel.of(filter, ProjectService.Filter::getReviewer, ProjectService.Filter::setReviewer) ) { @Override protected void action(AjaxRequestTarget target, User newSelection) { @@ -164,11 +140,7 @@ public abstract class ProjectFilterPanel extends Panel { add( new AuthorAutoComplete( "authorFilter", - LambdaModel.of( - filter, - ProjectService.Filter::getAuthorUser, - ProjectService.Filter::setAuthorUser - ) + LambdaModel.of(filter, ProjectService.Filter::getAuthorUser, ProjectService.Filter::setAuthorUser) ) { @Override protected void action(AjaxRequestTarget target, User newSelection) { @@ -182,11 +154,7 @@ public abstract class ProjectFilterPanel extends Panel { add( new AjaxCheckBoxMultipleChoice<>( "projectTypeFilter", - LambdaModel.of( - filter, - ProjectService.Filter::getProjectTypes, - ProjectService.Filter::setProjectTypes - ), + LambdaModel.of(filter, ProjectService.Filter::getProjectTypes, ProjectService.Filter::setProjectTypes), projectTypeService.findAllActive(), new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) ) { @@ -202,11 +170,7 @@ public abstract class ProjectFilterPanel extends Panel { add( new AjaxCheckBoxMultipleChoice<>( "statusFilter", - LambdaModel.of( - filter, - ProjectService.Filter::getStatuses, - ProjectService.Filter::setStatuses - ), + LambdaModel.of(filter, ProjectService.Filter::getStatuses, ProjectService.Filter::setStatuses), asList(ProjectStatus.values()), new EnumChoiceRenderer<>(ProjectFilterPanel.this) ) { diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectStateColumn.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectStateColumn.java index 735d6f2ce5..4f089ff44c 100755 --- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectStateColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectStateColumn.java @@ -25,17 +25,11 @@ public class ProjectStateColumn extends AbstractExportableColumn<Project, String @Override public Component getHeader(String componentId) { - return super.getHeader(componentId).add( - new AttributeAppender(TITLE, Model.of(STATE_INFO), " ") - ); + return super.getHeader(componentId).add(new AttributeAppender(TITLE, Model.of(STATE_INFO), " ")); } @Override - public void populateItem( - Item<ICellPopulator<Project>> cellItem, - String componentId, - IModel<Project> rowModel - ) { + public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId, IModel<Project> rowModel) { cellItem.add(new LinkPanel(componentId, rowModel)); } @@ -57,19 +51,11 @@ public class ProjectStateColumn extends AbstractExportableColumn<Project, String break; case NEUTRAL: add(new ImageObject(IMG, ImageObject.TWENTYFOUR + ImageObject.LIGHT_YELLOW)); - add( - new AttributeAppender(TITLE, Model.of(StateOfMind.NEUTRAL.getStatus()), " ") - ); + add(new AttributeAppender(TITLE, Model.of(StateOfMind.NEUTRAL.getStatus()), " ")); break; case NEEDHELP: add(new ImageObject(IMG, ImageObject.TWENTYFOUR + ImageObject.LIGHT_RED)); - add( - new AttributeAppender( - TITLE, - Model.of(StateOfMind.NEEDHELP.getStatus()), - " " - ) - ); + add(new AttributeAppender(TITLE, Model.of(StateOfMind.NEEDHELP.getStatus()), " ")); break; default: add(new ImageObject(IMG, ImageObject.TWENTYFOUR + ImageObject.LIGHT_RED)); diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectTitleColumn.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectTitleColumn.java index fd659b92c9..e5c572a55c 100755 --- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectTitleColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectTitleColumn.java @@ -21,11 +21,7 @@ public class ProjectTitleColumn extends AbstractExportableColumn<Project, String } @Override - public void populateItem( - Item<ICellPopulator<Project>> cellItem, - String componentId, - IModel<Project> rowModel - ) { + public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId, IModel<Project> rowModel) { cellItem.add(new LinkPanel(componentId, rowModel)); } diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java index 3ef9bcf66d..2f4d027af5 100644 --- a/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java @@ -25,11 +25,7 @@ public class AddTargetLinkPanel extends Panel { new ListView<>( "list", new ListAdapterModel<>( - LambdaModel.of( - model, - ApplicationPeriod::getProjectTypes, - ApplicationPeriod::setProjectTypes - ) + LambdaModel.of(model, ApplicationPeriod::getProjectTypes, ApplicationPeriod::setProjectTypes) ) ) { @Override @@ -39,10 +35,7 @@ public class AddTargetLinkPanel extends Panel { new Label( "total", String.valueOf( - applicationPeriodFacade.totalTargets( - model.getObject(), - item.getModelObject() - ) + applicationPeriodFacade.totalTargets(model.getObject(), item.getModelObject()) ) ) ); @@ -50,10 +43,7 @@ public class AddTargetLinkPanel extends Panel { new Label( "remaining", String.valueOf( - applicationPeriodFacade.remainingTargets( - model.getObject(), - item.getModelObject() - ) + applicationPeriodFacade.remainingTargets(model.getObject(), item.getModelObject()) ) ) ); diff --git a/view/src/main/java/se/su/dsv/scipro/date/DeactivatableDatePickerPanel.java b/view/src/main/java/se/su/dsv/scipro/date/DeactivatableDatePickerPanel.java index 79647ac70e..27a0922a2f 100644 --- a/view/src/main/java/se/su/dsv/scipro/date/DeactivatableDatePickerPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/date/DeactivatableDatePickerPanel.java @@ -36,9 +36,7 @@ public class DeactivatableDatePickerPanel extends Border { protected void onUpdate(AjaxRequestTarget target) { target.add(datePicker); if (getModelObject()) { - DeactivatableDatePickerPanel.this.startDate.setObject( - datePicker.getStartDate() - ); + DeactivatableDatePickerPanel.this.startDate.setObject(datePicker.getStartDate()); DeactivatableDatePickerPanel.this.endDate.setObject(datePicker.getEndDate()); } else { DeactivatableDatePickerPanel.this.startDate.setObject(null); diff --git a/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java b/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java index 18cabbb282..9ec6ba4bc0 100644 --- a/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java +++ b/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java @@ -22,9 +22,7 @@ public abstract class ExaminerPage extends MenuPage { super(pp); saveSelectedRole(); SciProSession.get() - .setSystemModules( - generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules() - ); + .setSystemModules(generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules()); } private void saveSelectedRole() { diff --git a/view/src/main/java/se/su/dsv/scipro/files/WicketFileUpload.java b/view/src/main/java/se/su/dsv/scipro/files/WicketFileUpload.java index 157fd029de..3fb54afc95 100644 --- a/view/src/main/java/se/su/dsv/scipro/files/WicketFileUpload.java +++ b/view/src/main/java/se/su/dsv/scipro/files/WicketFileUpload.java @@ -53,9 +53,7 @@ public class WicketFileUpload implements FileUpload { return new WicketFileUpload(fileUpload); } - public static Optional<FileUpload> ofOptional( - org.apache.wicket.markup.html.form.upload.FileUpload fileUpload - ) { + public static Optional<FileUpload> ofOptional(org.apache.wicket.markup.html.form.upload.FileUpload fileUpload) { return Optional.ofNullable(fileUpload).map(WicketFileUpload::new); } } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java index 67a3522fa2..16717fe50c 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java @@ -85,18 +85,9 @@ public class AdminFinalSeminarDataPanel extends Panel { private List<IColumn<FinalSeminar, String>> createColumns() { List<IColumn<FinalSeminar, String>> columns = new ArrayList<>(); + columns.add(new DateColumn<>(Model.of("Date"), FinalSeminar::getStartDate, "startDate", DateStyle.DATETIME)); columns.add( - new DateColumn<>( - Model.of("Date"), - FinalSeminar::getStartDate, - "startDate", - DateStyle.DATETIME - ) - ); - columns.add( - new LambdaColumn<>(Model.of("Type"), "project.projectType.name", fs -> - fs.getProjectType().getName() - ) + new LambdaColumn<>(Model.of("Type"), "project.projectType.name", fs -> fs.getProjectType().getName()) ); columns.add( @@ -108,16 +99,9 @@ public class AdminFinalSeminarDataPanel extends Panel { final IModel<FinalSeminar> model ) { components.add( - new AjaxLinkPanel<>( - s, - model, - model.map(FinalSeminar::getProject).map(Project::getTitle) - ) { + new AjaxLinkPanel<>(s, model, model.map(FinalSeminar::getProject).map(Project::getTitle)) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<FinalSeminar> model - ) { + public void onClick(AjaxRequestTarget target, IModel<FinalSeminar> model) { setResponsePage(new AdminFinalSeminarDetailsPage(getModel())); } } @@ -144,10 +128,7 @@ public class AdminFinalSeminarDataPanel extends Panel { "Are you sure you want to cancel final seminar?" ) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<FinalSeminar> model - ) { + public void onClick(AjaxRequestTarget target, IModel<FinalSeminar> model) { setModelObject(finalSeminarService.cancel(getModelObject())); success("Cancelled final seminar"); target.add(feedback); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDetailsPage.java index 9214081e36..58b9033691 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDetailsPage.java @@ -7,9 +7,7 @@ import se.su.dsv.scipro.security.auth.Authorization; import se.su.dsv.scipro.security.auth.roles.Roles; @Authorization(authorizedRoles = { Roles.ADMIN, Roles.STUDADM }) -public class AdminFinalSeminarDetailsPage - extends AbstractAdminProjectPage - implements MenuHighlightAdminFinalSeminars { +public class AdminFinalSeminarDetailsPage extends AbstractAdminProjectPage implements MenuHighlightAdminFinalSeminars { public AdminFinalSeminarDetailsPage(IModel<FinalSeminar> model) { setDefaultModel(model); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java index 24cb2894d6..e4436cdbe3 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java @@ -75,10 +75,7 @@ public class AdminFinalSeminarExemptionPage } private void addDP() { - SortableDataProvider<Project, String> provider = new FilteredDataProvider<>( - projectService, - Model.of(filter) - ); + SortableDataProvider<Project, String> provider = new FilteredDataProvider<>(projectService, Model.of(filter)); provider.setSort("dateCreated", SortOrder.DESCENDING); exportableDataPanel = new ExportableDataPanel<>(DP, createColumns(), provider); add(exportableDataPanel); @@ -90,20 +87,12 @@ public class AdminFinalSeminarExemptionPage columns.add( new AbstractExportableColumn<>(Model.of(FinalSeminar.U_SINGULAR)) { @Override - public void populateItem( - Item<ICellPopulator<Project>> item, - String s, - IModel<Project> iModel - ) { + public void populateItem(Item<ICellPopulator<Project>> item, String s, IModel<Project> iModel) { if (finalSeminarService.findByProject(iModel.getObject()) != null) { item.add( new DateLabel( s, - new Model<>( - finalSeminarService - .findByProject(iModel.getObject()) - .getStartDate() - ), + new Model<>(finalSeminarService.findByProject(iModel.getObject()).getStartDate()), DateStyle.DATETIME ) ); @@ -116,10 +105,7 @@ public class AdminFinalSeminarExemptionPage public IModel<String> getDataModel(IModel<Project> rowModel) { if (finalSeminarService.findByProject(rowModel.getObject()) != null) { return Model.of( - finalSeminarService - .findByProject(rowModel.getObject()) - .getStartDate() - .toString() + finalSeminarService.findByProject(rowModel.getObject()).getStartDate().toString() ); } else { return Model.of("noSeminar"); @@ -163,8 +149,7 @@ public class AdminFinalSeminarExemptionPage super.onConfigure(); setEnabled( !(iModel.getObject().isFinalSeminarRuleExempted() && - finalSeminarService.findByProject(iModel.getObject()) != - null) + finalSeminarService.findByProject(iModel.getObject()) != null) ); } } @@ -212,10 +197,7 @@ public class AdminFinalSeminarExemptionPage private void addProjectTitleFilter() { TextField<String> titleField = new TextField<>( "titleFilter", - LambdaModel.<String>of( - () -> titleString, - newTitleString -> titleString = newTitleString - ) + LambdaModel.<String>of(() -> titleString, newTitleString -> titleString = newTitleString) ); titleField.add( new OnChangeAjaxBehavior() { @@ -247,19 +229,18 @@ public class AdminFinalSeminarExemptionPage } private void addProjectStatusFilter() { - AjaxCheckBoxMultipleChoice<ProjectStatus> projectStatus = - new AjaxCheckBoxMultipleChoice<>( - "statusFilter", - new ArrayList<>(Collections.singletonList(ProjectStatus.ACTIVE)), - asList(ProjectStatus.values()), - new EnumChoiceRenderer<>(this) - ) { - @Override - public void onUpdate(AjaxRequestTarget target) { - filter.setStatuses(new HashSet<>(getModelObject())); - target.add(exportableDataPanel); - } - }; + AjaxCheckBoxMultipleChoice<ProjectStatus> projectStatus = new AjaxCheckBoxMultipleChoice<>( + "statusFilter", + new ArrayList<>(Collections.singletonList(ProjectStatus.ACTIVE)), + asList(ProjectStatus.values()), + new EnumChoiceRenderer<>(this) + ) { + @Override + public void onUpdate(AjaxRequestTarget target) { + filter.setStatuses(new HashSet<>(getModelObject())); + target.add(exportableDataPanel); + } + }; add(projectStatus); filter.setStatuses(new HashSet<>(projectStatus.getModelObject())); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarPage.java index a34441c591..8b0c9be656 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarPage.java @@ -7,9 +7,7 @@ import se.su.dsv.scipro.security.auth.Authorization; import se.su.dsv.scipro.security.auth.roles.Roles; @Authorization(authorizedRoles = { Roles.ADMIN, Roles.STUDADM }) -public class AdminFinalSeminarPage - extends AbstractAdminProjectPage - implements MenuHighlightAdminFinalSeminars { +public class AdminFinalSeminarPage extends AbstractAdminProjectPage implements MenuHighlightAdminFinalSeminars { public AdminFinalSeminarPage() { add(new AdminFinalSeminarDataPanel("dp")); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java index 180149451c..59dad683ab 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java @@ -41,10 +41,7 @@ public class AdminFinalSeminarSettingsPage extends AbstractAdminSystemPage { private FinalSeminarSettingsService finalSeminarSettingsService; public AdminFinalSeminarSettingsPage() { - FinalSeminarSettingsForm form = new FinalSeminarSettingsForm( - SETTINGS_FORM, - getFinalSeminarSettings() - ); + FinalSeminarSettingsForm form = new FinalSeminarSettingsForm(SETTINGS_FORM, getFinalSeminarSettings()); form.add( new ListView<>(PROJECT_TYPE_LIST, getProjectTypes()) { @Override @@ -157,11 +154,7 @@ public class AdminFinalSeminarSettingsPage extends AbstractAdminSystemPage { ); TextField<String> evaluationURL = new TextField<>( EVALUATION_URL, - LambdaModel.of( - model, - FinalSeminarSettings::getEvaluationURL, - FinalSeminarSettings::setEvaluationURL - ) + LambdaModel.of(model, FinalSeminarSettings::getEvaluationURL, FinalSeminarSettings::setEvaluationURL) ); evaluationURL.add(new UrlValidator(new String[] { "http", "https" })); add(evaluationURL); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java index 4c89c10f18..66f701a982 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java @@ -59,17 +59,10 @@ public class AttendingPanel extends GenericPanel<Project> { ) ); item.add( - new DateLabel( - "date", - finalSeminarModel.map(FinalSeminar::getStartDate), - DateStyle.DATETIME - ) + new DateLabel("date", finalSeminarModel.map(FinalSeminar::getStartDate), DateStyle.DATETIME) ); item.add( - new EnumLabel<>( - "grade", - item.getModel().map(FinalSeminarParticipation::getGrade) - ) { + new EnumLabel<>("grade", item.getModel().map(FinalSeminarParticipation::getGrade)) { @Override protected void onConfigure() { super.onConfigure(); @@ -110,19 +103,8 @@ public class AttendingPanel extends GenericPanel<Project> { pp ); item.add(link); - link.add( - new Label( - "seminarLabel", - seminarModel.map(FinalSeminar::getProject).map(Project::getTitle) - ) - ); - item.add( - new DateLabel( - "date", - seminarModel.map(FinalSeminar::getStartDate), - DateStyle.DATETIME - ) - ); + link.add(new Label("seminarLabel", seminarModel.map(FinalSeminar::getProject).map(Project::getTitle))); + item.add(new DateLabel("date", seminarModel.map(FinalSeminar::getStartDate), DateStyle.DATETIME)); Component removeParticipation = new AjaxConfirmationLink<>( "remove", seminarModel, @@ -130,9 +112,7 @@ public class AttendingPanel extends GenericPanel<Project> { ) { @Override public void onClick(AjaxRequestTarget target) { - seminarModel - .getObject() - .removeActiveParticipant(SciProSession.get().getUser()); + seminarModel.getObject().removeActiveParticipant(SciProSession.get().getUser()); finalSeminarService.save(seminarModel.getObject()); refresh(); target.add(wmc); @@ -140,18 +120,12 @@ public class AttendingPanel extends GenericPanel<Project> { }; removeParticipation.setVisible( !finalSeminarActiveParticipationService - .findByFinalSeminarUser( - seminarModel.getObject(), - SciProSession.get().getUser() - ) + .findByFinalSeminarUser(seminarModel.getObject(), SciProSession.get().getUser()) .hasGrade() ); item.add(removeParticipation); item.add( - new EnumLabel<>( - "grade", - item.getModel().map(FinalSeminarParticipation::getGrade) - ) { + new EnumLabel<>("grade", item.getModel().map(FinalSeminarParticipation::getGrade)) { @Override protected void onConfigure() { super.onConfigure(); @@ -193,10 +167,7 @@ public class AttendingPanel extends GenericPanel<Project> { return new LoadableDetachableModel<>() { @Override protected List<FinalSeminarActiveParticipation> load() { - return finalSeminarService.findUserParticipating( - getModelObject(), - SciProSession.get().getUser() - ); + return finalSeminarService.findUserParticipating(getModelObject(), SciProSession.get().getUser()); } }; } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanel.java index 1fe6834091..fe82b15be8 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanel.java @@ -32,10 +32,7 @@ public class DownloadPdfReportPanel extends Panel { add(resourceLink); resourceLink.add(new Label(PDF_LABEL, reportPdfResource.getFileName())); resourceLink.add( - new DateLabel( - PDF_UPLOAD_DATE, - LambdaModel.of(report, Report::getLastModified, Report::setLastModified) - ) + new DateLabel(PDF_UPLOAD_DATE, LambdaModel.of(report, Report::getLastModified, Report::setLastModified)) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java index ccfeca7096..df0b2e05c8 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java @@ -119,18 +119,9 @@ public class FinalSeminarDataPanel extends Panel { private List<IColumn<FinalSeminar, String>> createColumns() { List<IColumn<FinalSeminar, String>> columns = new ArrayList<>(); + columns.add(new DateColumn<>(Model.of("Date"), FinalSeminar::getStartDate, "startDate", DateStyle.DATETIME)); columns.add( - new DateColumn<>( - Model.of("Date"), - FinalSeminar::getStartDate, - "startDate", - DateStyle.DATETIME - ) - ); - columns.add( - new LambdaColumn<>(Model.of("Type"), "project.projectType.name", fs -> - fs.getProjectType().getName() - ) + new LambdaColumn<>(Model.of("Type"), "project.projectType.name", fs -> fs.getProjectType().getName()) ); columns.add( new AbstractColumn<>(Model.of("Title"), "project.title") { @@ -152,13 +143,12 @@ public class FinalSeminarDataPanel extends Panel { PageParameterKeys.MAP.get(Project.class), rowModel.getObject().getProject().getId() ); - final BookmarkablePageLink<Void> link = - new BookmarkablePageLink<>(id, pageClass, pp); - link.setBody( - rowModel - .map(FinalSeminar::getProject) - .map(Project::getTitle) + final BookmarkablePageLink<Void> link = new BookmarkablePageLink<>( + id, + pageClass, + pp ); + link.setBody(rowModel.map(FinalSeminar::getProject).map(Project::getTitle)); return link; } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParameters.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParameters.java index 950ecfc6d8..ce3ee4aa15 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParameters.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParameters.java @@ -14,15 +14,12 @@ public class FinalSeminarDetailsParameters implements Serializable { private String extraInfo; static FinalSeminarDetailsParameters from(FinalSeminar finalSeminar) { - FinalSeminarDetailsParameters finalSeminarDetailsParameters = - new FinalSeminarDetailsParameters(); + FinalSeminarDetailsParameters finalSeminarDetailsParameters = new FinalSeminarDetailsParameters(); finalSeminarDetailsParameters.setRoom(finalSeminar.getRoom()); finalSeminarDetailsParameters.setManualParticipants(finalSeminar.getManualParticipants()); finalSeminarDetailsParameters.setMaxOpponents(finalSeminar.getMaxOpponents()); finalSeminarDetailsParameters.setMaxParticipants(finalSeminar.getMaxParticipants()); - finalSeminarDetailsParameters.setPresentationLanguage( - finalSeminar.getPresentationLanguage() - ); + finalSeminarDetailsParameters.setPresentationLanguage(finalSeminar.getPresentationLanguage()); finalSeminarDetailsParameters.setReportLanguage(finalSeminar.getProject().getLanguage()); finalSeminarDetailsParameters.setExtraInfo(finalSeminar.getExtraInfo()); return finalSeminarDetailsParameters; diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java index 6b730a89bf..10dac30c17 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java @@ -14,8 +14,7 @@ import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings; import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService; import se.su.dsv.scipro.system.Language; -public class FinalSeminarDetailsParametersPanel - extends GenericPanel<FinalSeminarDetailsParameters> { +public class FinalSeminarDetailsParametersPanel extends GenericPanel<FinalSeminarDetailsParameters> { @Inject GeneralSystemSettingsService generalSystemSettingsService; @@ -29,11 +28,7 @@ public class FinalSeminarDetailsParametersPanel super(id, model); RequiredTextField<String> room = new RequiredTextField<>( "room", - LambdaModel.of( - model, - FinalSeminarDetailsParameters::getRoom, - FinalSeminarDetailsParameters::setRoom - ) + LambdaModel.of(model, FinalSeminarDetailsParameters::getRoom, FinalSeminarDetailsParameters::setRoom) ); room.add(StringValidator.maximumLength(255)); add(room); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java index 62db8737ac..cf8286641a 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java @@ -41,21 +41,13 @@ public class MoveFinalSeminarPanel extends GenericPanel<FinalSeminar> { public MoveForm(String form, final IModel<FinalSeminar> model) { super(form, model); - RequiredTextField<LocalDate> dateField = new RequiredTextField<>( - "date", - dateModel, - LocalDate.class - ); + RequiredTextField<LocalDate> dateField = new RequiredTextField<>("date", dateModel, LocalDate.class); dateField.setModelObject(toLocalDate(model.getObject().getStartDate())); dateField.add(new BootstrapDatePicker()); dateField.add(new SeminarDateValidator(model.map(FinalSeminar::getProject))); add(dateField); - RequiredTextField<LocalTime> timeField = new RequiredTextField<>( - "time", - timeModel, - LocalTime.class - ); + RequiredTextField<LocalTime> timeField = new RequiredTextField<>("time", timeModel, LocalTime.class); timeField.setModelObject(toLocalTime(model.getObject().getStartDate())); timeField.add(new BootstrapTimePicker()); add(timeField); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java index e9dbd55604..3fac802f03 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java @@ -18,8 +18,7 @@ import se.su.dsv.scipro.util.JavascriptEventConfirmation; public abstract class OpposeColumnPanel extends Panel { public static final String LINK = "link"; - public static final String OPPOSE_CONFIRMATION = - "Are you sure you want to oppose on this seminar?"; + public static final String OPPOSE_CONFIRMATION = "Are you sure you want to oppose on this seminar?"; @Inject private FinalSeminarService finalSeminarService; @@ -32,14 +31,12 @@ public abstract class OpposeColumnPanel extends Panel { final IModel<Project> projectModel ) { super(id, finalSeminarModel); - final Either<OppositionRegistrationErrorStatus, Void> canOppose = - finalSeminarService.canOppose( - SciProSession.get().getUser(), - finalSeminarModel.getObject(), - projectModel.getObject() - ); - final Component opposeLink = canOppose.fold(this::showError, allowed -> - new OpposeLink(LINK, finalSeminarModel) + final Either<OppositionRegistrationErrorStatus, Void> canOppose = finalSeminarService.canOppose( + SciProSession.get().getUser(), + finalSeminarModel.getObject(), + projectModel.getObject() + ); + final Component opposeLink = canOppose.fold(this::showError, allowed -> new OpposeLink(LINK, finalSeminarModel) ); add(opposeLink); @@ -51,8 +48,7 @@ public abstract class OpposeColumnPanel extends Panel { finalSeminarCancelled -> getLabel("This seminar has been cancelled"), alreadyParticipating -> getLabel("You are already participating on this seminar"), alreadyHappened -> getLabel("This seminar has already happened"), - tooManyOpponents -> - getLabel("This seminar has reached the maximum number of opponents"), + tooManyOpponents -> getLabel("This seminar has reached the maximum number of opponents"), priorityForSeminarAuthors -> getLabel( "Authors with their own final seminar have " + @@ -61,10 +57,7 @@ public abstract class OpposeColumnPanel extends Panel { " day(s). This priority will end at " + asDateTime(Date.from(priorityForSeminarAuthors.getPriorityEnd())) ), - alreadyOpposed -> - getLabel( - "You have already completed an opposition and can not perform a second one" - ), + alreadyOpposed -> getLabel("You have already completed an opposition and can not perform a second one"), manualOpponents -> getLabel("Opponents for this seminar are handled by the supervisor") ); } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java index e0a35b13f1..fc35785ba1 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java @@ -18,9 +18,7 @@ import se.su.dsv.scipro.report.OppositionReportService; import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel; import se.su.dsv.scipro.session.SciProSession; -public class OppositionReportPage - extends AbstractProjectDetailsPage - implements MenuHighlightAuthorOpposition { +public class OppositionReportPage extends AbstractProjectDetailsPage implements MenuHighlightAuthorOpposition { public static final String THESIS_SUMMARY = "thesisSummary"; public static final String FILL_OUT_REPORT = "fillOutReport"; @@ -37,9 +35,7 @@ public class OppositionReportPage throw new RestartResponseException(ProjectDetailsPage.class, pp); } - final FinalSeminarOpposition opposition = finalSeminarOppositionRepo.findOne( - pp.get("oid").toLong() - ); + final FinalSeminarOpposition opposition = finalSeminarOppositionRepo.findOne(pp.get("oid").toLong()); if (opposition == null) { throw new RestartResponseException(ProjectDetailsPage.class, pp); @@ -50,13 +46,7 @@ public class OppositionReportPage add( new ViewAttachmentPanel( "thesisFile", - report.map(or -> - or - .getFinalSeminarOpposition() - .getFinalSeminar() - .getDocument() - .getFileDescription() - ) + report.map(or -> or.getFinalSeminarOpposition().getFinalSeminar().getDocument().getFileDescription()) ) ); @@ -65,11 +55,7 @@ public class OppositionReportPage { TextArea<String> textArea = new TextArea<>( THESIS_SUMMARY, - LambdaModel.of( - report, - OppositionReport::getThesisSummary, - OppositionReport::setThesisSummary - ) + LambdaModel.of(report, OppositionReport::getThesisSummary, OppositionReport::setThesisSummary) ); textArea.add( new AutoSavingBehaviour() { diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java index 399e6f42f1..5d4bff6f06 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java @@ -46,17 +46,11 @@ public class OverviewSeminarPanel extends Panel { }; add(noSeminar); - BookmarkablePageLink<Void> create = new BookmarkablePageLink<>( - CREATE, - SupervisorFinalSeminarPage.class, - pp - ) { + BookmarkablePageLink<Void> create = new BookmarkablePageLink<>(CREATE, SupervisorFinalSeminarPage.class, pp) { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - SciProSession.get().getUser().equals(model.getObject().getHeadSupervisor()) - ); + setVisibilityAllowed(SciProSession.get().getUser().equals(model.getObject().getHeadSupervisor())); } }; noSeminar.add(create); @@ -73,9 +67,7 @@ public class OverviewSeminarPanel extends Panel { if (seminar != null) { hasSeminar.add(new DateLabel(DATE, seminar::getStartDate, DateStyle.DATETIME)); - hasSeminar.add( - new Label(ROOM, finalSeminarService.findByProject(model.getObject()).getRoom()) - ); + hasSeminar.add(new Label(ROOM, finalSeminarService.findByProject(model.getObject()).getRoom())); } else { hasSeminar.add(new EmptyPanel(DATE)); hasSeminar.add(new EmptyPanel(ROOM)); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java index 25d042e876..bfe9563eed 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java @@ -14,8 +14,7 @@ import se.su.dsv.scipro.util.JavascriptEventConfirmation; public abstract class ParticipateColumnPanel extends Panel { public static final String LINK = "link"; - public static final String PARTICIPATE_CONFIRMATION = - "Are you sure you want to participate on this seminar?"; + public static final String PARTICIPATE_CONFIRMATION = "Are you sure you want to participate on this seminar?"; @Inject private FinalSeminarService finalSeminarService; @@ -25,10 +24,7 @@ public abstract class ParticipateColumnPanel extends Panel { public ParticipateColumnPanel(String id, final IModel<FinalSeminar> finalSeminarModel) { super(id, finalSeminarModel); final Either<ActiveParticipationRegistrationErrorStatus, Void> canActiveParticipate = - finalSeminarService.canActiveParticipate( - SciProSession.get().getUser(), - finalSeminarModel.getObject() - ); + finalSeminarService.canActiveParticipate(SciProSession.get().getUser(), finalSeminarModel.getObject()); final Component participateLink = canActiveParticipate.fold(this::showError, allowed -> new ParticipateColumnPanel.ParticipateLink(LINK, finalSeminarModel) ); @@ -38,10 +34,8 @@ public abstract class ParticipateColumnPanel extends Panel { private Component showError(ActiveParticipationRegistrationErrorStatus notAllowed) { return notAllowed.fold( - tooManyParticipants -> - getLabel("This seminar has reached the maximum number of active participants"), - manualParticipants -> - getLabel("Active participants for this seminar are handled by the supervisor"), + tooManyParticipants -> getLabel("This seminar has reached the maximum number of active participants"), + manualParticipants -> getLabel("Active participants for this seminar are handled by the supervisor"), alreadyParticipating -> getLabel("You are already participating in this seminar"), alreadyHappened -> getLabel("This seminar has already happened"), finalSeminarCancelled -> getLabel("This seminar has been cancelled") @@ -61,12 +55,7 @@ public abstract class ParticipateColumnPanel extends Panel { public ParticipateLink(final String id, final IModel<FinalSeminar> finalSeminarModel) { super(id, finalSeminarModel); - add( - new JavascriptEventConfirmation( - "click", - ParticipateColumnPanel.PARTICIPATE_CONFIRMATION - ) - ); + add(new JavascriptEventConfirmation("click", ParticipateColumnPanel.PARTICIPATE_CONFIRMATION)); setOutputMarkupId(true); } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java index aeb490d39b..83831b9869 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java @@ -24,19 +24,15 @@ public class ProjectActiveParticipationListPanel extends GenericPanel<Project> { public ProjectActiveParticipationListPanel(final String id, final IModel<Project> model) { super(id, model); add( - new ListView<>( - "authors", - model.map(Project::getProjectParticipants).map(ArrayList::new) - ) { + new ListView<>("authors", model.map(Project::getProjectParticipants).map(ArrayList::new)) { @Override protected void populateItem(ListItem<User> item) { - IModel<List<FinalSeminarActiveParticipation>> participations = - LoadableDetachableModel.of(() -> - finalSeminarService.findUserParticipating( - ProjectActiveParticipationListPanel.this.getModelObject(), - item.getModelObject() - ) - ); + IModel<List<FinalSeminarActiveParticipation>> participations = LoadableDetachableModel.of(() -> + finalSeminarService.findUserParticipating( + ProjectActiveParticipationListPanel.this.getModelObject(), + item.getModelObject() + ) + ); item.add(new UserLabel("author", item.getModel())); @@ -51,9 +47,7 @@ public class ProjectActiveParticipationListPanel extends GenericPanel<Project> { item.add( new ListView<>("participations", participations) { @Override - protected void populateItem( - ListItem<FinalSeminarActiveParticipation> item - ) { + protected void populateItem(ListItem<FinalSeminarActiveParticipation> item) { item.add( new Label( "seminar", @@ -66,9 +60,7 @@ public class ProjectActiveParticipationListPanel extends GenericPanel<Project> { item.add( new EnumLabel<>( "grade", - item - .getModel() - .map(FinalSeminarActiveParticipation::getGrade) + item.getModel().map(FinalSeminarActiveParticipation::getGrade) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java index bc8d553db9..02841f1eef 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java @@ -12,9 +12,7 @@ import se.su.dsv.scipro.project.ProjectService; import se.su.dsv.scipro.project.pages.ProjectPage; import se.su.dsv.scipro.util.PageParameterKeys; -public class ProjectFinalSeminarDetailsPage - extends ProjectPage - implements MenuHighlightAuthorFinalSeminars { +public class ProjectFinalSeminarDetailsPage extends ProjectPage implements MenuHighlightAuthorFinalSeminars { public static final String SEMINAR_PANEL = "seminarPanel"; public static final String FEEDBACK = "feedback"; diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java index 6dab269f5a..cfa0e41ff3 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java @@ -37,9 +37,7 @@ import se.su.dsv.scipro.system.ProjectModule; import se.su.dsv.scipro.util.PageParameterKeys; @ProjectModuleComponent(ProjectModule.FINAL_SEMINAR) -public class ProjectOppositionPage - extends AbstractProjectDetailsPage - implements MenuHighlightAuthorMyProjects { +public class ProjectOppositionPage extends AbstractProjectDetailsPage implements MenuHighlightAuthorMyProjects { @Inject private FinalSeminarService finalSeminarService; @@ -68,15 +66,11 @@ public class ProjectOppositionPage } private void addSeminarCreationSubscription() { - final WebMarkupContainer subscribeContainer = new WebMarkupContainer( - "subscribe_container" - ) { + final WebMarkupContainer subscribeContainer = new WebMarkupContainer("subscribe_container") { @Override protected void onConfigure() { super.onConfigure(); - final FinalSeminar finalSeminar = finalSeminarService.findByProject( - getActiveProject() - ); + final FinalSeminar finalSeminar = finalSeminarService.findByProject(getActiveProject()); setVisible(finalSeminar != null); } }; @@ -120,18 +114,15 @@ public class ProjectOppositionPage finalSeminarCancelled -> "This seminar has been cancelled", alreadyParticipating -> "You are already participating on this seminar", alreadyHappened -> "This seminar has already happened", - tooManyOpponents -> - "This seminar has reached the maximum number of opponents", + tooManyOpponents -> "This seminar has reached the maximum number of opponents", priorityForSeminarAuthors -> "Authors with their own final seminar have " + "priority to register for " + priorityForSeminarAuthors.getPriorityDays() + " day(s). This priority will end at " + asDateTime(Date.from(priorityForSeminarAuthors.getPriorityEnd())), - alreadyOpposed -> - "You have already completed an opposition and can't perform a second one", - manualOpponents -> - "Opponents for this seminar are handled by the supervisor" + alreadyOpposed -> "You have already completed an opposition and can't perform a second one", + manualOpponents -> "Opponents for this seminar are handled by the supervisor" ); error(errorMessage); return Boolean.FALSE; @@ -154,20 +145,14 @@ public class ProjectOppositionPage public boolean submitParticipation(FinalSeminar finalSeminar) { return finalSeminarService - .attemptAddActiveParticipation( - SciProSession.get().getUser(), - finalSeminar, - getActiveProject() - ) + .attemptAddActiveParticipation(SciProSession.get().getUser(), finalSeminar, getActiveProject()) .fold( notAllowed -> { final String errorMessage = notAllowed.fold( tooManyParticipants -> "The seminar has already reached the maximum number of active participants", - manualParticipants -> - "Active participants for this seminar are handled by the supervisor", - participationAlreadyParticipating -> - "You are already participating in this seminar", + manualParticipants -> "Active participants for this seminar are handled by the supervisor", + participationAlreadyParticipating -> "You are already participating in this seminar", participationAlreadyHappened -> "This seminar has already happened", participationFinalSeminarCancelled -> "This seminar has been cancelled" ); @@ -187,18 +172,9 @@ public class ProjectOppositionPage private List<IColumn<FinalSeminar, String>> createColumns() { List<IColumn<FinalSeminar, String>> columns = new ArrayList<>(); + columns.add(new DateColumn<>(Model.of("Date"), FinalSeminar::getStartDate, "startDate", DateStyle.DATETIME)); columns.add( - new DateColumn<>( - Model.of("Date"), - FinalSeminar::getStartDate, - "startDate", - DateStyle.DATETIME - ) - ); - columns.add( - new LambdaColumn<>(Model.of("Type"), "project.projectType.name", fs -> - fs.getProjectType().getName() - ) + new LambdaColumn<>(Model.of("Type"), "project.projectType.name", fs -> fs.getProjectType().getName()) ); columns.add( new AbstractColumn<>(Model.of("Title"), "project.title") { @@ -211,10 +187,7 @@ public class ProjectOppositionPage cellItem.add( LinkWrapper.apply(componentId, id -> { final PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Project.class), - rowModel.getObject().getProject().getId() - ); + pp.add(PageParameterKeys.MAP.get(Project.class), rowModel.getObject().getProject().getId()); final BookmarkablePageLink<Void> link = new BookmarkablePageLink<>( id, ProjectFinalSeminarDetailsPage.class, @@ -241,9 +214,7 @@ public class ProjectOppositionPage @Override public void onClick(IModel<FinalSeminar> clickedModel) { if (submitOpposition(clickedModel.getObject())) { - ProjectOppositionPage.this.success( - getString("oppositionAdded", clickedModel) - ); + ProjectOppositionPage.this.success(getString("oppositionAdded", clickedModel)); } } } @@ -264,9 +235,7 @@ public class ProjectOppositionPage @Override public void onClick(IModel<FinalSeminar> clickedModel) { if (submitParticipation(clickedModel.getObject())) { - ProjectOppositionPage.this.success( - getString("participationAdded", clickedModel) - ); + ProjectOppositionPage.this.success(getString("participationAdded", clickedModel)); } } } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java index 2604f13353..5fb2d31a93 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java @@ -49,12 +49,7 @@ public class ProjectOppositionsListPanel extends GenericPanel<Project> { ) ); item.add(finalSeminarLink); - item.add( - new UserLinkPanel( - "user", - opposition.map(FinalSeminarParticipation::getUser) - ) - ); + item.add(new UserLinkPanel("user", opposition.map(FinalSeminarParticipation::getUser))); item.add( new Label("points", opposition.map(FinalSeminarOpposition::getPoints)) { @Override @@ -75,9 +70,7 @@ public class ProjectOppositionsListPanel extends GenericPanel<Project> { ); } - private IModel<? extends List<FinalSeminarOpposition>> getOpponents( - final IModel<Project> project - ) { + private IModel<? extends List<FinalSeminarOpposition>> getOpponents(final IModel<Project> project) { return new LoadableDetachableModel<>() { @Override protected List<FinalSeminarOpposition> load() { diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java index 3131f81de9..087264c563 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java @@ -32,9 +32,7 @@ public class ScheduleFinalSeminarPanel extends GenericPanel<Project> { protected void onConfigure() { super.onConfigure(); boolean noSeminarScheduled = finalSeminarService.findByProject(getModelObject()) == null; - boolean isSupervisor = SciProSession.get() - .getUser() - .equals(getModelObject().getHeadSupervisor()); + boolean isSupervisor = SciProSession.get().getUser().equals(getModelObject().getHeadSupervisor()); boolean isAdmin = SciProSession.get().authorizedForRole(Roles.ADMIN); boolean allowedToEdit = isSupervisor || isAdmin; setVisible(noSeminarScheduled && allowedToEdit); @@ -65,27 +63,14 @@ public class ScheduleFinalSeminarPanel extends GenericPanel<Project> { ) ); - RequiredTextField<LocalDate> dateField = new RequiredTextField<>( - "date", - dateModel, - LocalDate.class - ); + RequiredTextField<LocalDate> dateField = new RequiredTextField<>("date", dateModel, LocalDate.class); dateField.add(new BootstrapDatePicker()); dateField.add(new SeminarDateValidator(model)); add(dateField); - add( - new Label( - "earliest", - LoadableDetachableModel.of(finalSeminarService::getEarliestSeminarDate) - ) - ); + add(new Label("earliest", LoadableDetachableModel.of(finalSeminarService::getEarliestSeminarDate))); - RequiredTextField<LocalTime> timeField = new RequiredTextField<>( - "time", - timeModel, - LocalTime.class - ); + RequiredTextField<LocalTime> timeField = new RequiredTextField<>("time", timeModel, LocalTime.class); timeField.add(new BootstrapTimePicker()); add(timeField); } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java index 6d2996d60b..44ea31774c 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java @@ -49,11 +49,7 @@ public class SeminarActiveParticipantsPanel extends GenericPanel<FinalSeminar> { add(feedbackPanel); final IModel<List<FinalSeminarActiveParticipation>> participants = new ListAdapterModel<>( - LambdaModel.of( - seminar, - FinalSeminar::getActiveParticipations, - FinalSeminar::setActiveParticipations - ) + LambdaModel.of(seminar, FinalSeminar::getActiveParticipations, FinalSeminar::setActiveParticipations) ); add( new Label("noParticipants", new ResourceModel("no.participants")) { @@ -68,12 +64,7 @@ public class SeminarActiveParticipantsPanel extends GenericPanel<FinalSeminar> { new ListView<>(PARTICIPANTS, participants) { @Override protected void populateItem(final ListItem<FinalSeminarActiveParticipation> item) { - item.add( - new UserLinkPanel( - USER, - item.getModel().map(FinalSeminarParticipation::getUser) - ) - ); + item.add(new UserLinkPanel(USER, item.getModel().map(FinalSeminarParticipation::getUser))); item.add( new Link<>(REMOVE_PARTICIPANT, item.getModel()) { @@ -88,9 +79,7 @@ public class SeminarActiveParticipantsPanel extends GenericPanel<FinalSeminar> { @Override public void onClick() { - SeminarActiveParticipantsPanel.this.success( - getString("removed", item.getModel()) - ); + SeminarActiveParticipantsPanel.this.success(getString("removed", item.getModel())); FinalSeminar finalSeminar = getModelObject().getFinalSeminar(); finalSeminar.removeActiveParticipant(getModelObject()); finalSeminarService.save(finalSeminar); @@ -118,10 +107,7 @@ public class SeminarActiveParticipantsPanel extends GenericPanel<FinalSeminar> { private IModel<FinalSeminarActiveParticipation> participant; - public ActiveParticipationRadioChoice( - String id, - IModel<FinalSeminarActiveParticipation> participant - ) { + public ActiveParticipationRadioChoice(String id, IModel<FinalSeminarActiveParticipation> participant) { super( id, LambdaModel.of( @@ -167,15 +153,12 @@ public class SeminarActiveParticipantsPanel extends GenericPanel<FinalSeminar> { } private boolean isHeadSupervisor() { - return SciProSession.get() - .getUser() - .equals(getModelObject().getProject().getHeadSupervisor()); + return SciProSession.get().getUser().equals(getModelObject().getProject().getHeadSupervisor()); } private boolean isAdmin() { return ( - SciProSession.get().authorizedForRole(Roles.SYSADMIN) && - SciProSession.get().hasActualRole(Roles.SYSADMIN) + SciProSession.get().authorizedForRole(Roles.SYSADMIN) && SciProSession.get().hasActualRole(Roles.SYSADMIN) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java index d60ce3e409..208daadb10 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java @@ -77,8 +77,7 @@ public class SeminarCRUDPanel extends GenericPanel<FinalSeminar> { FinalSeminarForm(String id, IModel<FinalSeminar> seminar) { super(id, seminar); - detailsParameters = LoadableDetachableModel.of(() -> - FinalSeminarDetailsParameters.from(seminar.getObject()) + detailsParameters = LoadableDetachableModel.of(() -> FinalSeminarDetailsParameters.from(seminar.getObject()) ); add( new FinalSeminarDetailsParametersPanel( @@ -217,8 +216,7 @@ public class SeminarCRUDPanel extends GenericPanel<FinalSeminar> { protected void onValidateModelObjects() { FinalSeminar seminar = getModelObject(); if ( - !seminar.getProject().isFinalSeminarRuleExempted() && - nonWorkDays.isNonWorkDay(seminar.getStartDate()) + !seminar.getProject().isFinalSeminarRuleExempted() && nonWorkDays.isNonWorkDay(seminar.getStartDate()) ) { error(getString("nonworkday")); } @@ -230,14 +228,8 @@ public class SeminarCRUDPanel extends GenericPanel<FinalSeminar> { } } - private Optional<Project> getPotentialParticipantProjectForUserAndType( - User participant, - ProjectType projectType - ) { - List<Project> projects = projectService.getActiveProjectsByUserAndProjectType( - participant, - projectType - ); + private Optional<Project> getPotentialParticipantProjectForUserAndType(User participant, ProjectType projectType) { + List<Project> projects = projectService.getActiveProjectsByUserAndProjectType(participant, projectType); if (projects.size() == 1) { return Optional.of(projects.get(0)); } else { @@ -335,12 +327,11 @@ public class SeminarCRUDPanel extends GenericPanel<FinalSeminar> { error(getString("UserHasNoActiveProject", Model.of(potentialOpponent))); } else { final Project project = maybeProject.get(); - Either<OpposeError, FinalSeminarOpposition> result = - seminarService.attemptAddOppositionAsSupervisor( - potentialOpponent, - finalSeminar, - project - ); + Either<OpposeError, FinalSeminarOpposition> result = seminarService.attemptAddOppositionAsSupervisor( + potentialOpponent, + finalSeminar, + project + ); result.fold( error -> { switch (error) { @@ -382,10 +373,7 @@ public class SeminarCRUDPanel extends GenericPanel<FinalSeminar> { private void saveSeminar(FinalSeminarDetails finalSeminarDetails) { boolean roomChanged = !finalSeminarDetails.location().equals(getModelObject().getRoom()); - FinalSeminar finalSeminar = seminarService.updateDetails( - getModelObject(), - finalSeminarDetails - ); + FinalSeminar finalSeminar = seminarService.updateDetails(getModelObject(), finalSeminarDetails); setModelObject(finalSeminar); success(getString("final.seminar.updated")); addActiveParticipants(finalSeminar); diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanel.java index 1d763a078f..28331509df 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanel.java @@ -18,9 +18,7 @@ public class SeminarCancelledInfoPanel extends Panel { } }; add(cancelled); - cancelled.add( - new MultiLineLabel(CANCELLED_INFO, new StringResourceModel(CANCELLED_INFO, this, null)) - ); + cancelled.add(new MultiLineLabel(CANCELLED_INFO, new StringResourceModel(CANCELLED_INFO, this, null))); } static final String CANCELLED = "cancelled"; diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarNonCRUDPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarNonCRUDPanel.java index 034b599301..ce0e5753a4 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarNonCRUDPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarNonCRUDPanel.java @@ -23,22 +23,10 @@ public class SeminarNonCRUDPanel extends Panel { add(new Label(SEMINAR_MAX_OPPOSITIONS, seminar.map(FinalSeminar::getMaxOpponents))); add(new Label(SEMINAR_MAX_PARTICIPANTS, seminar.map(FinalSeminar::getMaxParticipants))); add(new Label(SEMINAR_ROOM, seminar.map(FinalSeminar::getRoom))); - add( - new EnumLabel<>( - SEMINAR_PRESENTATION_LANGUAGE, - seminar.map(FinalSeminar::getPresentationLanguage) - ) - ); - add( - new EnumLabel<>( - SEMINAR_REPORT_LANGUAGE, - seminar.map(FinalSeminar::getProject).map(Project::getLanguage) - ) - ); + add(new EnumLabel<>(SEMINAR_PRESENTATION_LANGUAGE, seminar.map(FinalSeminar::getPresentationLanguage))); + add(new EnumLabel<>(SEMINAR_REPORT_LANGUAGE, seminar.map(FinalSeminar::getProject).map(Project::getLanguage))); - add( - new DateLabel(SEMINAR_DATE, seminar.map(FinalSeminar::getStartDate), DateStyle.DATETIME) - ); + add(new DateLabel(SEMINAR_DATE, seminar.map(FinalSeminar::getStartDate), DateStyle.DATETIME)); add( new SmarterLinkMultiLineLabel("extraInfo", seminar.map(FinalSeminar::getExtraInfo)) { @Override diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java index 9c1862aec5..5315c6ff3d 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java @@ -105,9 +105,7 @@ public class SeminarOppositionPanel extends Panel { add(oppositionContainer); } - private ListView<FinalSeminarOpposition> getOpponentsList( - final IModel<List<FinalSeminarOpposition>> oppositions - ) { + private ListView<FinalSeminarOpposition> getOpponentsList(final IModel<List<FinalSeminarOpposition>> oppositions) { return new ListView<>(OPPONENTS, oppositions) { @Override protected void populateItem(final ListItem<FinalSeminarOpposition> item) { @@ -115,17 +113,9 @@ public class SeminarOppositionPanel extends Panel { item.add(getUserLinkPanel(item)); WebMarkupContainer gradeContainer = getGradeContainer(opposition); + gradeContainer.add(new Label("gradedPoints", (item.getModel().map(FinalSeminarOpposition::getPoints)))); gradeContainer.add( - new Label( - "gradedPoints", - (item.getModel().map(FinalSeminarOpposition::getPoints)) - ) - ); - gradeContainer.add( - new Label( - "gradedFeedback", - item.getModel().map(FinalSeminarOpposition::getFeedback) - ) + new Label("gradedFeedback", item.getModel().map(FinalSeminarOpposition::getFeedback)) ); item.add(gradeContainer); @@ -152,14 +142,8 @@ public class SeminarOppositionPanel extends Panel { protected void onConfigure() { super.onConfigure(); FinalSeminarGrade grade = opposition.getGrade(); - boolean isGraded = - grade != null && - opposition.getPoints() != null && - opposition.getFeedback() != null; - boolean isMine = Objects.equals( - SciProSession.get().getUser(), - opposition.getUser() - ); + boolean isGraded = grade != null && opposition.getPoints() != null && opposition.getFeedback() != null; + boolean isMine = Objects.equals(SciProSession.get().getUser(), opposition.getUser()); setVisibilityAllowed(isGraded && (isEmployee() || isMine)); } }; @@ -168,12 +152,7 @@ public class SeminarOppositionPanel extends Panel { private Link<FinalSeminarOpposition> getRemoveLink(final IModel<FinalSeminarOpposition> model) { return new Link<>(REMOVE, model) { { - add( - new JavascriptEventConfirmation( - "click", - SeminarOppositionPanel.this.getString("confirm") - ) - ); + add(new JavascriptEventConfirmation("click", SeminarOppositionPanel.this.getString("confirm"))); } @Override @@ -184,11 +163,7 @@ public class SeminarOppositionPanel extends Panel { finalSeminarService.save(finalSeminar); opponents.setModel( new ListAdapterModel<>( - LambdaModel.of( - seminar, - FinalSeminar::getOppositions, - FinalSeminar::setOppositions - ) + LambdaModel.of(seminar, FinalSeminar::getOppositions, FinalSeminar::setOppositions) ) ); } @@ -212,9 +187,7 @@ public class SeminarOppositionPanel extends Panel { }; } - private FinalSeminarOppositionForm getFinalSeminarOppositionForm( - ListItem<FinalSeminarOpposition> item - ) { + private FinalSeminarOppositionForm getFinalSeminarOppositionForm(ListItem<FinalSeminarOpposition> item) { return new FinalSeminarOppositionForm(SeminarOppositionPanel.FORM, item.getModel()); } @@ -224,15 +197,12 @@ public class SeminarOppositionPanel extends Panel { private boolean isAdmin() { return ( - SciProSession.get().authorizedForRole(Roles.SYSADMIN) && - SciProSession.get().hasActualRole(Roles.SYSADMIN) + SciProSession.get().authorizedForRole(Roles.SYSADMIN) && SciProSession.get().hasActualRole(Roles.SYSADMIN) ); } private boolean isHeadSupervisor() { - return SciProSession.get() - .getUser() - .equals(seminar.getObject().getProject().getHeadSupervisor()); + return SciProSession.get().getUser().equals(seminar.getObject().getProject().getHeadSupervisor()); } private boolean isEmployee() { @@ -241,10 +211,7 @@ public class SeminarOppositionPanel extends Panel { private class FinalSeminarOppositionForm extends Form<FinalSeminarOpposition> { - public FinalSeminarOppositionForm( - String id, - final IModel<FinalSeminarOpposition> finalSeminarOpposition - ) { + public FinalSeminarOppositionForm(String id, final IModel<FinalSeminarOpposition> finalSeminarOpposition) { super(id, finalSeminarOpposition); FormComponent<Integer> pointsField = new TextField<>( POINTS, @@ -276,26 +243,19 @@ public class SeminarOppositionPanel extends Panel { @Override protected void onSubmit(AjaxRequestTarget target) { if (getModelObject().getPoints().equals(0)) { - finalSeminarOpposition - .getObject() - .setGrade(FinalSeminarGrade.NOT_APPROVED); - eventBus.post( - new OppositionFailedEvent(finalSeminarOpposition.getObject()) - ); + finalSeminarOpposition.getObject().setGrade(FinalSeminarGrade.NOT_APPROVED); + eventBus.post(new OppositionFailedEvent(finalSeminarOpposition.getObject())); } else { finalSeminarOpposition.getObject().setGrade(FinalSeminarGrade.APPROVED); - eventBus.post( - new OppositionApprovedEvent(finalSeminarOpposition.getObject()) - ); + eventBus.post(new OppositionApprovedEvent(finalSeminarOpposition.getObject())); } finalSeminarOppositionService.save(finalSeminarOpposition.getObject()); boolean updated = true; if (gradingModuleIsOnForProjectType()) { - SupervisorGradingReport report = - gradingReportService.getSupervisorGradingReport( - finalSeminarOpposition.getObject().getProject(), - finalSeminarOpposition.getObject().getUser() - ); + SupervisorGradingReport report = gradingReportService.getSupervisorGradingReport( + finalSeminarOpposition.getObject().getProject(), + finalSeminarOpposition.getObject().getUser() + ); updated = gradingReportService.updateOppositionCriteria( report, finalSeminarOpposition.getObject() @@ -303,9 +263,7 @@ public class SeminarOppositionPanel extends Panel { } success( getString( - updated - ? "feedback.opponent.updated" - : "feedback.opponent.not.updated", + updated ? "feedback.opponent.updated" : "feedback.opponent.not.updated", finalSeminarOpposition ) ); @@ -334,9 +292,7 @@ public class SeminarOppositionPanel extends Panel { } private boolean gradingModuleIsOnForProjectType() { - return projectTypeService - .findWithModule(ProjectModule.GRADING) - .contains(seminar.getObject().getProjectType()); + return projectTypeService.findWithModule(ProjectModule.GRADING).contains(seminar.getObject().getProjectType()); } private boolean hasSubmittedOppositionReport(FinalSeminarOpposition opposition) { diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java index 5f7d618429..fd975f51ad 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java @@ -79,17 +79,14 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos private ViewAttachmentPanel getOldReport(final IModel<FinalSeminarOpposition> opposition) { return new ViewAttachmentPanel( "reportDownload", - opposition - .map(FinalSeminarOpposition::getOpponentReport) - .map(FileReference::getFileDescription), + opposition.map(FinalSeminarOpposition::getOpponentReport).map(FileReference::getFileDescription), DateStyle.DATETIME ) { @Override protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - getDefaultModelObject() != null && - allowedToSeeOppositionReport(opposition.getObject()) + getDefaultModelObject() != null && allowedToSeeOppositionReport(opposition.getObject()) ); } }; @@ -112,8 +109,7 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos super.onConfigure(); setVisibilityAllowed( allowedToSeeOppositionReport(opposition) && - (opposition.getOppositionReport() == null || - !opposition.getOppositionReport().isSubmitted()) + (opposition.getOppositionReport() == null || !opposition.getOppositionReport().isSubmitted()) ); } }; @@ -123,11 +119,7 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos final FinalSeminarOpposition opposition, final PageParameters parameters ) { - return new BookmarkablePageLink<>( - "oppositionReportLink", - OppositionReportPage.class, - parameters - ) { + return new BookmarkablePageLink<>("oppositionReportLink", OppositionReportPage.class, parameters) { @Override protected void onConfigure() { super.onConfigure(); @@ -186,10 +178,7 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos private AjaxConfirmationLink<OppositionReport> getDeleteOpponentReportLink( final IModel<FinalSeminarOpposition> opposition ) { - return new AjaxConfirmationLink<>( - "removeReportLink", - new StringResourceModel("are.you.sure", this, null) - ) { + return new AjaxConfirmationLink<>("removeReportLink", new StringResourceModel("are.you.sure", this, null)) { @Override public void onClick(AjaxRequestTarget target) { oppositionReportService.deleteOpponentReport(opposition.getObject()); @@ -209,10 +198,7 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos private AjaxConfirmationLink<OppositionReport> getDeleteOppositionReportLink( final IModel<FinalSeminarOpposition> opposition ) { - return new AjaxConfirmationLink<>( - "removeOppositionLink", - new StringResourceModel("are.you.sure", this, null) - ) { + return new AjaxConfirmationLink<>("removeOppositionLink", new StringResourceModel("are.you.sure", this, null)) { @Override public void onClick(AjaxRequestTarget target) { oppositionReportService.deleteOppositionReport(opposition.getObject()); @@ -231,8 +217,7 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos private boolean isOpponentAndNotSubmitted(FinalSeminarOpposition opposition) { return ( - isOppositionAuthor(opposition) && - !oppositionReportService.findOrCreateReport(opposition).isSubmitted() + isOppositionAuthor(opposition) && !oppositionReportService.findOrCreateReport(opposition).isSubmitted() ); } @@ -277,15 +262,12 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos } private boolean isHeadSupervisor() { - return SciProSession.get() - .getUser() - .equals(seminar.getObject().getProject().getHeadSupervisor()); + return SciProSession.get().getUser().equals(seminar.getObject().getProject().getHeadSupervisor()); } private boolean isAdmin() { return ( - SciProSession.get().authorizedForRole(Roles.SYSADMIN) && - SciProSession.get().hasActualRole(Roles.SYSADMIN) + SciProSession.get().authorizedForRole(Roles.SYSADMIN) && SciProSession.get().hasActualRole(Roles.SYSADMIN) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java index df3874b8b6..9dfb734d7e 100755 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java @@ -61,13 +61,9 @@ public class SeminarPanel extends Panel { final Date startDate = finalSeminar.getStartDate(); final Date now = new Date(); final User currentUser = SciProSession.get().getUser(); - final boolean seminarHappened = - finalSeminar.getStartDate() != null && now.after(startDate); - final boolean thereIsAnEvaluation = - evaluationURL != null && !evaluationURL.isEmpty(); - setVisibilityAllowed( - project.isParticipant(currentUser) && seminarHappened && thereIsAnEvaluation - ); + final boolean seminarHappened = finalSeminar.getStartDate() != null && now.after(startDate); + final boolean thereIsAnEvaluation = evaluationURL != null && !evaluationURL.isEmpty(); + setVisibilityAllowed(project.isParticipant(currentUser) && seminarHappened && thereIsAnEvaluation); } } ); @@ -131,9 +127,7 @@ public class SeminarPanel extends Panel { } private boolean isSupervisor(IModel<FinalSeminar> seminar) { - return SciProSession.get() - .getUser() - .equals(seminar.getObject().getProject().getHeadSupervisor()); + return SciProSession.get().getUser().equals(seminar.getObject().getProject().getHeadSupervisor()); } private void initThesisComponent(final IModel<FinalSeminar> seminar) { diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java index 84a6801d2b..21ce31cab3 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java @@ -47,12 +47,7 @@ public class SeminarRespondentsPanel extends Panel { new ListView<>(RESPONDENTS, getRespondents()) { @Override protected void populateItem(ListItem<FinalSeminarRespondent> item) { - item.add( - new UserLinkPanel( - USER, - item.getModel().map(FinalSeminarRespondent::getUser) - ) - ); + item.add(new UserLinkPanel(USER, item.getModel().map(FinalSeminarRespondent::getUser))); item.add(new RespondentRadioChoice(RADIOS, item.getModel())); } } @@ -75,11 +70,7 @@ public class SeminarRespondentsPanel extends Panel { public RespondentRadioChoice(String id, IModel<FinalSeminarRespondent> respondent) { super( id, - LambdaModel.of( - respondent, - FinalSeminarRespondent::getGrade, - FinalSeminarRespondent::setGrade - ), + LambdaModel.of(respondent, FinalSeminarRespondent::getGrade, FinalSeminarRespondent::setGrade), Arrays.asList(FinalSeminarGrade.values()), new EnumChoiceRenderer<>(SeminarRespondentsPanel.this), SeminarRespondentsPanel.this.getString("confirmation", respondent) @@ -115,8 +106,6 @@ public class SeminarRespondentsPanel extends Panel { } private boolean isHeadSupervisor() { - return SciProSession.get() - .getUser() - .equals(seminar.getObject().getProject().getHeadSupervisor()); + return SciProSession.get().getUser().equals(seminar.getObject().getProject().getHeadSupervisor()); } } diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java index e4517079b7..59f3f7d950 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java @@ -71,10 +71,7 @@ public class SeminarThesisPanel extends GenericPanel<FinalSeminar> { super.onConfigure(); User currentUser = SciProSession.get().getUser(); FinalSeminar seminar = getSeminar(); - boolean isEmployee = currentUser - .getRoles() - .stream() - .anyMatch(role -> role.authorizedForRole(Roles.SUPERVISOR)); + boolean isEmployee = currentUser.getRoles().stream().anyMatch(role -> role.authorizedForRole(Roles.SUPERVISOR)); boolean projectMember = seminar .getProject() .getMembers() @@ -82,8 +79,7 @@ public class SeminarThesisPanel extends GenericPanel<FinalSeminar> { .map(Member::getUser) .anyMatch(currentUser::equals); boolean seminarParticipant = - seminar.getActiveParticipants().contains(currentUser) || - seminar.getOpponents().contains(currentUser); + seminar.getActiveParticipants().contains(currentUser) || seminar.getOpponents().contains(currentUser); setVisible(isEmployee || seminarParticipant || projectMember); } @@ -118,10 +114,7 @@ public class SeminarThesisPanel extends GenericPanel<FinalSeminar> { private void addNoThesisText() { add( - new Label( - NO_THESIS, - new StringResourceModel("noThesis", SeminarThesisPanel.this, null) - ) { + new Label(NO_THESIS, new StringResourceModel("noThesis", SeminarThesisPanel.this, null)) { @Override protected void onConfigure() { super.onConfigure(); @@ -144,9 +137,7 @@ public class SeminarThesisPanel extends GenericPanel<FinalSeminar> { @Override protected void onConfigure() { super.onConfigure(); - boolean isSupervisor = getSeminar() - .getProject() - .isSupervisor(SciProSession.get().getUser()); + boolean isSupervisor = getSeminar().getProject().isSupervisor(SciProSession.get().getUser()); setVisibilityAllowed(seminarService.hasThesis(getSeminar()) && isSupervisor); } }; @@ -198,9 +189,7 @@ public class SeminarThesisPanel extends GenericPanel<FinalSeminar> { !seminarService.hasThesis(getSeminar()) ); if (!getSeminar().getProject().isFinalSeminarRuleExempted()) { - setEnabled( - !getSeminar().isDeleted() && !seminarService.hasDeadlinePassed(getSeminar()) - ); + setEnabled(!getSeminar().isDeleted() && !seminarService.hasDeadlinePassed(getSeminar())); } else { setEnabled(true); } @@ -223,10 +212,7 @@ public class SeminarThesisPanel extends GenericPanel<FinalSeminar> { private final FileUploadField fileUploadField; - public ReplaceSeminarDocumentForm( - final String id, - final IModel<FinalSeminar> finalSeminarModel - ) { + public ReplaceSeminarDocumentForm(final String id, final IModel<FinalSeminar> finalSeminarModel) { super(id, finalSeminarModel); fileUploadField = new FileUploadField("document"); fileUploadField.setRequired(true); @@ -238,11 +224,8 @@ public class SeminarThesisPanel extends GenericPanel<FinalSeminar> { super.onConfigure(); final boolean hasThesis = seminarService.hasThesis(getModelObject()); final boolean seminarHasHappened = - getModelObject().getStartDate() != null && - getModelObject().getStartDate().before(new Date()); - final boolean isAuthor = getModelObject() - .getProject() - .isParticipant(SciProSession.get().getUser()); + getModelObject().getStartDate() != null && getModelObject().getStartDate().before(new Date()); + final boolean isAuthor = getModelObject().getProject().isParticipant(SciProSession.get().getUser()); setVisible(hasThesis && !seminarHasHappened && isAuthor); } diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java index a9c0a8c8f7..9aa5c2bb77 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java @@ -69,8 +69,7 @@ public class ApproveFinalThesisPanel extends GenericPanel<Project> { !finalThesisService.hasFinalThesis(getModelObject()) || thesisHasStatus(REJECTED) ); thesisApprovedContainer.setVisible( - getFinalThesis().getObject() != null && - getFinalThesis().getObject().getStatus() == APPROVED + getFinalThesis().getObject() != null && getFinalThesis().getObject().getStatus() == APPROVED ); } @@ -121,10 +120,7 @@ public class ApproveFinalThesisPanel extends GenericPanel<Project> { } ); add( - new Label( - STATUS_REJECTED_LABEL, - new ResourceModel("thesis.rejected.status.label") - ) { + new Label(STATUS_REJECTED_LABEL, new ResourceModel("thesis.rejected.status.label")) { @Override protected void onConfigure() { super.onConfigure(); @@ -144,10 +140,7 @@ public class ApproveFinalThesisPanel extends GenericPanel<Project> { ); add( - new Label( - "rejection_comment", - getFinalThesis().map(FinalThesis::getRejectionComment) - ) { + new Label("rejection_comment", getFinalThesis().map(FinalThesis::getRejectionComment)) { @Override protected void onConfigure() { super.onConfigure(); @@ -181,20 +174,12 @@ public class ApproveFinalThesisPanel extends GenericPanel<Project> { final RequiredTextField<String> englishTitleField = new RequiredTextField<>( "englishTitle", - LambdaModel.of( - finalThesis, - FinalThesis::getEnglishTitle, - FinalThesis::setEnglishTitle - ), + LambdaModel.of(finalThesis, FinalThesis::getEnglishTitle, FinalThesis::setEnglishTitle), String.class ); final RequiredTextField<String> swedishTitleField = new RequiredTextField<>( "swedishTitle", - LambdaModel.of( - finalThesis, - FinalThesis::getSwedishTitle, - FinalThesis::setSwedishTitle - ), + LambdaModel.of(finalThesis, FinalThesis::getSwedishTitle, FinalThesis::setSwedishTitle), String.class ) { @Override @@ -230,21 +215,14 @@ public class ApproveFinalThesisPanel extends GenericPanel<Project> { decisionContainer.add( new DateLabel( DATE_LABEL, - LambdaModel.of( - finalThesis, - FinalThesis::getDateCreated, - FinalThesis::setDateCreated - ), + LambdaModel.of(finalThesis, FinalThesis::getDateCreated, FinalThesis::setDateCreated), DateStyle.DATETIME ) ); decisionContainer.add(englishTitleField); decisionContainer.add(swedishTitleField); - rejectFinalThesisPanel = new RejectFinalThesisPanel( - REJECT_PANEL, - ApproveFinalThesisPanel.this.getModel() - ) { + rejectFinalThesisPanel = new RejectFinalThesisPanel(REJECT_PANEL, ApproveFinalThesisPanel.this.getModel()) { @Override protected void cancel() { showRejectionPanel(false); diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java index da30e502b7..7f595875cb 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java @@ -83,10 +83,7 @@ public class FinalThesisPanel extends GenericPanel<Project> { super.onConfigure(); setVisibilityAllowed( finalSeminarService.hasHadFinalSeminar(getModelObject()) && - !reflectionService.hasToFillInReflection( - getModelObject(), - SciProSession.get().getUser() - ) + !reflectionService.hasToFillInReflection(getModelObject(), SciProSession.get().getUser()) ); } @@ -94,12 +91,7 @@ public class FinalThesisPanel extends GenericPanel<Project> { public RevisionPanel(String id) { super(id); - add( - new DateLabel( - REJECTED_DATE_LABEL, - getFinalThesis().map(FinalThesis::getDateRejected) - ) - ); + add(new DateLabel(REJECTED_DATE_LABEL, getFinalThesis().map(FinalThesis::getDateRejected))); PageParameters parameters = new PageParameters(); parameters.set(PageParameterKeys.MAP.get(Project.class), getModelObject().getId()); add(new BookmarkablePageLink<Void>(FORUM_LINK, ProjectForumBasePage.class, parameters)); @@ -113,10 +105,7 @@ public class FinalThesisPanel extends GenericPanel<Project> { } private boolean isFinalThesisStatus(Status status) { - return ( - getFinalThesis().getObject() != null && - getFinalThesis().getObject().getStatus() == status - ); + return (getFinalThesis().getObject() != null && getFinalThesis().getObject().getStatus() == status); } private class ApprovedPanel extends Panel { @@ -171,27 +160,14 @@ public class FinalThesisPanel extends GenericPanel<Project> { public ConsentForm(final String id, IModel<Project> project) { super(id, project); - IModel<PublishingConsentService.PublishingConsent> publishingConsent = - LoadableDetachableModel.of(() -> - publishingConsentService.getPublishingConsent( - project.getObject(), - SciProSession.get().getUser() - ) - ); - - availableLevels = publishingConsent.map( - PublishingConsentService.PublishingConsent::available + IModel<PublishingConsentService.PublishingConsent> publishingConsent = LoadableDetachableModel.of(() -> + publishingConsentService.getPublishingConsent(project.getObject(), SciProSession.get().getUser()) ); + + availableLevels = publishingConsent.map(PublishingConsentService.PublishingConsent::available); levelModel = LoadableDetachableModel.of(() -> publishingConsent.getObject().selected()); - add( - new DropDownChoice<>( - "consent_level", - levelModel, - availableLevels, - new EnumChoiceRenderer<>(this) - ) - ); + add(new DropDownChoice<>("consent_level", levelModel, availableLevels, new EnumChoiceRenderer<>(this))); add(new FencedFeedbackPanel("feedback", this)); } diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java index a2b64b519e..318cce9434 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java @@ -107,13 +107,7 @@ public class RejectFinalThesisPanel extends GenericPanel<Project> { .map(Attachment::newUpload) .collect(Collectors.toSet()); - projectForumService.createThread( - project.getObject(), - user, - REJECTED_SUBJECT, - contentArea.getInput(), - uploads - ); + projectForumService.createThread(project.getObject(), user, REJECTED_SUBJECT, contentArea.getInput(), uploads); finalThesisService.reject(getModelObject(), contentArea.getInput()); onRejection(); diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java index 2002af8c37..c15cc54bef 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java +++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java @@ -28,8 +28,10 @@ public class SupervisorFinalThesisListingPage extends AbstractSupervisorAllProje public SupervisorFinalThesisListingPage(PageParameters pp) { super(pp); - FilteredDataProvider<FinalThesis, FinalThesisService.Filter> provider = - new FilteredDataProvider<>(finalThesisService, getFilter()); + FilteredDataProvider<FinalThesis, FinalThesisService.Filter> provider = new FilteredDataProvider<>( + finalThesisService, + getFilter() + ); provider.setSort("dateApproved", SortOrder.DESCENDING); add(new ExportableDataPanel<>("table", columns(), provider)); } @@ -47,20 +49,14 @@ public class SupervisorFinalThesisListingPage extends AbstractSupervisorAllProje FinalThesis::getDateApproved, "dateApproved" ), - new LambdaColumn<>( - new StringResourceModel("project.type", this), - "project.projectType.name", - ft -> ft.getProject().getProjectType().getName() + new LambdaColumn<>(new StringResourceModel("project.type", this), "project.projectType.name", ft -> + ft.getProject().getProjectType().getName() ), - new LambdaColumn<>( - new StringResourceModel("project.title", this), - "project.title", - ft -> ft.getProject().getTitle() + new LambdaColumn<>(new StringResourceModel("project.title", this), "project.title", ft -> + ft.getProject().getTitle() ), - new UserColumn<>( - new StringResourceModel("supervisor", this), - "project.headSupervisor.fullName", - ft -> ft.getProject().getHeadSupervisor() + new UserColumn<>(new StringResourceModel("supervisor", this), "project.headSupervisor.fullName", ft -> + ft.getProject().getHeadSupervisor() ), new ThesisFileColumn() ); @@ -69,17 +65,11 @@ public class SupervisorFinalThesisListingPage extends AbstractSupervisorAllProje private class ThesisFileColumn extends AbstractColumn<FinalThesis, String> { public ThesisFileColumn() { - super( - new StringResourceModel("thesis.file", SupervisorFinalThesisListingPage.this, null) - ); + super(new StringResourceModel("thesis.file", SupervisorFinalThesisListingPage.this, null)); } @Override - public void populateItem( - Item<ICellPopulator<FinalThesis>> item, - String id, - IModel<FinalThesis> model - ) { + public void populateItem(Item<ICellPopulator<FinalThesis>> item, String id, IModel<FinalThesis> model) { FileDownloadLink<FileDescription> link = new FileDownloadLink<>( "name", model.map(FinalThesis::getDocument).map(FileReference::getFileDescription) diff --git a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java index 0e9790a3ac..63ea65884e 100755 --- a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java @@ -30,8 +30,7 @@ public abstract class FirstMeetingColumnPanel extends GenericPanel<Idea> { super.onConfigure(); setEnabled( !(model.getObject().isInactive() || - (!isSupervisor(getModelObject()) && - getModelObject().getFirstMeeting() == null)) + (!isSupervisor(getModelObject()) && getModelObject().getFirstMeeting() == null)) ); } @@ -51,10 +50,7 @@ public abstract class FirstMeetingColumnPanel extends GenericPanel<Idea> { } } else { return new Model<>( - dateService.format( - getModelObject().getFirstMeeting().getFirstMeetingDate(), - DateStyle.DATETIME - ) + dateService.format(getModelObject().getFirstMeeting().getFirstMeetingDate(), DateStyle.DATETIME) ); } return new ResourceModel("none"); diff --git a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java index 4ade6e68a9..c7b62f64cd 100644 --- a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java @@ -85,14 +85,9 @@ public class FirstMeetingPanel extends GenericPanel<Idea> { DateStyle.DATETIME ) ); + studentWMC.add(new Label(ROOM_LABEL, model.map(Idea::getFirstMeeting).map(FirstMeeting::getRoom))); studentWMC.add( - new Label(ROOM_LABEL, model.map(Idea::getFirstMeeting).map(FirstMeeting::getRoom)) - ); - studentWMC.add( - new MultiLineLabel( - DESCRIPTION_LABEL, - model.map(Idea::getFirstMeeting).map(FirstMeeting::getDescription) - ) + new MultiLineLabel(DESCRIPTION_LABEL, model.map(Idea::getFirstMeeting).map(FirstMeeting::getDescription)) ); add(studentWMC); } @@ -131,11 +126,7 @@ public class FirstMeetingPanel extends GenericPanel<Idea> { FormComponent<Date> date = new BootstrapDateTimeComponent( FIRST_MEETING_DATE, - LambdaModel.of( - model, - FirstMeeting::getFirstMeetingDate, - FirstMeeting::setFirstMeetingDate - ) + LambdaModel.of(model, FirstMeeting::getFirstMeetingDate, FirstMeeting::setFirstMeetingDate) ); date.setRequired(true); date.add(DateValidator.minimum(new Date())); @@ -143,18 +134,11 @@ public class FirstMeetingPanel extends GenericPanel<Idea> { add( new TextArea<>( DESCRIPTION, - LambdaModel.of( - model, - FirstMeeting::getDescription, - FirstMeeting::setDescription - ) + LambdaModel.of(model, FirstMeeting::getDescription, FirstMeeting::setDescription) ) ); add( - new RequiredTextField<>( - ROOM_FIELD, - LambdaModel.of(model, FirstMeeting::getRoom, FirstMeeting::setRoom) - ) + new RequiredTextField<>(ROOM_FIELD, LambdaModel.of(model, FirstMeeting::getRoom, FirstMeeting::setRoom)) ); add(new InfoPanel(ROOM_HELP, new ResourceModel("roomInfo"))); add( @@ -187,10 +171,7 @@ public class FirstMeetingPanel extends GenericPanel<Idea> { private void saveAndNotify() { firstMeetingRepository.save(getModelObject()); NotificationSource source = new NotificationSource(); - String date = dateService.format( - getModelObject().getFirstMeetingDate(), - DateStyle.DATETIME - ); + String date = dateService.format(getModelObject().getFirstMeetingDate(), DateStyle.DATETIME); String room = getModelObject().getRoom(); source.setMessage(date + "\n" + getString("room") + ": " + room); source.setAdditionalMessage(getModelObject().getDescription()); @@ -203,11 +184,7 @@ public class FirstMeetingPanel extends GenericPanel<Idea> { } private boolean isSupervisor(FirstMeeting firstMeeting) { - return firstMeeting - .getIdea() - .getMatch() - .getSupervisor() - .equals(SciProSession.get().getUser()); + return firstMeeting.getIdea().getMatch().getSupervisor().equals(SciProSession.get().getUser()); } private class FirstMeetingModel extends LoadableDetachableModel<FirstMeeting> { diff --git a/view/src/main/java/se/su/dsv/scipro/forum/ProjectForum.java b/view/src/main/java/se/su/dsv/scipro/forum/ProjectForum.java index e301e08c5e..78b4401a5f 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/ProjectForum.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/ProjectForum.java @@ -11,10 +11,7 @@ public class ProjectForum implements Forum<ProjectThread> { private final ProjectForumService projectForumService; private final IModel<Project> projectModel; - public ProjectForum( - final ProjectForumService projectForumService, - final IModel<Project> projectModel - ) { + public ProjectForum(final ProjectForumService projectForumService, final IModel<Project> projectModel) { this.projectForumService = projectForumService; this.projectModel = projectModel; } diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java index 18d8182312..26d4d02170 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java @@ -37,17 +37,11 @@ public class ProjectCreateForumThreadPage ) ); add( - new SubmitForumThreadPanel<>( - CREATE_THREAD, - new ProjectForum(projectForumService, projectModel) - ) { + new SubmitForumThreadPanel<>(CREATE_THREAD, new ProjectForum(projectForumService, projectModel)) { @Override public void onThreadCreated(final ProjectThread thread) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Project.class), - projectModel.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(Project.class), projectModel.getObject().getId()); setResponsePage(ProjectThreadedForumPage.class, pp); } } diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java index 083a48c294..e42a52aaed 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java @@ -33,31 +33,16 @@ public class ProjectThreadedForumPage public ProjectThreadedForumPage(final PageParameters pp) { super(pp); - add( - new BookmarkablePageLink<Void>( - CREATE_THREAD_LINK, - ProjectCreateForumThreadPage.class, - pp - ) - ); + add(new BookmarkablePageLink<Void>(CREATE_THREAD_LINK, ProjectCreateForumThreadPage.class, pp)); add(new FeedbackPanel(FEEDBACK)); add( - new ThreadsOverviewPanel<>( - FORUM, - getThreads(), - new ForumThreadDiscussable(), - (id, thread) -> { - PageParameters parameters = new PageParameters(pp).set( - PageParameterKeys.MAP.get(ForumThread.class), - thread.getObject().getId() - ); - return new BookmarkablePageLink<>( - id, - ProjectViewForumThreadPage.class, - parameters - ); - } - ) + new ThreadsOverviewPanel<>(FORUM, getThreads(), new ForumThreadDiscussable(), (id, thread) -> { + PageParameters parameters = new PageParameters(pp).set( + PageParameterKeys.MAP.get(ForumThread.class), + thread.getObject().getId() + ); + return new BookmarkablePageLink<>(id, ProjectViewForumThreadPage.class, parameters); + }) ); } @@ -65,14 +50,8 @@ public class ProjectThreadedForumPage return new LoadableDetachableModel<>() { @Override protected List<ProjectThread> load() { - List<ProjectThread> threads = projectForumService.getThreads( - projectModel.getObject() - ); - threads.sort( - Collections.reverseOrder( - Comparator.comparing(o -> o.getForumThread().getLastModified()) - ) - ); + List<ProjectThread> threads = projectForumService.getThreads(projectModel.getObject()); + threads.sort(Collections.reverseOrder(Comparator.comparing(o -> o.getForumThread().getLastModified()))); return threads; } }; diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java index 117ba29b58..2c9f6567a5 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java @@ -60,11 +60,7 @@ public class ProjectViewForumThreadPage throw new RestartResponseException(AccessDeniedPage.class); } - basicForumService.setThreadRead( - SciProSession.get().getUser(), - thread.getForumThread(), - true - ); + basicForumService.setThreadRead(SciProSession.get().getUser(), thread.getForumThread(), true); final Long finalThreadId = threadId; IModel<ProjectThread> threadModel = new LoadableDetachableModel<>() { diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java index ff44cf104b..39b4a8634c 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java @@ -37,17 +37,11 @@ public class SupervisorCreateForumThreadPage ) ); add( - new SubmitForumThreadPanel<>( - CREATE_THREAD, - new ProjectForum(projectForumService, projectModel) - ) { + new SubmitForumThreadPanel<>(CREATE_THREAD, new ProjectForum(projectForumService, projectModel)) { @Override public void onThreadCreated(final ProjectThread thread) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Project.class), - projectModel.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(Project.class), projectModel.getObject().getId()); setResponsePage(SupervisorThreadedForumPage.class, pp); } } diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java index 0579e538b6..ffbf9664d9 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java @@ -34,31 +34,16 @@ public class SupervisorThreadedForumPage public SupervisorThreadedForumPage(final PageParameters pp) { super(pp); - add( - new BookmarkablePageLink<Void>( - CREATE_THREAD_LINK, - SupervisorCreateForumThreadPage.class, - pp - ) - ); + add(new BookmarkablePageLink<Void>(CREATE_THREAD_LINK, SupervisorCreateForumThreadPage.class, pp)); add(new FeedbackPanel(FEEDBACK)); add( - new ThreadsOverviewPanel<>( - FORUM, - getThreads(), - new ForumThreadDiscussable(), - (id, thread) -> { - PageParameters parameters = new PageParameters(pp).set( - PageParameterKeys.MAP.get(ForumThread.class), - thread.getObject().getId() - ); - return new BookmarkablePageLink<>( - id, - SupervisorViewForumThreadPage.class, - parameters - ); - } - ) + new ThreadsOverviewPanel<>(FORUM, getThreads(), new ForumThreadDiscussable(), (id, thread) -> { + PageParameters parameters = new PageParameters(pp).set( + PageParameterKeys.MAP.get(ForumThread.class), + thread.getObject().getId() + ); + return new BookmarkablePageLink<>(id, SupervisorViewForumThreadPage.class, parameters); + }) ); } @@ -66,14 +51,8 @@ public class SupervisorThreadedForumPage return new LoadableDetachableModel<>() { @Override protected List<ProjectThread> load() { - List<ProjectThread> threads = projectForumService.getThreads( - projectModel.getObject() - ); - threads.sort( - Collections.reverseOrder( - Comparator.comparing(o -> o.getForumThread().getLastModified()) - ) - ); + List<ProjectThread> threads = projectForumService.getThreads(projectModel.getObject()); + threads.sort(Collections.reverseOrder(Comparator.comparing(o -> o.getForumThread().getLastModified()))); return threads; } }; diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java index 31e625835e..4d31c6d428 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java @@ -56,11 +56,7 @@ public class SupervisorViewForumThreadPage throw new PageNotFoundException(); } - basicForumService.setThreadRead( - SciProSession.get().getUser(), - thread.getForumThread(), - true - ); + basicForumService.setThreadRead(SciProSession.get().getUser(), thread.getForumThread(), true); final Long finalThreadId = threadId; final IModel<ProjectThread> threadModel = new LoadableDetachableModel<>() { diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java index 11b9db6b22..004d99561a 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java @@ -24,12 +24,7 @@ public class ForumPostPanel extends Panel { public ForumPostPanel(String id, final IModel<ForumPost> model) { super(id); - add( - new UserLinkPanel( - POSTED_BY, - LambdaModel.of(model, ForumPost::getPostedBy, ForumPost::setPostedBy) - ) - ); + add(new UserLinkPanel(POSTED_BY, LambdaModel.of(model, ForumPost::getPostedBy, ForumPost::setPostedBy))); add( new WebMarkupContainer("postedBySystem") { @Override @@ -47,25 +42,17 @@ public class ForumPostPanel extends Panel { ) ); add( - new SmarterLinkMultiLineLabel( - CONTENT, - LambdaModel.of(model, ForumPost::getContent, ForumPost::setContent) - ) + new SmarterLinkMultiLineLabel(CONTENT, LambdaModel.of(model, ForumPost::getContent, ForumPost::setContent)) ); add( new DisplayMultiplesPanel<>( ATTACHMENT, - new ListAdapterModel<>( - LambdaModel.of(model, ForumPost::getAttachments, ForumPost::setAttachments) - ) + new ListAdapterModel<>(LambdaModel.of(model, ForumPost::getAttachments, ForumPost::setAttachments)) ) { @Override public Component getComponent(String componentId, IModel<FileReference> t) { - return new ViewAttachmentPanel( - componentId, - t.map(FileReference::getFileDescription) - ); + return new ViewAttachmentPanel(componentId, t.map(FileReference::getFileDescription)); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanel.java index 9bde53f172..9e9faf3b96 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanel.java @@ -21,11 +21,7 @@ public class SubmitForumReplyPanel<A> extends GenericPanel<A> { protected void updateOnSubmit() {} - public SubmitForumReplyPanel( - String id, - IModel<A> threadModel, - final ForumThread<A> wicketForumService - ) { + public SubmitForumReplyPanel(String id, IModel<A> threadModel, final ForumThread<A> wicketForumService) { super(id, threadModel); this.wicketForumService = wicketForumService; add(new ForumForm("form")); diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanel.java index 6be377918e..4e2a5b8171 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanel.java @@ -41,10 +41,7 @@ public class SubmitForumThreadPanel<A> extends Panel { final IModel<String> subject = new Model<>(); - final FormComponent<String> contentArea = new TextArea<>( - "content", - new Model<String>() - ).setRequired(true); + final FormComponent<String> contentArea = new TextArea<>("content", new Model<String>()).setRequired(true); add(contentArea); final FileUploadField upload = new FileUploadField("attachment"); diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanel.java index e29e889a96..02a9d00bd5 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanel.java @@ -45,14 +45,7 @@ public class ThreadsOverviewPanel<A> extends Panel { } } ); - item.add( - new ThreadTitleColumn<>( - "threadTitle", - discussion, - item.getModel(), - threadLinkSupplier - ) - ); + item.add(new ThreadTitleColumn<>("threadTitle", discussion, item.getModel(), threadLinkSupplier)); item.add(new Label("replies", discussion.map(ForumThread::getPostCount))); item.add(new LastPostColumn("lastPost", discussion)); } @@ -69,28 +62,14 @@ public class ThreadsOverviewPanel<A> extends Panel { final ThreadLinkSupplier<A> threadLinkSupplier ) { super(id); - final BookmarkablePageLink<Void> threadLink = threadLinkSupplier.newThreadLink( - "threadLink", - model - ); - threadLink.setBody( - LambdaModel.of(thread, ForumThread::getSubject, ForumThread::setSubject) - ); + final BookmarkablePageLink<Void> threadLink = threadLinkSupplier.newThreadLink("threadLink", model); + threadLink.setBody(LambdaModel.of(thread, ForumThread::getSubject, ForumThread::setSubject)); add(threadLink); - add( - new Label( - "createdBy", - thread.map(ForumThread::getCreatedBy).map(User::getFullName).orElse("SciPro") - ) - ); + add(new Label("createdBy", thread.map(ForumThread::getCreatedBy).map(User::getFullName).orElse("SciPro"))); add( new DateLabel( "dateCreated", - LambdaModel.of( - thread, - ForumThread::getDateCreated, - ForumThread::setDateCreated - ), + LambdaModel.of(thread, ForumThread::getDateCreated, ForumThread::setDateCreated), DateStyle.DATETIME ) ); @@ -107,10 +86,7 @@ public class ThreadsOverviewPanel<A> extends Panel { super(id); IModel<ForumPost> postModel = getLastPost(model); add( - new UserLinkPanel( - "postedBy", - LambdaModel.of(postModel, ForumPost::getPostedBy, ForumPost::setPostedBy) - ) + new UserLinkPanel("postedBy", LambdaModel.of(postModel, ForumPost::getPostedBy, ForumPost::setPostedBy)) ); add( new WebMarkupContainer("postedBySystem") { @@ -136,9 +112,7 @@ public class ThreadsOverviewPanel<A> extends Panel { protected ForumPost load() { return Collections.max( model.getObject().getPosts(), - Comparator.comparing(ForumPost::getDateCreated).thenComparing( - ForumPost::getId - ) + Comparator.comparing(ForumPost::getDateCreated).thenComparing(ForumPost::getId) ); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java index dfb8425ed2..9c62f77122 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java @@ -24,11 +24,7 @@ public class ViewForumThreadPanel<A> extends GenericPanel<A> { private AjaxLink<Void> topReplyLink; @SuppressWarnings("unchecked") - public ViewForumThreadPanel( - String id, - final IModel<A> model, - final ForumThread<A> forumThread - ) { + public ViewForumThreadPanel(String id, final IModel<A> model, final ForumThread<A> forumThread) { super(id, model); this.forumThread = forumThread; diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanel.java index e571976c02..6613c3a397 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanel.java @@ -26,11 +26,7 @@ public class ViewProjectForumThreadPanel extends ViewForumThreadPanel<ProjectThr @Override protected Component newBackLink(final String id) { - return new BookmarkablePageLink<Void>( - id, - getForumPage(), - getProjectParameters(projectModel.getObject()) - ); + return new BookmarkablePageLink<Void>(id, getForumPage(), getProjectParameters(projectModel.getObject())); } protected Class<? extends Page> getForumPage() { diff --git a/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java b/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java index 6f3c380665..80b08026ab 100644 --- a/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java +++ b/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java @@ -33,17 +33,12 @@ public class AdminGDPRPage extends AbstractAdminSystemPage { return respondWithUser(userModel.getObject()); } }; - final ResourceLink<Object> downloadReport = new ResourceLink<>( - "downloadReport", - gdprResource - ) { + final ResourceLink<Object> downloadReport = new ResourceLink<>("downloadReport", gdprResource) { @Override protected void onConfigure() { super.onConfigure(); setVisibilityAllowed(userModel.getObject() != null); - setBody( - Model.of(AdminGDPRPage.this.getString("download.report.for.user", userModel)) - ); + setBody(Model.of(AdminGDPRPage.this.getString("download.report.for.user", userModel))); } }; downloadReport.setOutputMarkupPlaceholderTag(true); diff --git a/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java b/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java index 7c8ad24177..bdc1e9f924 100644 --- a/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java +++ b/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java @@ -91,11 +91,7 @@ public class GDPRReportResourceReference extends ResourceReference { return BAD_REQUEST; } - final Collection<User> users = userSearchService.search( - identity, - EnumSet.allOf(Roles.class), - 2 - ); + final Collection<User> users = userSearchService.search(identity, EnumSet.allOf(Roles.class), 2); if (users.isEmpty()) { return NO_CONTENT; } else if (users.size() > 1) { diff --git a/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java index 72d630cfb9..0e0aa081f6 100755 --- a/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java @@ -66,22 +66,14 @@ public class AdminGeneralSettingsPage extends AbstractAdminSystemPage { add( new RequiredTextField<>( "smtpServer", - LambdaModel.of( - model, - GeneralSystemSettings::getSmtpServer, - GeneralSystemSettings::setSmtpServer - ), + LambdaModel.of(model, GeneralSystemSettings::getSmtpServer, GeneralSystemSettings::setSmtpServer), String.class ) ); add( new RequiredTextField<>( "sciproURL", - LambdaModel.of( - model, - GeneralSystemSettings::getSciproURL, - GeneralSystemSettings::setSciproURL - ), + LambdaModel.of(model, GeneralSystemSettings::getSciproURL, GeneralSystemSettings::setSciproURL), String.class ) ); @@ -138,11 +130,7 @@ public class AdminGeneralSettingsPage extends AbstractAdminSystemPage { add( new ListField<>( ALARM_MAILS, - LambdaModel.of( - model, - GeneralSystemSettings::getAlarmMails, - GeneralSystemSettings::setAlarmMails - ), + LambdaModel.of(model, GeneralSystemSettings::getAlarmMails, GeneralSystemSettings::setAlarmMails), null ) ); diff --git a/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java index fa39835148..df49723836 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java @@ -64,14 +64,7 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { @Override protected void populateItem(final ListItem<Examination> item) { - item.add( - new ReportingForm( - "examination", - item.getModel(), - userModel, - suggestedReportDate - ) - ); + item.add(new ReportingForm("examination", item.getModel(), userModel, suggestedReportDate)); } } ); @@ -96,21 +89,19 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { setOutputMarkupId(true); - final IModel<Either<GetGradeError, Optional<Result>>> getResultModel = - new LoadableDetachableModel<>() { - @Override - protected Either<GetGradeError, Optional<Result>> load() { - return gradingService.getResult( - getSession().getMetaData(OAuth.TOKEN), - projectModel.getObject().getIdentifier(), - userModel.getObject().getIdentifier(), - examinationModel.getObject().id() - ); - } - }; + final IModel<Either<GetGradeError, Optional<Result>>> getResultModel = new LoadableDetachableModel<>() { + @Override + protected Either<GetGradeError, Optional<Result>> load() { + return gradingService.getResult( + getSession().getMetaData(OAuth.TOKEN), + projectModel.getObject().getIdentifier(), + userModel.getObject().getIdentifier(), + examinationModel.getObject().id() + ); + } + }; - final IModel<GetGradeError> getGradeErrorModel = getResultModel.map(either -> - either.fold(x -> x, r -> null) + final IModel<GetGradeError> getGradeErrorModel = getResultModel.map(either -> either.fold(x -> x, r -> null) ); queue( new EnumLabel<>("getGradeError", getGradeErrorModel) { @@ -132,9 +123,7 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { } ); - final IModel<Result> resultModel = getResultModel.map(e -> - e.fold(error -> null, x -> x.orElse(null)) - ); + final IModel<Result> resultModel = getResultModel.map(e -> e.fold(error -> null, x -> x.orElse(null))); queue( new WebMarkupContainer("resultContainer") { @@ -145,12 +134,7 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { } } ); - queue( - new Label( - "examinationName1", - examinationModel.map(Examination::name).map(Name::english) - ) - ); + queue(new Label("examinationName1", examinationModel.map(Examination::name).map(Name::english))); queue(new Label("points", examinationModel.map(Examination::points))); queue(new Label("letter", resultModel.map(Result::letter))); queue(new Label("reported", resultModel.map(Result::reported))); @@ -164,12 +148,7 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { } } ); - queue( - new Label( - "examinationName2", - examinationModel.map(Examination::name).map(Name::english) - ) - ); + queue(new Label("examinationName2", examinationModel.map(Examination::name).map(Name::english))); queue(new Label("points2", examinationModel.map(Examination::points))); final IModel<List<Grade>> grades = examinationModel.map(Examination::grades); final IModel<List<Grade>> passing = new FilteredListModel<>(grades) { @@ -186,11 +165,7 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { ); gradeField.setRequired(true); queue(gradeField); - final TextField<LocalDate> reportedField = new TextField<>( - "reportedField", - reportedModel, - LocalDate.class - ); + final TextField<LocalDate> reportedField = new TextField<>("reportedField", reportedModel, LocalDate.class); reportedField.setRequired(true); final LocalDate projectStarted = projectModel.getObject().getStartDate(); reportedField.add(new BootstrapDatePicker(projectStarted, LocalDate.now())); @@ -199,11 +174,8 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { final Button submit = new Button("submit"); queue(submit); - IModel< - SeminarParticipationGradingRequirements - > seminarParticipationGradingRequirements = LoadableDetachableModel.of( - this::getSeminarParticipationGradingRequirements - ); + IModel<SeminarParticipationGradingRequirements> seminarParticipationGradingRequirements = + LoadableDetachableModel.of(this::getSeminarParticipationGradingRequirements); final Label missingSeminarRequirements = new Label( "missing_seminar_participation", @@ -212,9 +184,7 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { seminarParticipationGradingRequirements ) ); - missingSeminarRequirements.setVisible( - !seminarParticipationGradingRequirements.getObject().isFulfilled() - ); + missingSeminarRequirements.setVisible(!seminarParticipationGradingRequirements.getObject().isFulfilled()); missingSeminarRequirements.setEscapeModelStrings(false); queue(missingSeminarRequirements); queue( @@ -261,12 +231,9 @@ abstract class AbstractExaminationsPanel extends GenericPanel<User> { .stream() .filter(FinalSeminarActiveParticipation::isApproved) .count(); - final ProjectTypeSettings projectTypeSettings = project - .getProjectType() - .getProjectTypeSettings(); + final ProjectTypeSettings projectTypeSettings = project.getProjectType().getProjectTypeSettings(); final int requiredOppositions = projectTypeSettings.getMinOppositionsToBeGraded(); - final int requiredActiveParticipations = - projectTypeSettings.getMinActiveParticipationsToBeGraded(); + final int requiredActiveParticipations = projectTypeSettings.getMinActiveParticipationsToBeGraded(); return new SeminarParticipationGradingRequirements( new Requirement(requiredOppositions, completedOppositions), new Requirement(requiredActiveParticipations, completedParticipations) diff --git a/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java index 79f496424a..a3fddc9517 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java @@ -54,9 +54,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { public CriteriaPanel(String id, IModel<SupervisorGradingReport> model) { super(id, model); - IModel<Language> language = model - .map(SupervisorGradingReport::getProject) - .map(Project::getReportLanguage); + IModel<Language> language = model.map(SupervisorGradingReport::getProject).map(Project::getReportLanguage); IModel<User> author = model.map(SupervisorGradingReport::getUser); add( new ListView<>(CRITERIA, model.map(SupervisorGradingReport::getIndividualCriteria)) { @@ -69,20 +67,13 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { final WebMarkupContainer grading = new WebMarkupContainer("grading"); grading.setOutputMarkupId(true); item.add(grading); - item.add( - new Label( - TITLE, - item.getModel().combineWith(language, GradingCriterion::getTitle) - ) - ); + item.add(new Label(TITLE, item.getModel().combineWith(language, GradingCriterion::getTitle))); grading.add( new Label( MAX_POINTS, new StringResourceModel( "point_requirement", - item - .getModel() - .map(AbstractGradingCriterion::getPointsRequiredToPass) + item.getModel().map(AbstractGradingCriterion::getPointsRequiredToPass) ) ) ); @@ -90,19 +81,18 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { IModel<List<GradingCriterionPoint>> gradingCriterionPoints = item .getModel() .map(GradingCriterion::getGradingCriterionPoints); - RadioChoice<GradingCriterionPoint> pointsRadioChoice = - new BootstrapRadioChoice<>( - POINTS, - new GradingCriterionPointsModelConverter(item.getModel()), - gradingCriterionPoints, - getPointsRenderer() - ) { - @Override - protected void onConfigure() { - super.onConfigure(); - setVisible(!item.getModelObject().isPassFail()); - } - }; + RadioChoice<GradingCriterionPoint> pointsRadioChoice = new BootstrapRadioChoice<>( + POINTS, + new GradingCriterionPointsModelConverter(item.getModel()), + gradingCriterionPoints, + getPointsRenderer() + ) { + @Override + protected void onConfigure() { + super.onConfigure(); + setVisible(!item.getModelObject().isPassFail()); + } + }; pointsRadioChoice.add( new AjaxFormChoiceComponentUpdatingBehavior() { @Override @@ -149,9 +139,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { ) ); - if ( - item.getModelObject().getFlag() == AbstractGradingCriterion.Flag.OPPOSITION - ) { + if (item.getModelObject().getFlag() == AbstractGradingCriterion.Flag.OPPOSITION) { grading.setEnabled(false); } item.add( @@ -168,9 +156,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - !grading.isEnabled() && isEnabledInHierarchy() - ); + setVisibilityAllowed(!grading.isEnabled() && isEnabledInHierarchy()); } } ); @@ -186,9 +172,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { return ( object.getPoint().toString() + " p" + - (description != null && !description.isBlank() - ? " - " + description - : "") + (description != null && !description.isBlank() ? " - " + description : "") ); } @@ -217,13 +201,12 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { ) { super(id, author); this.gradingCriterion = gradingCriterion; - final IModel<List<FinalSeminarOpposition>> authorOppositions = - LoadableDetachableModel.of(() -> - finalSeminarService.findFinalSeminarOppositionsByOpponentAndProjectType( - CriteriaPanel.this.getModelObject().getProject().getProjectType(), - author.getObject() - ) - ); + final IModel<List<FinalSeminarOpposition>> authorOppositions = LoadableDetachableModel.of(() -> + finalSeminarService.findFinalSeminarOppositionsByOpponentAndProjectType( + CriteriaPanel.this.getModelObject().getProject().getProjectType(), + author.getObject() + ) + ); modal = new ModalWindowPlus("modal"); modal.setTitle("Opposition feedback"); @@ -293,18 +276,8 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { .map(FinalSeminar::getStartDate) ) ); - item.add( - new Label( - "points", - item.getModel().map(FinalSeminarOpposition::getPoints) - ) - ); - item.add( - new Label( - "feedback", - item.getModel().map(FinalSeminarOpposition::getFeedback) - ) - ); + item.add(new Label("points", item.getModel().map(FinalSeminarOpposition::getPoints))); + item.add(new Label("feedback", item.getModel().map(FinalSeminarOpposition::getFeedback))); } } ); @@ -312,8 +285,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { } } - private static final class GradingCriterionPointsModelConverter - implements IModel<GradingCriterionPoint> { + private static final class GradingCriterionPointsModelConverter implements IModel<GradingCriterionPoint> { private final IModel<GradingCriterion> criterionIModel; @@ -355,11 +327,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { private final IModel<GradingCriterion> gradingCriterion; private final ModalWindowPlus modal; - public ReflectionFeedbackPanel( - String id, - IModel<User> author, - IModel<GradingCriterion> gradingCriterion - ) { + public ReflectionFeedbackPanel(String id, IModel<User> author, IModel<GradingCriterion> gradingCriterion) { super(id, author); this.gradingCriterion = gradingCriterion; @@ -384,8 +352,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { modal = new LargeModalWindow("modal"); modal.setTitle("Reflection"); modal.setContent(modalBodyId -> { - IModel<Project> projectModel = - CriteriaPanel.this.getModel().map(GradingReport::getProject); + IModel<Project> projectModel = CriteriaPanel.this.getModel().map(GradingReport::getProject); return new ReflectionModalBodyPanel(modalBodyId, projectModel, author); }); this.setOutputMarkupId(true); @@ -403,11 +370,7 @@ public class CriteriaPanel extends GenericPanel<SupervisorGradingReport> { // the form containing this component gets disabled which // prevents a regular AjaxLink from continuing to work. response.render( - OnEventHeaderItem.forComponent( - this, - "click", - modal.getShowJavascript() + "; return false;" - ) + OnEventHeaderItem.forComponent(this, "click", modal.getShowJavascript() + "; return false;") ); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/grading/DataExposedGradingReportPdf.java b/view/src/main/java/se/su/dsv/scipro/grading/DataExposedGradingReportPdf.java index b564e46aca..85b90d63fc 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/DataExposedGradingReportPdf.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/DataExposedGradingReportPdf.java @@ -14,14 +14,7 @@ class DataExposedGradingReportPdf extends GradingReportPdfResource { IModel<RoughDraftApproval> roughDraftApproval, IModel<FinalThesis> finalThesis ) { - super( - new SupervisorGradingReportPdf( - supervisorGradingReport, - reflection, - roughDraftApproval, - finalThesis - ) - ); + super(new SupervisorGradingReportPdf(supervisorGradingReport, reflection, roughDraftApproval, finalThesis)); } public byte[] getData() { diff --git a/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java b/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java index 517c2f81ad..20f2e14149 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java @@ -33,24 +33,15 @@ public class ExaminerTimelinePanel extends GenericPanel<Project> { ); listItem.add( - new EventPanel.RejectedPanel( - "rejected", - listItem.getModel().as(Event.Rejected.class) - ) + new EventPanel.RejectedPanel("rejected", listItem.getModel().as(Event.Rejected.class)) ); listItem.add( - new EventPanel.ResubmissionPanel( - "resubmitted", - listItem.getModel().as(Event.Resubmitted.class) - ) + new EventPanel.ResubmissionPanel("resubmitted", listItem.getModel().as(Event.Resubmitted.class)) ); listItem.add( - new EventPanel.ApprovedPanel( - "approved", - listItem.getModel().as(Event.Approved.class) - ) + new EventPanel.ApprovedPanel("approved", listItem.getModel().as(Event.Approved.class)) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java index 84bc1b2ab8..95bfd72a34 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java @@ -63,25 +63,13 @@ public class FillOutReportPanel<T extends OppositionReport> extends Border { new ListView<>(GRADING_CRITERIA, model.map(OppositionReport::getCriteria)) { @Override protected void populateItem(ListItem<Criterion> item) { + item.add(new Label(TITLE, item.getModel().combineWith(language, Criterion::getTitle))); item.add( - new Label( - TITLE, - item.getModel().combineWith(language, Criterion::getTitle) - ) - ); - item.add( - new Label( - DESCRIPTION, - item.getModel().combineWith(language, Criterion::getDescription) - ) + new Label(DESCRIPTION, item.getModel().combineWith(language, Criterion::getDescription)) ); TextArea<String> textArea = new TextArea<>( FEEDBACK, - LambdaModel.of( - item.getModel(), - Criterion::getFeedback, - Criterion::setFeedback - ) + LambdaModel.of(item.getModel(), Criterion::getFeedback, Criterion::setFeedback) ); textArea.add( new AutoSavingBehaviour() { @@ -107,9 +95,7 @@ public class FillOutReportPanel<T extends OppositionReport> extends Border { add( new ViewAttachmentPanel( "viewAttachment", - getModel() - .map(AttachmentReport::getAttachment) - .map(FileReference::getFileDescription) + getModel().map(AttachmentReport::getAttachment).map(FileReference::getFileDescription) ) ); add(new DeleteAttachmentLink("deleteAttachment", getModel())); @@ -140,9 +126,7 @@ public class FillOutReportPanel<T extends OppositionReport> extends Border { @Override protected void onSubmit() { - Optional<FileUpload> fileUploadOptional = WicketFileUpload.ofOptional( - attachment.getFileUpload() - ); + Optional<FileUpload> fileUploadOptional = WicketFileUpload.ofOptional(attachment.getFileUpload()); reportService.save(getModelObject(), fileUploadOptional); String dateString = new SimpleDateFormat("HH:mm:ss").format(new Date()); getSession().success(getString("saved") + " " + dateString); diff --git a/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java index 10672d1969..154c008d27 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java @@ -52,10 +52,7 @@ public class GradingBasisPanel extends GenericPanel<Project> { super(id, gradingBasis); add(new FencedFeedbackPanel("feedback", this)); - ListView<Assessment> criterion = new ListView<>( - "criterion", - gradingBasis.map(GradingBasis::criteria) - ) { + ListView<Assessment> criterion = new ListView<>("criterion", gradingBasis.map(GradingBasis::criteria)) { @Override protected void populateItem(ListItem<Assessment> item) { IModel<Criterion> criteriaModel = item.getModel().map(Assessment::criterion); @@ -63,24 +60,16 @@ public class GradingBasisPanel extends GenericPanel<Project> { item.add( new Label( "point_requirement", - new StringResourceModel( - "point_requirement", - criteriaModel.map(Criterion::minimumPoints) - ) + new StringResourceModel("point_requirement", criteriaModel.map(Criterion::minimumPoints)) ) ); - IModel<List<Requirement>> requirements = criteriaModel.map( - Criterion::requirements - ); + IModel<List<Requirement>> requirements = criteriaModel.map(Criterion::requirements); RadioChoice<Requirement> pointsRadioChoice = new BootstrapRadioChoice<>( "points", new GradedCriterionModel(item.getModel(), requirements), requirements, - new LambdaChoiceRenderer<>( - GradingBasisForm::fullDescriptionWithPoints, - Requirement::points - ) + new LambdaChoiceRenderer<>(GradingBasisForm::fullDescriptionWithPoints, Requirement::points) ) { @Override protected void onConfigure() { @@ -90,10 +79,7 @@ public class GradingBasisPanel extends GenericPanel<Project> { }; item.add(pointsRadioChoice); - final CheckBox pf = new CheckBox( - "pf", - new PassFailCriterionModel(item.getModel()) - ) { + final CheckBox pf = new CheckBox("pf", new PassFailCriterionModel(item.getModel())) { @Override protected void onConfigure() { super.onConfigure(); @@ -102,12 +88,7 @@ public class GradingBasisPanel extends GenericPanel<Project> { }; pf.setOutputMarkupId(true); // required for wicket:for item.add(pf); - item.add( - new Label( - "pfCriteria", - criteriaModel.map(GradingBasisForm::getDescriptionForOnePoint) - ) - ); + item.add(new Label("pfCriteria", criteriaModel.map(GradingBasisForm::getDescriptionForOnePoint))); } }; criterion.setReuseItems(true); @@ -125,9 +106,7 @@ public class GradingBasisPanel extends GenericPanel<Project> { ) .toList() ); - WebMarkupContainer gradingBasisMissing = new WebMarkupContainer( - "grading_basis_missing" - ) { + WebMarkupContainer gradingBasisMissing = new WebMarkupContainer("grading_basis_missing") { @Override protected void onConfigure() { super.onConfigure(); @@ -146,16 +125,9 @@ public class GradingBasisPanel extends GenericPanel<Project> { protected void populateItem(ListItem<Assessment> item) { IModel<Criterion> criterion = item.getModel().map(Assessment::criterion); item.add(new Label("title", criterion.map(Criterion::title))); - item.add( - new Label( - "given_points", - item.getModel().map(Assessment::getPoints).orElse(0) - ) - ); + item.add(new Label("given_points", item.getModel().map(Assessment::getPoints).orElse(0))); item.add(new Label("maximum_points", criterion.map(Criterion::maxPoints))); - item.add( - new Label("required_points", criterion.map(Criterion::minimumPoints)) - ); + item.add(new Label("required_points", criterion.map(Criterion::minimumPoints))); } } ); @@ -175,10 +147,7 @@ public class GradingBasisPanel extends GenericPanel<Project> { GradingBasis::getOverallMotivation, GradingBasis::setOverallMotivation ); - TextArea<String> overallMotivationField = new TextArea<>( - "overall_motivation", - overallMotivation - ); + TextArea<String> overallMotivationField = new TextArea<>("overall_motivation", overallMotivation); add(overallMotivationField); add( @@ -277,10 +246,7 @@ public class GradingBasisPanel extends GenericPanel<Project> { private final IModel<Assessment> assessment; private final IModel<List<Requirement>> requirements; - public GradedCriterionModel( - IModel<Assessment> assessment, - IModel<List<Requirement>> requirements - ) { + public GradedCriterionModel(IModel<Assessment> assessment, IModel<List<Requirement>> requirements) { this.assessment = assessment; this.requirements = requirements; } diff --git a/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java index 02e9d0b11a..6d4ba8e0d6 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java @@ -54,19 +54,12 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { private final IModel<Project> projectModel; - public IndividualAuthorAssessmentPanel( - String id, - IModel<Project> projectModel, - IModel<User> authorModel - ) { + public IndividualAuthorAssessmentPanel(String id, IModel<Project> projectModel, IModel<User> authorModel) { super(id, authorModel); this.projectModel = projectModel; IModel<SupervisorGradingReport> gradingReport = LoadableDetachableModel.of(() -> - gradingReportService.getSupervisorGradingReport( - projectModel.getObject(), - authorModel.getObject() - ) + gradingReportService.getSupervisorGradingReport(projectModel.getObject(), authorModel.getObject()) ); add(new AssessmentForm("form", gradingReport)); @@ -86,15 +79,8 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { ); IModel<Boolean> hasApprovedFinalThesis = hasApprovedFinalThesis(projectModel); - redGreen( - "status_final_thesis", - hasApprovedFinalThesis, - "must_approve_final_thesis", - "final_thesis_approved" - ); - IModel<Boolean> hasSubmittedPlagiarismAnalysis = hasSubmittedPlagiarismAnalysis( - projectModel - ); + redGreen("status_final_thesis", hasApprovedFinalThesis, "must_approve_final_thesis", "final_thesis_approved"); + IModel<Boolean> hasSubmittedPlagiarismAnalysis = hasSubmittedPlagiarismAnalysis(projectModel); redGreen( "status_plagiarism", hasSubmittedPlagiarismAnalysis, @@ -120,9 +106,7 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { "grading_basis_must_meet_minimum_requirements", "grading_basis_minimum_requirements_met" ); - IModel<Boolean> hasFilledInIndividualAssessment = individualCriterionNotMet.map( - List::isEmpty - ); + IModel<Boolean> hasFilledInIndividualAssessment = individualCriterionNotMet.map(List::isEmpty); redGreen( "status_individual_assessment", hasFilledInIndividualAssessment, @@ -141,30 +125,14 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { }; add(gradingBasisMissing); gradingBasisMissing.add( - new AutoHidingListView<>( - "grading_basis_requirements_not_met", - gradingBasisCriterionNotMet - ) { + new AutoHidingListView<>("grading_basis_requirements_not_met", gradingBasisCriterionNotMet) { @Override protected void populateItem(ListItem<GradingCriterion> item) { item.add(new Label("title", item.getModel().map(GradingCriterion::getTitle))); + item.add(new Label("given_points", item.getModel().map(GradingCriterion::getPoints).orElse(0))); + item.add(new Label("maximum_points", item.getModel().map(GradingCriterion::getMaxPoints))); item.add( - new Label( - "given_points", - item.getModel().map(GradingCriterion::getPoints).orElse(0) - ) - ); - item.add( - new Label( - "maximum_points", - item.getModel().map(GradingCriterion::getMaxPoints) - ) - ); - item.add( - new Label( - "required_points", - item.getModel().map(GradingCriterion::getPointsRequiredToPass) - ) + new Label("required_points", item.getModel().map(GradingCriterion::getPointsRequiredToPass)) ); } } @@ -179,30 +147,14 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { } ); add( - new AutoHidingListView<>( - "individual_assessment_requirements_not_met", - individualCriterionNotMet - ) { + new AutoHidingListView<>("individual_assessment_requirements_not_met", individualCriterionNotMet) { @Override protected void populateItem(ListItem<GradingCriterion> item) { item.add(new Label("title", item.getModel().map(GradingCriterion::getTitle))); + item.add(new Label("given_points", item.getModel().map(GradingCriterion::getPoints).orElse(0))); + item.add(new Label("maximum_points", item.getModel().map(GradingCriterion::getMaxPoints))); item.add( - new Label( - "given_points", - item.getModel().map(GradingCriterion::getPoints).orElse(0) - ) - ); - item.add( - new Label( - "maximum_points", - item.getModel().map(GradingCriterion::getMaxPoints) - ) - ); - item.add( - new Label( - "required_points", - item.getModel().map(GradingCriterion::getPointsRequiredToPass) - ) + new Label("required_points", item.getModel().map(GradingCriterion::getPointsRequiredToPass)) ); } } @@ -210,15 +162,14 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { IModel<Integer> minimumActiveParticipationsToBeGraded = LoadableDetachableModel.of(() -> { Project project = projectModel.getObject(); - return project - .getProjectType() - .getProjectTypeSettings() - .getMinActiveParticipationsToBeGraded(); + return project.getProjectType().getProjectTypeSettings().getMinActiveParticipationsToBeGraded(); }); IModel<Integer> completedParticipations = LoadableDetachableModel.of(() -> { Project project = projectModel.getObject(); - List<FinalSeminarActiveParticipation> participations = - finalSeminarService.findUserParticipating(project, authorModel.getObject()); + List<FinalSeminarActiveParticipation> participations = finalSeminarService.findUserParticipating( + project, + authorModel.getObject() + ); return participations.size(); }); IModel<Integer> leftToDo = minimumActiveParticipationsToBeGraded.combineWith( @@ -226,14 +177,10 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { (required, completed) -> required - completed ); IModel<Boolean> completedActiveParticipationsRequirement = LoadableDetachableModel.of( - () -> - completedParticipations.getObject() >= - minimumActiveParticipationsToBeGraded.getObject() + () -> completedParticipations.getObject() >= minimumActiveParticipationsToBeGraded.getObject() ); - WebMarkupContainer activeParticipationsMissing = new WebMarkupContainer( - "active_participations_missing" - ) { + WebMarkupContainer activeParticipationsMissing = new WebMarkupContainer("active_participations_missing") { @Override protected void onConfigure() { super.onConfigure(); @@ -241,15 +188,11 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { } }; add(activeParticipationsMissing); - activeParticipationsMissing.add( - new Label("required", minimumActiveParticipationsToBeGraded) - ); + activeParticipationsMissing.add(new Label("required", minimumActiveParticipationsToBeGraded)); activeParticipationsMissing.add(new Label("completed", completedParticipations)); activeParticipationsMissing.add(new Label("left_to_do", leftToDo)); - WebMarkupContainer activeParticipationsCompleted = new WebMarkupContainer( - "active_participations_completed" - ) { + WebMarkupContainer activeParticipationsCompleted = new WebMarkupContainer("active_participations_completed") { @Override protected void onConfigure() { super.onConfigure(); @@ -258,17 +201,12 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { }; add(activeParticipationsCompleted); - IModel<String> confirmationMessage = completedActiveParticipationsRequirement.flatMap( - completed -> { - if (Objects.equals(Boolean.TRUE, completed)) { - return null; - } - return new StringResourceModel( - "active_participations_missing_confirmation_message", - this - ); + IModel<String> confirmationMessage = completedActiveParticipationsRequirement.flatMap(completed -> { + if (Objects.equals(Boolean.TRUE, completed)) { + return null; } - ); + return new StringResourceModel("active_participations_missing_confirmation_message", this); + }); add( new SendToExaminer("send_to_examiner", projectModel, authorModel, confirmationMessage) { @@ -299,34 +237,18 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { ); } - private void redGreen( - String id, - IModel<Boolean> finished, - String redTextKey, - String greenTextKey - ) { - add( - new RedGreenLabel( - id, - finished, - new ResourceModel(redTextKey), - new ResourceModel(greenTextKey) - ) - ); + private void redGreen(String id, IModel<Boolean> finished, String redTextKey, String greenTextKey) { + add(new RedGreenLabel(id, finished, new ResourceModel(redTextKey), new ResourceModel(greenTextKey))); } private IModel<Boolean> hasApprovedFinalThesis(IModel<Project> projectModel) { - return LoadableDetachableModel.of(() -> - finalThesisService.findByProject(projectModel.getObject()) - ) + return LoadableDetachableModel.of(() -> finalThesisService.findByProject(projectModel.getObject())) .filter(ft -> ft.getStatus() == FinalThesis.Status.APPROVED) .isPresent(); } private IModel<Boolean> hasSubmittedPlagiarismAnalysis(IModel<Project> projectModel) { - return LoadableDetachableModel.of(() -> - finalThesisService.findByProject(projectModel.getObject()) - ) + return LoadableDetachableModel.of(() -> finalThesisService.findByProject(projectModel.getObject())) .map(FinalThesis::getTextMatchingDocument) .isPresent(); } @@ -337,8 +259,7 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { projectModel.detach(); } - private class AssessmentForm - extends org.apache.wicket.markup.html.form.Form<SupervisorGradingReport> { + private class AssessmentForm extends org.apache.wicket.markup.html.form.Form<SupervisorGradingReport> { public AssessmentForm(String id, IModel<SupervisorGradingReport> gradingReport) { super(id, gradingReport); @@ -347,10 +268,7 @@ public class IndividualAuthorAssessmentPanel extends GenericPanel<User> { add(new CriteriaPanel("criteria", gradingReport)); add( - new TemplatePanel( - "points_to_grade_conversion", - gradingReport.map(SupervisorGradingReport::getProject) - ) + new TemplatePanel("points_to_grade_conversion", gradingReport.map(SupervisorGradingReport::getProject)) ); GradeCalculator supervisorCalculator = gradeCalculatorService.getSupervisorCalculator( diff --git a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java index 298a4f6f60..2f15edd4ba 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java @@ -17,10 +17,7 @@ public class PublicationMetadataFormComponentPanel extends GenericPanel<Publicat @Inject NationalSubjectCategoryService nationalSubjectCategoryService; - public PublicationMetadataFormComponentPanel( - String id, - IModel<PublicationMetadata> metadataModel - ) { + public PublicationMetadataFormComponentPanel(String id, IModel<PublicationMetadata> metadataModel) { super(id, metadataModel); add( new TextArea<>( @@ -65,20 +62,16 @@ public class PublicationMetadataFormComponentPanel extends GenericPanel<Publicat IModel<List<NationalSubjectCategory>> availableCategories = LoadableDetachableModel.of( nationalSubjectCategoryService::listCategories ); - DropDownChoice<NationalSubjectCategory> nationalSubjectCategoryChoice = - new DropDownChoice<>( - "national_subject_category", - LambdaModel.of( - metadataModel, - PublicationMetadata::getNationalSubjectCategory, - PublicationMetadata::setNationalSubjectCategory - ), - availableCategories, - new LambdaChoiceRenderer<>( - NationalSubjectCategory::getEnglishName, - NationalSubjectCategory::getId - ) - ); + DropDownChoice<NationalSubjectCategory> nationalSubjectCategoryChoice = new DropDownChoice<>( + "national_subject_category", + LambdaModel.of( + metadataModel, + PublicationMetadata::getNationalSubjectCategory, + PublicationMetadata::setNationalSubjectCategory + ), + availableCategories, + new LambdaChoiceRenderer<>(NationalSubjectCategory::getEnglishName, NationalSubjectCategory::getId) + ); if (metadataModel.getObject().getNationalSubjectCategory() == null) { availableCategories .getObject() diff --git a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java index 0740d8e975..366fea8ac2 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java @@ -53,9 +53,7 @@ public class PublicationMetadataPanel extends GenericPanel<Project> { @Override protected void onConfigure() { super.onConfigure(); - setEnabled( - finalThesisService.canReject(PublicationMetadataPanel.this.getModelObject()) - ); + setEnabled(finalThesisService.canReject(PublicationMetadataPanel.this.getModelObject())); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java index df9bc05d17..986d509685 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java @@ -43,10 +43,7 @@ class ReflectionModalBodyPanel extends Panel { setOutputMarkupPlaceholderTag(true); // enable ajax refreshing of the entire body - IModel<Reflection> reflectionModel = projectModel.combineWith( - authorModel, - reflectionService::getReflection - ); + IModel<Reflection> reflectionModel = projectModel.combineWith(authorModel, reflectionService::getReflection); add( new MultiLineLabel("reflection_text", reflectionModel.map(this::getReflectionText)) { @@ -89,9 +86,7 @@ class ReflectionModalBodyPanel extends Panel { super.onConfigure(); Reflection reflection = getModelObject(); boolean canRequestImprovements = reflection instanceof Reflection.Submitted; - setVisible( - state == State.VIEWING && canRequestImprovements && isEnabledInHierarchy() - ); + setVisible(state == State.VIEWING && canRequestImprovements && isEnabledInHierarchy()); } } ); @@ -111,9 +106,7 @@ class ReflectionModalBodyPanel extends Panel { boolean canEditReflection = reflection instanceof Reflection.Submitted || reflection instanceof Reflection.ImprovementsNeeded; - setVisible( - state == State.VIEWING && canEditReflection && isEnabledInHierarchy() - ); + setVisible(state == State.VIEWING && canEditReflection && isEnabledInHierarchy()); } } ); @@ -177,10 +170,7 @@ class ReflectionModalBodyPanel extends Panel { @Override protected void onConfigure() { super.onConfigure(); - setVisible( - state == State.REQUESTING_IMPROVEMENTS && - getModelObject() instanceof Reflection.Submitted - ); + setVisible(state == State.REQUESTING_IMPROVEMENTS && getModelObject() instanceof Reflection.Submitted); } } @@ -188,9 +178,7 @@ class ReflectionModalBodyPanel extends Panel { public SupervisorEditReflectionForm(String id, IModel<Reflection> reflectionModel) { super(id, reflectionModel); - IModel<String> reflectionTextModel = new Model<>( - getReflectionText(reflectionModel.getObject()) - ); + IModel<String> reflectionTextModel = new Model<>(getReflectionText(reflectionModel.getObject())); TextArea<String> reflectionTextArea = new TextArea<>("reflection", reflectionTextModel); reflectionTextArea.setRequired(true); diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SeminarParticipationGradingRequirements.java b/view/src/main/java/se/su/dsv/scipro/grading/SeminarParticipationGradingRequirements.java index 0595d5f0cd..422698848e 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/SeminarParticipationGradingRequirements.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/SeminarParticipationGradingRequirements.java @@ -1,9 +1,6 @@ package se.su.dsv.scipro.grading; -public record SeminarParticipationGradingRequirements( - Requirement oppositions, - Requirement activeParticipations -) { +public record SeminarParticipationGradingRequirements(Requirement oppositions, Requirement activeParticipations) { public record Requirement(long required, long completed) { public boolean isFulfilled() { return completed >= required; diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java b/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java index de069a6564..81528142ae 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java @@ -90,15 +90,11 @@ public class SendToExaminer extends GenericPanel<Project> { IModel<String> confirmationMessage ) { super(id, projectModel); - needsSending = LoadableDetachableModel.of(() -> - hasGradedExaminationWithoutSuggestion(authorModel.getObject()) - ); + needsSending = LoadableDetachableModel.of(() -> hasGradedExaminationWithoutSuggestion(authorModel.getObject())); IModel<LocalDate> examinationDate = new Model<>(); FinalThesis finalThesis = finalThesisService.findByProject(projectModel.getObject()); - examinationDate.setObject( - getExaminationDate(authorModel.getObject(), projectModel.getObject(), finalThesis) - ); + examinationDate.setObject(getExaminationDate(authorModel.getObject(), projectModel.getObject(), finalThesis)); Form<Void> form = new Form<>("form") { @Override @@ -189,10 +185,7 @@ public class SendToExaminer extends GenericPanel<Project> { getSession().error("Failed to get the examination setup for " + author.getFullName()); return; } - List<Examination> gradedExaminations = examinations - .stream() - .filter(Examination::hasManyPassingGrades) - .toList(); + List<Examination> gradedExaminations = examinations.stream().filter(Examination::hasManyPassingGrades).toList(); if (!arePassFailReported(token, project, author, examinations)) { getSession() .info( @@ -200,20 +193,10 @@ public class SendToExaminer extends GenericPanel<Project> { author.getFullName() + " since it was not reported when the student passed phase two review." ); - setResponsePage( - SupervisorGradingPage.class, - SupervisorGradingPage.getPageParameters(project) - ); + setResponsePage(SupervisorGradingPage.class, SupervisorGradingPage.getPageParameters(project)); } else if (gradedExaminations.size() > 1) { - getSession() - .info( - author.getFullName() + - " has a complex examination setup, manual reporting is necessary" - ); - setResponsePage( - SupervisorGradingPage.class, - SupervisorGradingPage.getPageParameters(project) - ); + getSession().info(author.getFullName() + " has a complex examination setup, manual reporting is necessary"); + setResponsePage(SupervisorGradingPage.class, SupervisorGradingPage.getPageParameters(project)); } else if (gradedExaminations.isEmpty()) { getSession().info("Nothing to report on " + author.getFullName()); } else { @@ -222,12 +205,7 @@ public class SendToExaminer extends GenericPanel<Project> { needsSending.detach(); } - private boolean arePassFailReported( - String token, - Project project, - User author, - List<Examination> examinations - ) { + private boolean arePassFailReported(String token, Project project, User author, List<Examination> examinations) { List<Examination> passFail = examinations .stream() .filter(Predicate.not(Examination::hasManyPassingGrades)) @@ -258,8 +236,10 @@ public class SendToExaminer extends GenericPanel<Project> { private boolean checkStepsMissingFor(User author) { boolean missing = false; - SupervisorGradingReport supervisorGradingReport = - gradingReportService.getSupervisorGradingReport(getModelObject(), author); + SupervisorGradingReport supervisorGradingReport = gradingReportService.getSupervisorGradingReport( + getModelObject(), + author + ); if (!supervisorGradingReport.isFinished()) { getSession().error("You must finish the grading basis for " + author.getFullName()); missing = true; @@ -267,12 +247,7 @@ public class SendToExaminer extends GenericPanel<Project> { return missing; } - private void sendSuggestion( - Project project, - User author, - Examination examination, - LocalDate examinationDate - ) { + private void sendSuggestion(Project project, User author, Examination examination, LocalDate examinationDate) { String token = getSession().getMetaData(OAuth.TOKEN); Either<GetGradeError, Optional<Result>> currentResult = gradingService.getResult( @@ -285,8 +260,7 @@ public class SendToExaminer extends GenericPanel<Project> { // already sent for examining return; } else if (!currentResult.isRight()) { - getSession() - .error("You can not send in the thesis for examining for " + author.getFullName()); + getSession().error("You can not send in the thesis for examining for " + author.getFullName()); return; } @@ -296,8 +270,10 @@ public class SendToExaminer extends GenericPanel<Project> { } GradeCalculator gradeCalculator = gradeCalculatorService.getSupervisorCalculator(project); - SupervisorGradingReport supervisorGradingReport = - gradingReportService.getSupervisorGradingReport(getModelObject(), author); + SupervisorGradingReport supervisorGradingReport = gradingReportService.getSupervisorGradingReport( + getModelObject(), + author + ); GradingReport.Grade grade = gradeCalculator.getGrade(supervisorGradingReport); Either<ReportGradeError, Void> reported = gradingService.reportGrade( token, @@ -328,10 +304,7 @@ public class SendToExaminer extends GenericPanel<Project> { ); var participations = finalSeminarService.findUserParticipating(project, author); - Optional<LocalDate> seminarDate = Stream.concat( - oppositions.stream(), - participations.stream() - ) + Optional<LocalDate> seminarDate = Stream.concat(oppositions.stream(), participations.stream()) .filter(FinalSeminarParticipation::isApproved) .map(FinalSeminarParticipation::getFinalSeminar) .map(FinalSeminar::getDateCreated) @@ -357,11 +330,7 @@ public class SendToExaminer extends GenericPanel<Project> { } } - private boolean sendProjectLevelComponentsToExaminer( - Project project, - String token, - FinalThesis finalThesis - ) { + private boolean sendProjectLevelComponentsToExaminer(Project project, String token, FinalThesis finalThesis) { sendTitlesToDaisy(project, finalThesis); if (!sendPublicationToDaisy(project, finalThesis)) { @@ -413,19 +382,11 @@ public class SendToExaminer extends GenericPanel<Project> { private boolean sendPublicationToDaisy(final Project project, final FinalThesis finalThesis) { final ThesisPublication old = daisyAPI.getPublication(project.getIdentifier()).orElse(null); if (old == null || old.getFile() == null) { - final ThesisPublication thesisPublication = createThesisPublication( - project, - finalThesis - ); - final boolean sentPublication = daisyAPI.sendPublication( - project.getIdentifier(), - thesisPublication - ); + final ThesisPublication thesisPublication = createThesisPublication(project, finalThesis); + final boolean sentPublication = daisyAPI.sendPublication(project.getIdentifier(), thesisPublication); if (sentPublication) { - final FileDescription finalThesisDocument = finalThesis - .getDocument() - .getFileDescription(); + final FileDescription finalThesisDocument = finalThesis.getDocument().getFileDescription(); try { return daisyAPI.sendPublicationFile( @@ -443,10 +404,7 @@ public class SendToExaminer extends GenericPanel<Project> { return true; } - private ThesisPublication createThesisPublication( - final Project project, - final FinalThesis finalThesis - ) { + private ThesisPublication createThesisPublication(final Project project, final FinalThesis finalThesis) { final ThesisPublication thesisPublication = new ThesisPublication(); final Calendar calendar = Calendar.getInstance(); calendar.setTime(finalThesis.getDocument().getFileDescription().getDateCreated()); @@ -471,11 +429,7 @@ public class SendToExaminer extends GenericPanel<Project> { return thesisPublication; } - private boolean sendTextMatchingDocument( - final String token, - final Project project, - final FinalThesis finalThesis - ) { + private boolean sendTextMatchingDocument(final String token, final Project project, final FinalThesis finalThesis) { final boolean hasTextMatchingDocument = gradingService.hasTextMatchingDocument( getSession().getMetaData(OAuth.TOKEN), project.getIdentifier() @@ -486,9 +440,7 @@ public class SendToExaminer extends GenericPanel<Project> { gradingService.sendTextMatchingDocument( token, project.getIdentifier(), - fileService.getData( - finalThesis.getTextMatchingDocument().getFileDescription() - ), + fileService.getData(finalThesis.getTextMatchingDocument().getFileDescription()), finalThesis.getTextMatchingDocument().getFileDescription().getMimeType() ); return sendTextMatchingDocument.isRight(); @@ -514,9 +466,7 @@ public class SendToExaminer extends GenericPanel<Project> { IModel<RoughDraftApproval> roughDraftApproval = LoadableDetachableModel.of(() -> roughDraftApprovalService.findBy(project) ).map(o -> o.orElse(null)); - IModel<FinalThesis> finalThesis = LoadableDetachableModel.of(() -> - finalThesisService.findByProject(project) - ); + IModel<FinalThesis> finalThesis = LoadableDetachableModel.of(() -> finalThesisService.findByProject(project)); final DataExposedGradingReportPdf pdf = new DataExposedGradingReportPdf( supervisorGradingReport, reflection, diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java index 471fb44fb7..84dfa11a0f 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java @@ -48,11 +48,7 @@ public class SupervisorGradingPage add(new FeedbackPanel("feedback")); final IModel<List<User>> authors = new ListAdapterModel<>( - LambdaModel.of( - projectModel, - Project::getProjectParticipants, - Project::setProjectParticipants - ) + LambdaModel.of(projectModel, Project::getProjectParticipants, Project::setProjectParticipants) ); add( new ListView<>("authors", authors) { @@ -64,9 +60,7 @@ public class SupervisorGradingPage protected void populateItem(final ListItem<User> item) { item.add(new UserLabel("authorName", item.getModel())); final IModel<List<Examination>> examinations = - SupervisorGradingPage.this.getExaminations(item.getModel()).orElseGet( - Collections::emptyList - ); + SupervisorGradingPage.this.getExaminations(item.getModel()).orElseGet(Collections::emptyList); final IModel<List<Examination>> nonGradedExaminations = getSpecificExaminations( examinations, @@ -131,16 +125,10 @@ public class SupervisorGradingPage final Instant expiration = getSession().getMetaData(OAuth.EXPIRATION); final boolean validToken = expiration != null && expiration.isAfter(Instant.now()); if (!validToken) { - final PageParameters pp = SupervisorGradingPage.getPageParameters( - projectModel.getObject() - ); - final String returnUrl = - "/" + getRequestCycle().mapUrlFor(SupervisorGradingPage.class, pp).canonical(); + final PageParameters pp = SupervisorGradingPage.getPageParameters(projectModel.getObject()); + final String returnUrl = "/" + getRequestCycle().mapUrlFor(SupervisorGradingPage.class, pp).canonical(); getSession().setMetaData(OAuth.RETURN_URL, returnUrl); - final String href = oAuthService.authorizeUrl( - null, - Set.of("grade:read", "grade:write") - ); + final String href = oAuthService.authorizeUrl(null, Set.of("grade:read", "grade:write")); throw new RedirectToUrlException(href); } } @@ -173,8 +161,7 @@ public class SupervisorGradingPage reported ); final String feedback = result.fold( - error -> - getString(Classes.simpleName(error.getDeclaringClass()) + '.' + error.name()), + error -> getString(Classes.simpleName(error.getDeclaringClass()) + '.' + error.name()), success -> "Grade " + letter + " reported for " + author.getFullName() ); if (result.isRight()) { diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java index bc3031db60..9e2a5c6b97 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java @@ -76,25 +76,13 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail .map(finalThesisService::findByProject) .filter(ft -> ft.getStatus() == FinalThesis.Status.APPROVED) .isPresent(); - add( - newGreenHighlight( - "step_final_thesis", - hasApprovedFinalThesis, - new ResourceModel("step_final_thesis") - ) - ); + add(newGreenHighlight("step_final_thesis", hasApprovedFinalThesis, new ResourceModel("step_final_thesis"))); IModel<Boolean> hasCheckedForPlagiarism = projectModel .map(finalThesisService::findByProject) .map(FinalThesis::getTextMatchingDocument) .isPresent(); - add( - newGreenHighlight( - "step_plagiarism", - hasCheckedForPlagiarism, - new ResourceModel("step_plagiarism") - ) - ); + add(newGreenHighlight("step_plagiarism", hasCheckedForPlagiarism, new ResourceModel("step_plagiarism"))); IModel<Boolean> hasProvidedPublicationMetadata = Model.of( publicationMetadataService.hasSuppliedPublicationMetadata( @@ -118,11 +106,7 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail reports.stream().allMatch(this::generalCriteriaDone) ); add( - newGreenHighlight( - "step_general_criteria", - generalCriteriaDone, - new ResourceModel("step_general_criteria") - ) + newGreenHighlight("step_general_criteria", generalCriteriaDone, new ResourceModel("step_general_criteria")) ); IModel<Boolean> individualCriteriaDone = gradingReports.map(reports -> @@ -146,10 +130,7 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail newGreenHighlight( "author", individualCriteriaDone, - item - .getModel() - .map(SupervisorGradingReport::getUser) - .map(User::getFullName) + item.getModel().map(SupervisorGradingReport::getUser).map(User::getFullName) ) ); } @@ -159,13 +140,7 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail IModel<Boolean> sentToExaminer = projectModel.map(project -> project.getProjectParticipants().stream().allMatch(this::sentToExaminer) ); - add( - newGreenHighlight( - "step_sent_to_examiner", - sentToExaminer, - new ResourceModel("step_send_to_examiner") - ) - ); + add(newGreenHighlight("step_sent_to_examiner", sentToExaminer, new ResourceModel("step_send_to_examiner"))); add( new ListView<>( "step_sent_to_examiner_author", @@ -176,38 +151,18 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail IModel<Boolean> sentToExaminer = item .getModel() .map(SupervisorGradingReportPage.this::sentToExaminer); - item.add( - newGreenHighlight( - "author", - sentToExaminer, - item.getModel().map(User::getFullName) - ) - ); + item.add(newGreenHighlight("author", sentToExaminer, item.getModel().map(User::getFullName))); } } ); List<ITab> tabs = new ArrayList<>(); + tabs.add(createTab(Model.of("Final thesis"), panelId -> new ApproveFinalThesisPanel(panelId, projectModel))); + tabs.add(createTab(Model.of("Plagiarism"), panelId -> new UploadTextMatchingPanel(panelId, projectModel))); tabs.add( - createTab(Model.of("Final thesis"), panelId -> - new ApproveFinalThesisPanel(panelId, projectModel) - ) - ); - tabs.add( - createTab(Model.of("Plagiarism"), panelId -> - new UploadTextMatchingPanel(panelId, projectModel) - ) - ); - tabs.add( - createTab(Model.of("Publication metadata"), panelId -> - new PublicationMetadataPanel(panelId, projectModel) - ) - ); - tabs.add( - createTab(Model.of("General criteria"), panelId -> - new GradingBasisPanel(panelId, projectModel) - ) + createTab(Model.of("Publication metadata"), panelId -> new PublicationMetadataPanel(panelId, projectModel)) ); + tabs.add(createTab(Model.of("General criteria"), panelId -> new GradingBasisPanel(panelId, projectModel))); List<ITab> authorTabs = projectModel .getObject() @@ -227,9 +182,7 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail List<ITab> interactTabs = new ArrayList<>(); interactTabs.add( - createTab(Model.of("Interact with reviewer"), panelId -> - new TimelinePanel(panelId, projectModel) - ) + createTab(Model.of("Interact with reviewer"), panelId -> new TimelinePanel(panelId, projectModel)) ); interactTabs.add( createTab(Model.of("Interactions with examiner"), panelId -> @@ -237,10 +190,7 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail ) ); - TabbedPanel<ITab> tabbedPanelInteract = new BootstrapCardTabbedPanel<>( - "interact", - interactTabs - ); + TabbedPanel<ITab> tabbedPanelInteract = new BootstrapCardTabbedPanel<>("interact", interactTabs); add(tabbedPanelInteract); final String externalGradingURL = generalSystemSettingsService @@ -308,10 +258,7 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail return true; } - private ITab createTab( - IModel<String> title, - SerializableFunction<String, WebMarkupContainer> newPanel - ) { + private ITab createTab(IModel<String> title, SerializableFunction<String, WebMarkupContainer> newPanel) { return new AbstractTab(title) { @Override public WebMarkupContainer getPanel(String panelId) { @@ -326,17 +273,11 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail final Instant expiration = getSession().getMetaData(OAuth.EXPIRATION); final boolean validToken = expiration != null && expiration.isAfter(Instant.now()); if (!validToken) { - final PageParameters pp = SupervisorGradingPage.getPageParameters( - projectModel.getObject() - ); + final PageParameters pp = SupervisorGradingPage.getPageParameters(projectModel.getObject()); final String returnUrl = - "/" + - getRequestCycle().mapUrlFor(SupervisorGradingReportPage.class, pp).canonical(); + "/" + getRequestCycle().mapUrlFor(SupervisorGradingReportPage.class, pp).canonical(); getSession().setMetaData(OAuth.RETURN_URL, returnUrl); - final String href = oAuthService.authorizeUrl( - null, - Set.of("grade:read", "grade:write") - ); + final String href = oAuthService.authorizeUrl(null, Set.of("grade:read", "grade:write")); throw new RedirectToUrlException(href); } } diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPdf.java b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPdf.java index 17cd6518e1..0b196ef740 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPdf.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPdf.java @@ -42,10 +42,7 @@ public class SupervisorGradingReportPdf implements GradingReportPdf { @Override public String getDegreeType() { - DegreeType degreeType = supervisorGradingReport - .getObject() - .getProjectType() - .getDegreeType(); + DegreeType degreeType = supervisorGradingReport.getObject().getProjectType().getDegreeType(); if (isSwedish()) { return switch (degreeType) { case NONE -> "Okänd"; diff --git a/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java index 83b066bd03..f8c1e9f4e2 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java @@ -33,12 +33,7 @@ public class ThesisApprovedPanel extends GenericPanel<Project> { add( new Link<>("reject", project) { { - add( - new JavascriptEventConfirmation( - "click", - new ResourceModel("remove.approved") - ) - ); + add(new JavascriptEventConfirmation("click", new ResourceModel("remove.approved"))); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java index 8b317cabc5..9b6d646b3b 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java @@ -58,21 +58,11 @@ public class UploadTextMatchingPanel extends GenericPanel<Project> { add(new UploadPlagiarismAnalysisForm("form", finalThesisModel)); - IModel<FileReference> textMatchingDocument = finalThesisModel.map( - FinalThesis::getTextMatchingDocument - ); + IModel<FileReference> textMatchingDocument = finalThesisModel.map(FinalThesis::getTextMatchingDocument); add( - new ViewAttachmentPanel( - "textMatchingDocument", - textMatchingDocument.map(FileReference::getFileDescription) - ) - ); - add( - new Label( - "text_matching_analysis", - finalThesisModel.map(FinalThesis::getTextMatchingAnalysis) - ) + new ViewAttachmentPanel("textMatchingDocument", textMatchingDocument.map(FileReference::getFileDescription)) ); + add(new Label("text_matching_analysis", finalThesisModel.map(FinalThesis::getTextMatchingAnalysis))); add( new Link<>("remove", finalThesisModel) { @@ -85,8 +75,9 @@ public class UploadTextMatchingPanel extends GenericPanel<Project> { @Override protected void onConfigure() { super.onConfigure(); - boolean canRemovePlagiarismAnalysis = - finalThesisService.canRemovePlagiarismAnalysis(getModelObject()); + boolean canRemovePlagiarismAnalysis = finalThesisService.canRemovePlagiarismAnalysis( + getModelObject() + ); setVisibilityAllowed(canRemovePlagiarismAnalysis); setVisible(textMatchingDocument.isPresent().getObject()); } @@ -99,9 +90,7 @@ public class UploadTextMatchingPanel extends GenericPanel<Project> { protected void onConfigure() { super.onConfigure(); FinalThesis finalThesis = finalThesisModel.getObject(); - setVisible( - finalThesis == null || finalThesis.getTextMatchingDocument() == null - ); + setVisible(finalThesis == null || finalThesis.getTextMatchingDocument() == null); } } ); @@ -124,9 +113,7 @@ public class UploadTextMatchingPanel extends GenericPanel<Project> { this.textMatchingDocumentField = new FileUploadField("textMatchingDocument"); this.textMatchingDocumentField.setRequired(true); - this.textMatchingDocumentField.setLabel( - new ResourceModel("label_text_matching_document") - ); + this.textMatchingDocumentField.setLabel(new ResourceModel("label_text_matching_document")); add(this.textMatchingDocumentField); this.commentField = new TextArea<>("comment", new Model<>()); @@ -138,9 +125,7 @@ public class UploadTextMatchingPanel extends GenericPanel<Project> { buttons.setOutputMarkupPlaceholderTag(true); add(buttons); - WebMarkupContainer plagiarismDetected = new WebMarkupContainer( - "plagiarism_detected_container" - ); + WebMarkupContainer plagiarismDetected = new WebMarkupContainer("plagiarism_detected_container"); plagiarismDetected.setVisible(false); plagiarismDetected.setOutputMarkupPlaceholderTag(true); add(plagiarismDetected); @@ -196,8 +181,7 @@ public class UploadTextMatchingPanel extends GenericPanel<Project> { protected void onConfigure() { super.onConfigure(); FinalThesis finalThesis = getModelObject(); - boolean isApproved = - finalThesis != null && finalThesis.getStatus() == FinalThesis.Status.APPROVED; + boolean isApproved = finalThesis != null && finalThesis.getStatus() == FinalThesis.Status.APPROVED; setVisibilityAllowed(isApproved && finalThesis.getTextMatchingDocument() == null); } @@ -221,27 +205,13 @@ public class UploadTextMatchingPanel extends GenericPanel<Project> { finalThesisService.reject(project, content); HashSet<Attachment> attachments = new HashSet<>(); - attachments.add( - Attachment.existing(getModelObject().getDocument().getFileDescription()) - ); - if ( - Boolean.TRUE.equals(includeTextMatchingDocumentInStudentFeedback.getModelObject()) - ) { - attachments.add( - Attachment.newUpload( - new WicketFileUpload(textMatchingDocumentField.getFileUpload()) - ) - ); + attachments.add(Attachment.existing(getModelObject().getDocument().getFileDescription())); + if (Boolean.TRUE.equals(includeTextMatchingDocumentInStudentFeedback.getModelObject())) { + attachments.add(Attachment.newUpload(new WicketFileUpload(textMatchingDocumentField.getFileUpload()))); } String subject = getString("minor_plagiarism_forum_subject"); - projectForumService.createThread( - project, - SciProSession.get().getUser(), - subject, - content, - attachments - ); + projectForumService.createThread(project, SciProSession.get().getUser(), subject, content, attachments); } } } diff --git a/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java b/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java index 941c36899a..1fea8c9e54 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java +++ b/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java @@ -20,9 +20,7 @@ import se.su.dsv.scipro.system.SystemModule; import se.su.dsv.scipro.util.PageParameterKeys; @SystemModuleComponent(SystemModule.GROUP) -public abstract class AbstractAuthorGroupPage - extends ProjectPage - implements MenuHighlightAuthorMyGroups { +public abstract class AbstractAuthorGroupPage extends ProjectPage implements MenuHighlightAuthorMyGroups { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAuthorGroupPage.class); public static final String COOKIE_KEY = "authorLastVisitedGID"; diff --git a/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java b/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java index 1ea1514581..cfcac3c98d 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java +++ b/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java @@ -16,9 +16,7 @@ import se.su.dsv.scipro.forum.dataobjects.GroupThread; import se.su.dsv.scipro.forum.panels.threaded.ThreadsOverviewPanel; import se.su.dsv.scipro.util.PageParameterKeys; -public class AuthorGroupPage - extends AbstractAuthorGroupPage - implements MenuHighlightAuthorMyGroups { +public class AuthorGroupPage extends AbstractAuthorGroupPage implements MenuHighlightAuthorMyGroups { @Inject private GroupForumService groupForumService; @@ -28,18 +26,13 @@ public class AuthorGroupPage add(new FeedbackPanel("feedback")); add(new BookmarkablePageLink<Void>("createThread", CreateThreadPage.class, pp)); add( - new ThreadsOverviewPanel<>( - "threads", - getThreads(), - new GroupThreadDiscussable(), - (id, thread) -> { - PageParameters parameters = new PageParameters(pp).set( - PageParameterKeys.MAP.get(ForumThread.class), - thread.getObject().getId() - ); - return new BookmarkablePageLink<>(id, ViewThreadPage.class, parameters); - } - ) + new ThreadsOverviewPanel<>("threads", getThreads(), new GroupThreadDiscussable(), (id, thread) -> { + PageParameters parameters = new PageParameters(pp).set( + PageParameterKeys.MAP.get(ForumThread.class), + thread.getObject().getId() + ); + return new BookmarkablePageLink<>(id, ViewThreadPage.class, parameters); + }) ); } @@ -48,11 +41,7 @@ public class AuthorGroupPage @Override protected List<GroupThread> load() { List<GroupThread> threads = groupForumService.getThreads(getGroup().getObject()); - threads.sort( - Collections.reverseOrder( - Comparator.comparing(o -> o.getForumThread().getLastModified()) - ) - ); + threads.sort(Collections.reverseOrder(Comparator.comparing(o -> o.getForumThread().getLastModified()))); return threads; } }; diff --git a/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java b/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java index 79667c27b4..9b7839e491 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java @@ -46,10 +46,7 @@ public class AuthorMyGroupsPage extends ProjectPage implements MenuHighlightAuth GroupService.Filter filter = new GroupService.Filter(); filter.setAuthor(SciProSession.get().getUser()); - SortableDataProvider<Group, String> provider = new FilteredDataProvider<>( - groupService, - Model.of(filter) - ); + SortableDataProvider<Group, String> provider = new FilteredDataProvider<>(groupService, Model.of(filter)); add(new DefaultDataPanel<>("myGroups", createColumns(), provider)); } @@ -57,14 +54,7 @@ public class AuthorMyGroupsPage extends ProjectPage implements MenuHighlightAuth private List<IColumn<Group, String>> createColumns() { List<IColumn<Group, String>> columns = new ArrayList<>(); - columns.add( - new DateColumn<>( - Model.of("Date created"), - Group::getDateCreated, - "dateCreated", - DateStyle.DATE - ) - ); + columns.add(new DateColumn<>(Model.of("Date created"), Group::getDateCreated, "dateCreated", DateStyle.DATE)); columns.add( new AbstractColumn<>(Model.of("Title"), "title") { @@ -83,10 +73,7 @@ public class AuthorMyGroupsPage extends ProjectPage implements MenuHighlightAuth @Override public void onClick(AjaxRequestTarget target, IModel<Group> model) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Group.class), - model.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(Group.class), model.getObject().getId()); setResponsePage(AuthorGroupPage.class, pp); } } diff --git a/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java b/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java index 4bc23c5b18..ade7642cc5 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java @@ -9,9 +9,7 @@ import se.su.dsv.scipro.forum.dataobjects.GroupThread; import se.su.dsv.scipro.forum.panels.threaded.SubmitForumThreadPanel; import se.su.dsv.scipro.util.PageParameterKeys; -public class CreateThreadPage - extends AbstractAuthorGroupPage - implements MenuHighlightAuthorMyGroups { +public class CreateThreadPage extends AbstractAuthorGroupPage implements MenuHighlightAuthorMyGroups { @Inject private GroupForumService groupForumService; diff --git a/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java b/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java index 5b3b51f2f9..853cedc848 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java @@ -60,23 +60,10 @@ public class EditGroupPanel extends Panel { currentProjects = new ArrayList<>(getModelObject().getProjects()); + add(new RequiredTextField<>("title", LambdaModel.of(model, Group::getTitle, Group::setTitle))); + add(new TextArea<>("description", LambdaModel.of(model, Group::getDescription, Group::setDescription))); add( - new RequiredTextField<>( - "title", - LambdaModel.of(model, Group::getTitle, Group::setTitle) - ) - ); - add( - new TextArea<>( - "description", - LambdaModel.of(model, Group::getDescription, Group::setDescription) - ) - ); - add( - new CheckBox( - "active", - LambdaModel.of(model, Group::isActive, Group::setActive) - ).setOutputMarkupId(true) + new CheckBox("active", LambdaModel.of(model, Group::isActive, Group::setActive)).setOutputMarkupId(true) ); final WebMarkupContainer wmc = new WebMarkupContainer("wmc"); @@ -114,9 +101,7 @@ public class EditGroupPanel extends Panel { new ListView<>( "authors", new ListAdapterModel<>( - getLoaded(item.getModelObject()).map( - Project::getProjectParticipants - ) + getLoaded(item.getModelObject()).map(Project::getProjectParticipants) ) ) { @Override @@ -153,9 +138,7 @@ public class EditGroupPanel extends Panel { add(wmc); } - private AjaxCheckBoxMultipleChoice<ProjectType> projectTypeSelection( - final WebMarkupContainer wmc - ) { + private AjaxCheckBoxMultipleChoice<ProjectType> projectTypeSelection(final WebMarkupContainer wmc) { return new AjaxCheckBoxMultipleChoice<>( "projectTypes", projectTypeService.findAllActive(), diff --git a/view/src/main/java/se/su/dsv/scipro/group/GroupDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/group/GroupDetailsPanel.java index 4cd1d91854..c24e55f294 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/GroupDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/group/GroupDetailsPanel.java @@ -34,9 +34,7 @@ public class GroupDetailsPanel extends Panel { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - model.getObject().getUser().equals(SciProSession.get().getUser()) - ); + setVisibilityAllowed(model.getObject().getUser().equals(SciProSession.get().getUser())); } } ); @@ -53,19 +51,12 @@ public class GroupDetailsPanel extends Panel { new AjaxLink<>("viewProjects", model) { @Override public void onClick(AjaxRequestTarget target) { - modalWindowPlus.setContent( - new ViewGroupProjectsPanel(modalWindowPlus.getContentId(), model) - ); + modalWindowPlus.setContent(new ViewGroupProjectsPanel(modalWindowPlus.getContentId(), model)); modalWindowPlus.setTitle("Group: " + model.getObject().getTitle()); modalWindowPlus.show(target); } } ); - add( - new Label( - "description", - LambdaModel.of(model, Group::getDescription, Group::setDescription) - ) - ); + add(new Label("description", LambdaModel.of(model, Group::getDescription, Group::setDescription))); } } diff --git a/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java index 9432fba325..d49c5fbad8 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java @@ -21,11 +21,7 @@ public class GroupsOverviewPanel extends GenericPanel<Project> { @Inject private GroupService groupService; - public GroupsOverviewPanel( - String id, - IModel<Project> model, - final GroupLinkSupplier linkSupplier - ) { + public GroupsOverviewPanel(String id, IModel<Project> model, final GroupLinkSupplier linkSupplier) { super(id, model); add( new AutoHidingListView<>("groupList", getGroups()) { diff --git a/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java b/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java index 099abefa2e..75b36465cb 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java @@ -41,9 +41,7 @@ public class ViewGroupProjectsPanel extends GenericPanel<Group> { add( new ListView<>( "projects", - new ListAdapterModel<>( - LambdaModel.of(model, Group::getProjects, Group::setProjects) - ) + new ListAdapterModel<>(LambdaModel.of(model, Group::getProjects, Group::setProjects)) ) { @Override protected void populateItem(final ListItem<Project> item) { @@ -52,9 +50,7 @@ public class ViewGroupProjectsPanel extends GenericPanel<Group> { item.add( new ListView<>( "authors", - new ListAdapterModel<>( - item.getModel().map(Project::getProjectParticipants) - ) + new ListAdapterModel<>(item.getModel().map(Project::getProjectParticipants)) ) { @Override public void populateItem(ListItem<User> item) { @@ -62,12 +58,7 @@ public class ViewGroupProjectsPanel extends GenericPanel<Group> { } } ); - item.add( - new UserLinkPanel( - "headSupervisor", - item.getModel().map(Project::getHeadSupervisor) - ) - ); + item.add(new UserLinkPanel("headSupervisor", item.getModel().map(Project::getHeadSupervisor))); item.add( new ListView<>( "coSupervisors", diff --git a/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java b/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java index d60e5665e1..088190a2fe 100644 --- a/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java @@ -30,9 +30,7 @@ public class ViewThreadPage extends AbstractAuthorGroupPage implements MenuHighl public ViewThreadPage(final PageParameters parameters) { super(parameters); - final long threadId = parameters - .get(PageParameterKeys.MAP.get(ForumThread.class)) - .toLong(0L); + final long threadId = parameters.get(PageParameterKeys.MAP.get(ForumThread.class)).toLong(0L); final IModel<GroupThread> groupThreadModel = new LoadableDetachableModel<>() { @Override protected GroupThread load() { @@ -50,21 +48,13 @@ public class ViewThreadPage extends AbstractAuthorGroupPage implements MenuHighl basicForumService.setThreadRead(loggedInUser(), groupThread.getForumThread(), true); add( - new ViewForumThreadPanel<>( - "thread", - groupThreadModel, - new GroupForumThread(groupForumService) - ) { + new ViewForumThreadPanel<>("thread", groupThreadModel, new GroupForumThread(groupForumService)) { @Override protected Component newBackLink(final String id) { PageParameters pageParameters = new PageParameters(parameters).remove( PageParameterKeys.MAP.get(ForumThread.class) ); - return new BookmarkablePageLink<Void>( - id, - AuthorGroupPage.class, - pageParameters - ); + return new BookmarkablePageLink<Void>(id, AuthorGroupPage.class, pageParameters); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java b/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java index 5baa8ac3dc..14946fc9a4 100644 --- a/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java +++ b/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java @@ -57,11 +57,7 @@ public class ExcelExporter extends AbstractDataExporter { } } - private <T> void addData( - Sheet sheet, - IDataProvider<T> dataProvider, - List<IExportableColumn<T, ?>> columns - ) { + private <T> void addData(Sheet sheet, IDataProvider<T> dataProvider, List<IExportableColumn<T, ?>> columns) { int row = HEADER_ROW + 1; Iterator<? extends T> iterator = dataProvider.iterator(0, dataProvider.size()); while (iterator.hasNext()) { diff --git a/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEvent.java b/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEvent.java index 0ace240bf8..c51c18116b 100644 --- a/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEvent.java +++ b/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEvent.java @@ -18,13 +18,7 @@ public class LatestEvent implements Serializable { private String title; private Object domainObject; - public LatestEvent( - Date date, - LatestEventType type, - User creator, - String title, - Object fileDescription - ) { + public LatestEvent(Date date, LatestEventType type, User creator, String title, Object fileDescription) { this.date = date; this.type = type; this.creator = creator; diff --git a/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java b/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java index 0374830c75..66cbc6da08 100644 --- a/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java @@ -80,19 +80,8 @@ public class LatestEventsPanel extends Panel { @Override protected void populateItem(ListItem<LatestEvent> item) { item.add(new EnumLabel<>(EVENT_TYPE, item.getModel().map(LatestEvent::getType))); - item.add( - new DateLabel( - EVENT_DATE, - item.getModel().map(LatestEvent::getDate), - DateStyle.DATETIME - ) - ); - item.add( - new Label( - EVENT_CREATOR, - item.getModel().map(LatestEvent::getCreator).map(User::getFullName) - ) - ); + item.add(new DateLabel(EVENT_DATE, item.getModel().map(LatestEvent::getDate), DateStyle.DATETIME)); + item.add(new Label(EVENT_CREATOR, item.getModel().map(LatestEvent::getCreator).map(User::getFullName))); item.add(createEventLink(item.getModel())); } }; @@ -110,18 +99,13 @@ public class LatestEventsPanel extends Panel { .map(le -> (ProjectFile) le.getDomainObject()) .map(ProjectFile::getFileDescription); - FileDownloadLink<FileDescription> fileDownloadLink = new FileDownloadLink<>( - EVENT_LINK, - model - ); + FileDownloadLink<FileDescription> fileDownloadLink = new FileDownloadLink<>(EVENT_LINK, model); fileDownloadLink.add(new Label(EVENT_TITLE, (latestEvent.map(LatestEvent::getTitle)))); return fileDownloadLink; } private Component createForumLinkComponent(IModel<LatestEvent> latestEvent) { - final IModel<ProjectThread> model = latestEvent.map(le -> - (ProjectThread) le.getDomainObject() - ); + final IModel<ProjectThread> model = latestEvent.map(le -> (ProjectThread) le.getDomainObject()); AjaxFallbackLink<ProjectThread> threadLink = new AjaxFallbackLink<>(EVENT_LINK, model) { @Override @@ -177,10 +161,7 @@ public class LatestEventsPanel extends Panel { } latestEvents.sort(Comparator.comparing(LatestEvent::getDate).reversed()); - return latestEvents.subList( - 0, - latestEvents.size() >= AMOUNT ? AMOUNT : latestEvents.size() - ); + return latestEvents.subList(0, latestEvents.size() >= AMOUNT ? AMOUNT : latestEvents.size()); } }; } diff --git a/view/src/main/java/se/su/dsv/scipro/log4j/JULAppender.java b/view/src/main/java/se/su/dsv/scipro/log4j/JULAppender.java index 2ee2ec07cc..393669ba78 100644 --- a/view/src/main/java/se/su/dsv/scipro/log4j/JULAppender.java +++ b/view/src/main/java/se/su/dsv/scipro/log4j/JULAppender.java @@ -18,10 +18,7 @@ public class JULAppender extends AbstractAppender { } @PluginFactory - public static JULAppender create( - @PluginAttribute("name") String name, - @PluginElement("Filter") Filter filter - ) { + public static JULAppender create(@PluginAttribute("name") String name, @PluginElement("Filter") Filter filter) { return new JULAppender(name, filter); } diff --git a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java index cbbb85047b..8df12a7cce 100644 --- a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java +++ b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java @@ -21,8 +21,7 @@ public class SSOPage extends PublicPage { private UserService userService; public SSOPage() { - String remoteUserName = - ((HttpServletRequest) getRequest().getContainerRequest()).getRemoteUser(); + String remoteUserName = ((HttpServletRequest) getRequest().getContainerRequest()).getRemoteUser(); User user = userService.findByUsername(remoteUserName); if (user != null) { diff --git a/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java index e6821b3a8a..e7f1301dcf 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java @@ -80,10 +80,7 @@ public abstract class AbstractAdminIdeaPanel extends Panel { } private void addDataTable() { - SortableDataProvider<Idea, String> provider = new FilteredDataProvider<>( - ideaService, - Model.of(filter) - ); + SortableDataProvider<Idea, String> provider = new FilteredDataProvider<>(ideaService, Model.of(filter)); dataTable = new ExportableDataPanel<>(DATA_TABLE, createColumns(), provider); dataTable.setOutputMarkupId(true); add(dataTable); @@ -91,9 +88,7 @@ public abstract class AbstractAdminIdeaPanel extends Panel { private List<IColumn<Idea, String>> createColumns() { List<IColumn<Idea, String>> columns = new ArrayList<>(); - columns.add( - new DateColumn<>(Model.of(HEADER_DATE_CREATED), Idea::getDateCreated, "dateCreated") - ); + columns.add(new DateColumn<>(Model.of(HEADER_DATE_CREATED), Idea::getDateCreated, "dateCreated")); columns.add( new LambdaColumn<>(Model.of(HEADER_PROJECT_TYPE), "projectType.name", idea -> idea.getProjectType().getName() @@ -103,11 +98,7 @@ public abstract class AbstractAdminIdeaPanel extends Panel { columns.add( new LambdaColumn<>(Model.of(HEADER_TITLE), Idea::getTitle) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> components, - String s, - final IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> components, String s, final IModel<Idea> model) { components.add( new AjaxLinkPanel<>(s, model, model.map(Idea::getTitle)) { @Override @@ -132,20 +123,13 @@ public abstract class AbstractAdminIdeaPanel extends Panel { columns.add( new AbstractExportableColumn<>(Model.of(HEADER_SUPERVISOR)) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - IModel<Idea> ideaModel - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> ideaModel) { addSupervisorField(item, id, ideaModel); } @Override public IModel<String> getDataModel(IModel<Idea> rowModel) { - return rowModel - .map(Idea::getMatch) - .map(Match::getSupervisor) - .map(User::getFullName); + return rowModel.map(Idea::getMatch).map(Match::getSupervisor).map(User::getFullName); } } ); @@ -162,18 +146,11 @@ public abstract class AbstractAdminIdeaPanel extends Panel { new DisplayMultiplesPanel<>( componentId, new ListAdapterModel<>( - LambdaModel.of( - rowModel, - Idea::getIdeaParticipations, - Idea::setIdeaParticipations - ) + LambdaModel.of(rowModel, Idea::getIdeaParticipations, Idea::setIdeaParticipations) ) ) { @Override - public Component getComponent( - String componentId, - IModel<IdeaParticipation> t - ) { + public Component getComponent(String componentId, IModel<IdeaParticipation> t) { return new StudentProfileProgramPanel(componentId, t, true); } } @@ -183,9 +160,7 @@ public abstract class AbstractAdminIdeaPanel extends Panel { @Override public IModel<String> getDataModel(IModel<Idea> rowModel) { StringBuilder participants = new StringBuilder(); - Set<IdeaParticipation> participantsSet = rowModel - .getObject() - .getIdeaParticipations(); + Set<IdeaParticipation> participantsSet = rowModel.getObject().getIdeaParticipations(); for (IdeaParticipation participation : participantsSet) { participants.append(participation.getUser().getFullName()).append("; "); } @@ -212,32 +187,19 @@ public abstract class AbstractAdminIdeaPanel extends Panel { modalWindowPlus.show(target); } - private void addSupervisorField( - Item<ICellPopulator<Idea>> item, - String id, - final IModel<Idea> ideaModel - ) { + private void addSupervisorField(Item<ICellPopulator<Idea>> item, String id, final IModel<Idea> ideaModel) { switch (ideaModel.getObject().getType()) { case SUPERVISOR: - item.add( - new UserLinkPanel(id, ideaModel.map(Idea::getMatch).map(Match::getSupervisor)) - ); + item.add(new UserLinkPanel(id, ideaModel.map(Idea::getMatch).map(Match::getSupervisor))); break; case STUDENT: item.add( new EmployeeAutoCompleteDivPanel( id, - LambdaModel.of( - ideaModel.map(Idea::getMatch), - Match::getSupervisor, - Match::setSupervisor - ) + LambdaModel.of(ideaModel.map(Idea::getMatch), Match::getSupervisor, Match::setSupervisor) ) { @Override - public void onNewEmployeeSelection( - AjaxRequestTarget target, - User newSelection - ) { + public void onNewEmployeeSelection(AjaxRequestTarget target, User newSelection) { Idea idea = ideaModel.getObject(); if (newSelection == null) { ideaService.adminUnmatchIdea(idea, SciProSession.get().getUser()); @@ -250,11 +212,7 @@ public abstract class AbstractAdminIdeaPanel extends Panel { idea.getProjectType() ) ) { - ideaService.changeSupervisor( - idea, - newSelection, - SciProSession.get().getUser() - ); + ideaService.changeSupervisor(idea, newSelection, SciProSession.get().getUser()); info("Supervisor changed"); } else { error("The supervisor have reached current target numbers"); diff --git a/view/src/main/java/se/su/dsv/scipro/match/AbstractIdeaProjectPage.java b/view/src/main/java/se/su/dsv/scipro/match/AbstractIdeaProjectPage.java index 02acffdd40..d4fbef4bc1 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AbstractIdeaProjectPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AbstractIdeaProjectPage.java @@ -20,11 +20,7 @@ public class AbstractIdeaProjectPage extends ProjectPage { @Override protected List<MenuItem> getItemList() { return Arrays.asList( - new MenuItem( - "My ideas", - ProjectIdeaStartPage.class, - MenuHighlightProjectMyIdeas.class - ), + new MenuItem("My ideas", ProjectIdeaStartPage.class, MenuHighlightProjectMyIdeas.class), new MenuItem("Project partner", ProjectPartnerPage.class) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/AbstractSupervisorProjectIdeaPage.java b/view/src/main/java/se/su/dsv/scipro/match/AbstractSupervisorProjectIdeaPage.java index 6bc7077e31..68aeeb57e2 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AbstractSupervisorProjectIdeaPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AbstractSupervisorProjectIdeaPage.java @@ -16,11 +16,7 @@ public abstract class AbstractSupervisorProjectIdeaPage extends AbstractSupervis private void addSubMenu() { add( - new AbstractMenuPanel( - "menuPanel", - AbstractSupervisorProjectIdeaPage.class, - this.getClass() - ) { + new AbstractMenuPanel("menuPanel", AbstractSupervisorProjectIdeaPage.class, this.getClass()) { @Override protected MenuType getMenuType() { return MenuType.HORIZONTAL; @@ -30,21 +26,10 @@ public abstract class AbstractSupervisorProjectIdeaPage extends AbstractSupervis protected List<MenuItem> getItemList() { final List<MenuItem> items = new ArrayList<>(); items.add( - new MenuItem( - "My ideas", - SupervisorIdeaStartPage.class, - MenuHighlightSupervisorMyIdeas.class - ) - ); - items.add( - new MenuItem( - "View all supervisor ideas", - SupervisorNewAllSupervisorIdeasPage.class - ) - ); - items.add( - new MenuItem("View all student ideas", SupervisorAllStudentIdeasPage.class) + new MenuItem("My ideas", SupervisorIdeaStartPage.class, MenuHighlightSupervisorMyIdeas.class) ); + items.add(new MenuItem("View all supervisor ideas", SupervisorNewAllSupervisorIdeasPage.class)); + items.add(new MenuItem("View all student ideas", SupervisorAllStudentIdeasPage.class)); return items; } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java index db7d38bbe2..0f3e1e9b11 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java @@ -34,11 +34,7 @@ public class AcceptIdeaDialogPanel extends Panel { private IModel<ApplicationPeriod> applicationPeriod; - public AcceptIdeaDialogPanel( - String id, - IModel<Idea> model, - final IModel<ApplicationPeriod> applicationPeriod - ) { + public AcceptIdeaDialogPanel(String id, IModel<Idea> model, final IModel<ApplicationPeriod> applicationPeriod) { super(id, model); this.applicationPeriod = applicationPeriod; FeedbackPanel feedback = new FeedbackPanel("feedback"); @@ -54,13 +50,7 @@ public class AcceptIdeaDialogPanel extends Panel { public AcceptIdeaForm(String id, final IModel<Idea> model, FeedbackPanel feedback) { super(id, model); - add( - new IdeaDetailsPanel( - "details", - model, - model.getObject().getType() == Type.SUPERVISOR - ) - ); + add(new IdeaDetailsPanel("details", model, model.getObject().getType() == Type.SUPERVISOR)); addPartnerSelection(model); addProgramSelection(); addSelectButton(model, feedback); @@ -125,9 +115,7 @@ public class AcceptIdeaDialogPanel extends Panel { protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); AjaxCallListener ajaxCallListener = new AjaxCallListener(); - ajaxCallListener.onPrecondition( - "return confirm('Are you sure you want to select this idea?');" - ); + ajaxCallListener.onPrecondition("return confirm('Are you sure you want to select this idea?');"); attributes.getAjaxCallListeners().add(ajaxCallListener); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java index edaafe95ac..0f5d87b5b1 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java @@ -92,9 +92,7 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { container.add( new ListView<>( "languages", - new ListAdapterModel<>( - LambdaModel.of(model, Idea::getLanguages, Idea::setLanguages) - ) + new ListAdapterModel<>(LambdaModel.of(model, Idea::getLanguages, Idea::setLanguages)) ) { @Override protected void populateItem(final ListItem<Language> item) { @@ -117,9 +115,7 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { private void addDescAndPrereqs(WebMarkupContainer container, Idea idea) { Label prereqs = new Label( "reqs", - idea.getPrerequisites() != null - ? Model.of(idea.getPrerequisites()) - : new ResourceModel(NONE) + idea.getPrerequisites() != null ? Model.of(idea.getPrerequisites()) : new ResourceModel(NONE) ); prereqs.setVisible(idea.getType() == Type.SUPERVISOR); @@ -132,9 +128,7 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { private void addKeywords(WebMarkupContainer container, IModel<Idea> idea) { container.add( - new Label("noKeysLabel", "No keywords available").setVisible( - idea.getObject().getKeywords().isEmpty() - ) + new Label("noKeysLabel", "No keywords available").setVisible(idea.getObject().getKeywords().isEmpty()) ); container.add(new Label("keywords", new KeywordsModel(idea))); } @@ -147,17 +141,10 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { container.add( new EmployeeAutoCompleteDivPanel( "supervisorSelection", - LambdaModel.of( - ideaModel.map(Idea::getMatch), - Match::getSupervisor, - Match::setSupervisor - ) + LambdaModel.of(ideaModel.map(Idea::getMatch), Match::getSupervisor, Match::setSupervisor) ) { @Override - public void onNewEmployeeSelection( - AjaxRequestTarget target, - User newSelection - ) { + public void onNewEmployeeSelection(AjaxRequestTarget target, User newSelection) { Idea idea = ideaModel.getObject(); if ( targetService.hasTargetsLeft( @@ -166,16 +153,10 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { idea.getProjectType() ) ) { - ideaService.changeSupervisor( - idea, - newSelection, - SciProSession.get().getUser() - ); + ideaService.changeSupervisor(idea, newSelection, SciProSession.get().getUser()); info("Supervisor changed to: " + newSelection.getFullName()); } else { - error( - "Supervisor target numbers are reached. Unable to change supervisor." - ); + error("Supervisor target numbers are reached. Unable to change supervisor."); } target.add(feedback); target.add(container); @@ -186,9 +167,7 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { protected void onConfigure() { super.onConfigure(); Idea idea = ideaModel.getObject(); - setEnabled( - idea.getApplicationPeriod() != null && idea.getProjectType() != null - ); + setEnabled(idea.getApplicationPeriod() != null && idea.getProjectType() != null); } } ); @@ -212,10 +191,7 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { protected void onConfigure() { super.onConfigure(); Idea idea = getModelObject(); - setVisible( - idea.getType() == Type.STUDENT && - idea.getMatchStatus() == Idea.Status.MATCHED - ); + setVisible(idea.getType() == Type.STUDENT && idea.getMatchStatus() == Idea.Status.MATCHED); } }; container.add(unmatchButton); @@ -246,11 +222,7 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { authorsPanel.getModelObject() ); if (acceptance.getHead()) { - ideaService.setAuthors( - idea, - authorsPanel.getModelObject(), - SciProSession.get().getUser() - ); + ideaService.setAuthors(idea, authorsPanel.getModelObject(), SciProSession.get().getUser()); if (authorsPanel.getModelObject().isEmpty()) { info( "Authors " + @@ -290,11 +262,7 @@ public abstract class AdminIdeaDetailsCrudPanel extends Panel { first = false; authors.append(user.getFirstName()).append(' ').append(user.getLastName()); } else { - authors - .append(", ") - .append(user.getFirstName()) - .append(' ') - .append(user.getLastName()); + authors.append(", ").append(user.getFirstName()).append(' ').append(user.getLastName()); } } return authors.toString(); diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsPanel.java index 3d438e61d6..e3df91519b 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsPanel.java @@ -78,11 +78,7 @@ public abstract class AdminIdeaDetailsPanel extends Panel { add(historyLink); } - private void switchPanel( - AjaxRequestTarget target, - Panel replacePanel, - AjaxFallbackLink<Void> linkToUpdate - ) { + private void switchPanel(AjaxRequestTarget target, Panel replacePanel, AjaxFallbackLink<Void> linkToUpdate) { currentPanel.replaceWith(replacePanel); currentPanel = replacePanel; target.add(currentPanel); diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java index 6a2bbb20b0..bdce5a2d37 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java @@ -61,23 +61,12 @@ public class AdminIdeaHistoryPanel extends Panel { private List<IColumn<Match, String>> createColumns() { List<IColumn<Match, String>> columns = new ArrayList<>(); - columns.add( - new DateColumn<>( - Model.of("Date"), - Match::getDateCreated, - "dateCreated", - DateStyle.DATETIME - ) - ); + columns.add(new DateColumn<>(Model.of("Date"), Match::getDateCreated, "dateCreated", DateStyle.DATETIME)); columns.add(new EnumLambdaColumn<>(Model.of("Status"), "status", Match::getStatus)); columns.add( new AbstractColumn<>(Model.of("Supervisor"), "supervisor.fullName") { @Override - public void populateItem( - Item<ICellPopulator<Match>> item, - String componentId, - IModel<Match> rowModel - ) { + public void populateItem(Item<ICellPopulator<Match>> item, String componentId, IModel<Match> rowModel) { if (rowModel.getObject().getSupervisor() != null) { item.add( new UserLinkPanel( @@ -91,9 +80,7 @@ public class AdminIdeaHistoryPanel extends Panel { } } ); - columns.add( - new UserColumn<>(Model.of("Change made by"), "changedBy.fullName", Match::getChangedBy) - ); + columns.add(new UserColumn<>(Model.of("Change made by"), "changedBy.fullName", Match::getChangedBy)); return columns; } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java index def10a73fe..0d303299b5 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java @@ -35,19 +35,13 @@ public class AdminIdeaOverviewPanel extends AbstractAdminIdeaPanel { list.add( new AbstractExportableColumn<>(Model.of(HEADER_MEETING)) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String componentId, - IModel<Idea> ideaModel - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String componentId, IModel<Idea> ideaModel) { Idea idea = ideaModel.getObject(); if (idea.getFirstMeeting() != null) { item.add( new DateLabel( componentId, - ideaModel - .map(Idea::getFirstMeeting) - .map(FirstMeeting::getFirstMeetingDate) + ideaModel.map(Idea::getFirstMeeting).map(FirstMeeting::getFirstMeetingDate) ) ); } else { diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java index 11cfcead04..5da6b8e5f9 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java @@ -31,10 +31,7 @@ public class AdminIdeaPopupPage extends BasePage { add(ideaPopupPanel); add( - new ConfirmationLink<Void>( - "sendStatus", - Model.of("Are you sure you want to send the status e-mails?") - ) { + new ConfirmationLink<Void>("sendStatus", Model.of("Are you sure you want to send the status e-mails?")) { @Override public void onClick() { final IdeaService.Filter filter = ideaPopupPanel.getFilter(); @@ -86,8 +83,7 @@ public class AdminIdeaPopupPage extends BasePage { final MailEvent mailEvent = new MailEvent(); mailEvent.setRecipients(Collections.singleton(supervisor)); mailEvent.setSubject( - "Matched ideas for the period " + - filter.getApplicationPeriod().getName() + "Matched ideas for the period " + filter.getApplicationPeriod().getName() ); mailEvent.setMessageBody(message.toString()); mailEventService.save(mailEvent); diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java index c125abd8a0..0a7aa99670 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java @@ -45,9 +45,7 @@ public class AdminIdeaPopupPanel extends AbstractAdminIdeaPanel { final IModel<Idea> rowModel ) { if (rowModel.getObject().getType() == Idea.Type.STUDENT) { - final IModel<PreliminaryMatch> preliminaryMatch = getPreliminaryMatch( - rowModel - ); + final IModel<PreliminaryMatch> preliminaryMatch = getPreliminaryMatch(rowModel); cellItem.add(new PreliminaryCell(componentId, preliminaryMatch)); } else { cellItem.add(new EmptyPanel(componentId)); @@ -58,10 +56,7 @@ public class AdminIdeaPopupPanel extends AbstractAdminIdeaPanel { list.add( new AbstractExportableColumn<>(Model.of("\"Student idea form\"")) { @Override - protected Component createDisplayComponent( - final String componentId, - final IModel<?> dataModel - ) { + protected Component createDisplayComponent(final String componentId, final IModel<?> dataModel) { return new MultiLineLabel(componentId, dataModel); } @@ -78,10 +73,7 @@ public class AdminIdeaPopupPanel extends AbstractAdminIdeaPanel { appendIfNotEmpty("INTERESTS", TholanderBox::getInterests); } - private void appendIfNotEmpty( - String label, - Function<TholanderBox, String> f - ) { + private void appendIfNotEmpty(String label, Function<TholanderBox, String> f) { final String s = f.apply(rowModel.getObject().getTholanderBox()); if (s != null && !s.isBlank()) { stringBuilder.append(label).append(": ").append(s).append("\n\n"); @@ -133,11 +125,7 @@ public class AdminIdeaPopupPanel extends AbstractAdminIdeaPanel { add( new EmployeeAutoComplete( "supervisor", - LambdaModel.of( - model, - PreliminaryMatch::getSupervisor, - PreliminaryMatch::setSupervisor - ) + LambdaModel.of(model, PreliminaryMatch::getSupervisor, PreliminaryMatch::setSupervisor) ) { @Override protected void onInitialize() { @@ -156,13 +144,12 @@ public class AdminIdeaPopupPanel extends AbstractAdminIdeaPanel { } } ); - final AjaxFormComponentUpdatingBehavior saveOnChange = - new AjaxFormComponentUpdatingBehavior("input") { - @Override - protected void onUpdate(final AjaxRequestTarget target) { - preliminaryMatchService.save(model.getObject()); - } - }; + final AjaxFormComponentUpdatingBehavior saveOnChange = new AjaxFormComponentUpdatingBehavior("input") { + @Override + protected void onUpdate(final AjaxRequestTarget target) { + preliminaryMatchService.save(model.getObject()); + } + }; final TextArea<String> comment = new TextArea<>( "comment", LambdaModel.of(model, PreliminaryMatch::getComment, PreliminaryMatch::setComment) diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java index 907f9b9079..e72c9cc1b2 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java @@ -74,18 +74,11 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { } private List<Idea.Status> getStatusChoices() { - return asList( - Idea.Status.UNMATCHED, - Idea.Status.MATCHED, - Idea.Status.COMPLETED, - Idea.Status.INACTIVE - ); + return asList(Idea.Status.UNMATCHED, Idea.Status.MATCHED, Idea.Status.COMPLETED, Idea.Status.INACTIVE); } private void addDataTable() { - SortableDataProvider<ApplicationPeriod, String> provider = new GenericDataProvider<>( - applicationPeriodService - ); + SortableDataProvider<ApplicationPeriod, String> provider = new GenericDataProvider<>(applicationPeriodService); provider.setSort("startDate", SortOrder.DESCENDING); dataTable = new ExportableDataPanel<>(TABLE, createColumns(), provider); add(dataTable); @@ -95,11 +88,7 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { List<IColumn<ApplicationPeriod, String>> columns = new ArrayList<>(); columns.add( - new LambdaColumn<>( - new StringResourceModel("applicationPeriod", this), - "name", - ApplicationPeriod::getName - ) + new LambdaColumn<>(new StringResourceModel("applicationPeriod", this), "name", ApplicationPeriod::getName) ); columns.add(totalIdeasColumn()); for (ProjectType projectType : projectTypeService.findWithModule(ProjectModule.MATCH)) { @@ -110,24 +99,15 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { ) ); } - columns.add( - ideasByIdeaTypeColumn( - new StringResourceModel("supervisorIdeas", this), - Idea.Type.SUPERVISOR - ) - ); - columns.add( - ideasByIdeaTypeColumn(new StringResourceModel("studentIdeas", this), Idea.Type.STUDENT) - ); + columns.add(ideasByIdeaTypeColumn(new StringResourceModel("supervisorIdeas", this), Idea.Type.SUPERVISOR)); + columns.add(ideasByIdeaTypeColumn(new StringResourceModel("studentIdeas", this), Idea.Type.STUDENT)); columns.add(numberOfStudentsColumn()); return columns; } private AbstractExportableColumn<ApplicationPeriod, String> totalIdeasColumn() { - return new AbstractExportableColumn<>( - new ResourceModel("totalIdeas").wrapOnAssignment(this) - ) { + return new AbstractExportableColumn<>(new ResourceModel("totalIdeas").wrapOnAssignment(this)) { @Override public void populateItem( Item<ICellPopulator<ApplicationPeriod>> cellItem, @@ -137,20 +117,14 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { cellItem.add( new Label( componentId, - String.valueOf( - ideaService.countByApplicationPeriod(rowModel.getObject(), params) - ) + String.valueOf(ideaService.countByApplicationPeriod(rowModel.getObject(), params)) ) ); } @Override public IModel<String> getDataModel(IModel<ApplicationPeriod> rowModel) { - return Model.of( - String.valueOf( - ideaService.countByApplicationPeriod(rowModel.getObject(), params) - ) - ); + return Model.of(String.valueOf(ideaService.countByApplicationPeriod(rowModel.getObject(), params))); } }; } @@ -170,11 +144,7 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { new Label( id, String.valueOf( - ideaService.countByApplicationPeriodAndProjectType( - model.getObject(), - projectType, - params - ) + ideaService.countByApplicationPeriodAndProjectType(model.getObject(), projectType, params) ) ) ); @@ -184,21 +154,14 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { public IModel<String> getDataModel(IModel<ApplicationPeriod> rowModel) { return Model.of( String.valueOf( - ideaService.countByApplicationPeriodAndProjectType( - rowModel.getObject(), - projectType, - params - ) + ideaService.countByApplicationPeriodAndProjectType(rowModel.getObject(), projectType, params) ) ); } }; } - private IColumn<ApplicationPeriod, String> ideasByIdeaTypeColumn( - IModel<String> headerModel, - final Idea.Type type - ) { + private IColumn<ApplicationPeriod, String> ideasByIdeaTypeColumn(IModel<String> headerModel, final Idea.Type type) { return new AbstractExportableColumn<>(headerModel) { @Override public void populateItem( @@ -209,13 +172,7 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { cellItem.add( new Label( id, - String.valueOf( - ideaService.countByApplicationPeriodAndType( - model.getObject(), - type, - params - ) - ) + String.valueOf(ideaService.countByApplicationPeriodAndType(model.getObject(), type, params)) ) ); } @@ -223,22 +180,14 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { @Override public IModel<String> getDataModel(IModel<ApplicationPeriod> rowModel) { return Model.of( - String.valueOf( - ideaService.countByApplicationPeriodAndType( - rowModel.getObject(), - type, - params - ) - ) + String.valueOf(ideaService.countByApplicationPeriodAndType(rowModel.getObject(), type, params)) ); } }; } private AbstractColumn<ApplicationPeriod, String> numberOfStudentsColumn() { - return new AbstractExportableColumn<>( - new ResourceModel("numberOfStudents").wrapOnAssignment(this) - ) { + return new AbstractExportableColumn<>(new ResourceModel("numberOfStudents").wrapOnAssignment(this)) { @Override public void populateItem( Item<ICellPopulator<ApplicationPeriod>> item, @@ -248,9 +197,7 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { item.add( new Label( id, - String.valueOf( - ideaService.countAuthorsByApplicationPeriod(model.getObject(), params) - ) + String.valueOf(ideaService.countAuthorsByApplicationPeriod(model.getObject(), params)) ) ); } @@ -258,9 +205,7 @@ public class AdminIdeaStatisticsPage extends AbstractAdminStatisticsPage { @Override public IModel<String> getDataModel(IModel<ApplicationPeriod> rowModel) { return Model.of( - String.valueOf( - ideaService.countAuthorsByApplicationPeriod(rowModel.getObject(), params) - ) + String.valueOf(ideaService.countAuthorsByApplicationPeriod(rowModel.getObject(), params)) ); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java index 601834433e..b6857b051e 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java @@ -42,12 +42,7 @@ public class AdminIdeaStatusStatisticsPage extends AbstractAdminStatisticsPage { @Override protected void populateItem(final ListItem<Idea.Status> item) { item.add(new Label("status", item.getModelObject().toString())); - item.add( - new Label( - "total", - String.valueOf(ideaService.countIdeas(item.getModelObject(), null)) - ) - ); + item.add(new Label("total", String.valueOf(ideaService.countIdeas(item.getModelObject(), null)))); item.add( new ListView<>("projectTypes", getProjectTypes()) { @Override @@ -56,10 +51,7 @@ public class AdminIdeaStatusStatisticsPage extends AbstractAdminStatisticsPage { new Label( "value", String.valueOf( - ideaService.countIdeas( - item.getModelObject(), - projectType.getModelObject() - ) + ideaService.countIdeas(item.getModelObject(), projectType.getModelObject()) ) ) ); diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java index 59500487c1..bf749df1cb 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java @@ -95,18 +95,12 @@ public class AdminKeywordCrudPanel extends Panel { private List<IColumn<Keyword, String>> createColumns() { List<IColumn<Keyword, String>> columns = new ArrayList<>(); - columns.add( - new DateColumn<>(Model.of(DATE_CREATED), Keyword::getDateCreated, "dateCreated") - ); + columns.add(new DateColumn<>(Model.of(DATE_CREATED), Keyword::getDateCreated, "dateCreated")); columns.add(new LambdaColumn<>(Model.of(KEYWORD), "keyword", Keyword::getKeyword)); columns.add( new AbstractExportableColumn<>(Model.of(ACTIVE)) { @Override - public void populateItem( - Item<ICellPopulator<Keyword>> item, - String id, - final IModel<Keyword> model - ) { + public void populateItem(Item<ICellPopulator<Keyword>> item, String id, final IModel<Keyword> model) { final Keyword keyword = model.getObject(); final boolean state = !keyword.isDeleted(); item.add( diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminManageMatchPeriodsPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminManageMatchPeriodsPage.java index 3bca98fbb6..ac2cad7c3c 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminManageMatchPeriodsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminManageMatchPeriodsPage.java @@ -3,9 +3,7 @@ package se.su.dsv.scipro.match; import se.su.dsv.scipro.applicationperiod.AdminApplicationPeriodsPanel; import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAdminApplicationPeriod; -public class AdminManageMatchPeriodsPage - extends AbstractAdminMatchPage - implements MenuHighlightAdminApplicationPeriod { +public class AdminManageMatchPeriodsPage extends AbstractAdminMatchPage implements MenuHighlightAdminApplicationPeriod { public static final String PANEL = "dp"; diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java index 56221f6216..37b2c94c6a 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java @@ -94,9 +94,7 @@ public class AdminProgramPage extends AbstractAdminMatchPage { String componentId, IModel<Program> rowModel ) { - String hasExternalIdentifier = (rowModel.getObject().getExternalId() == null) - ? "No" - : "Yes"; + String hasExternalIdentifier = (rowModel.getObject().getExternalId() == null) ? "No" : "Yes"; cellItem.add(new Label(componentId, Model.of(hasExternalIdentifier))); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java index 8c3d5232d4..aae587e0b2 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java @@ -86,9 +86,7 @@ public class AdminResearchAreaCrudPanel extends Panel { } private void addDataTable() { - SortableDataProvider<ResearchArea, String> provider = new GenericDataProvider<>( - researchAreaService - ); + SortableDataProvider<ResearchArea, String> provider = new GenericDataProvider<>(researchAreaService); provider.setSort("title", SortOrder.DESCENDING); dataTable = new ExportableDataPanel<>(DATA_TABLE, createColumns(), provider); dataTable.setOutputMarkupId(true); @@ -119,9 +117,7 @@ public class AdminResearchAreaCrudPanel extends Panel { String componentId, IModel<ResearchArea> rowModel ) { - String hasExternalIdentifier = (rowModel.getObject().getIdentifier() == null) - ? "No" - : "Yes"; + String hasExternalIdentifier = (rowModel.getObject().getIdentifier() == null) ? "No" : "Yes"; cellItem.add(new Label(componentId, Model.of(hasExternalIdentifier))); } }; @@ -130,28 +126,17 @@ public class AdminResearchAreaCrudPanel extends Panel { private AbstractExportableColumn<ResearchArea, String> getSupervisorRelationships() { return new AbstractExportableColumn<>(Model.of("Supervisor relationships")) { @Override - public void populateItem( - Item<ICellPopulator<ResearchArea>> item, - String id, - IModel<ResearchArea> model - ) { - final Long supervisorCount = supervisorService.countByResearchArea( - model.getObject() - ); + public void populateItem(Item<ICellPopulator<ResearchArea>> item, String id, IModel<ResearchArea> model) { + final Long supervisorCount = supervisorService.countByResearchArea(model.getObject()); item.add( new LabelAndLinkColumn<>(id, model, "Details") { @Override public void onClick(AjaxRequestTarget target, IModel<ResearchArea> model) { modalWindowPlus.setContent( - new AdminResearchAreaSupervisorPanel( - modalWindowPlus.getContentId(), - model - ) + new AdminResearchAreaSupervisorPanel(modalWindowPlus.getContentId(), model) ); modalWindowPlus.setTitle( - "Research area " + - model.getObject().getTitle() + - " supervisors relationships" + "Research area " + model.getObject().getTitle() + " supervisors relationships" ); modalWindowPlus.show(target); } @@ -174,26 +159,17 @@ public class AdminResearchAreaCrudPanel extends Panel { private AbstractExportableColumn<ResearchArea, String> getKeywordRelationships() { return new AbstractExportableColumn<>(Model.of("Keyword relationships")) { @Override - public void populateItem( - Item<ICellPopulator<ResearchArea>> item, - String id, - IModel<ResearchArea> model - ) { + public void populateItem(Item<ICellPopulator<ResearchArea>> item, String id, IModel<ResearchArea> model) { final Long keywordCount = keywordService.countByResearchArea(model.getObject()); item.add( new LabelAndLinkColumn<>(id, model, "Details") { @Override public void onClick(AjaxRequestTarget target, IModel<ResearchArea> model) { modalWindowPlus.setContent( - new AdminResearchAreaKeywordPanel( - modalWindowPlus.getContentId(), - model - ) + new AdminResearchAreaKeywordPanel(modalWindowPlus.getContentId(), model) ); modalWindowPlus.setTitle( - "Research area " + - model.getObject().getTitle() + - " keyword relationships" + "Research area " + model.getObject().getTitle() + " keyword relationships" ); modalWindowPlus.show(target); } @@ -214,16 +190,10 @@ public class AdminResearchAreaCrudPanel extends Panel { } private ClickableIconColumn<ResearchArea> getEditKeywords() { - return new ClickableIconColumn<>( - Model.of("Edit keyword relationships"), - null, - ClickableIconColumn.EDIT - ) { + return new ClickableIconColumn<>(Model.of("Edit keyword relationships"), null, ClickableIconColumn.EDIT) { @Override protected void onClick(IModel<ResearchArea> clicked, AjaxRequestTarget target) { - modalWindowPlus.setTitle( - "Edit keyword relationships: " + clicked.getObject().getTitle() - ); + modalWindowPlus.setTitle("Edit keyword relationships: " + clicked.getObject().getTitle()); modalWindowPlus.setContent( new AdminResearchAreaEditPanel(modalWindowPlus.getContentId(), clicked) { @Override @@ -238,11 +208,7 @@ public class AdminResearchAreaCrudPanel extends Panel { } private ClickableIconColumn<ResearchArea> getEdit() { - return new ClickableIconColumn<>( - Model.of("Edit research area"), - null, - ClickableIconColumn.EDIT - ) { + return new ClickableIconColumn<>(Model.of("Edit research area"), null, ClickableIconColumn.EDIT) { @Override protected void onClick(IModel<ResearchArea> clicked, AjaxRequestTarget target) { modalWindowPlus.setTitle("Edit research area: " + clicked.getObject().getTitle()); @@ -285,9 +251,7 @@ public class AdminResearchAreaCrudPanel extends Panel { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - keywordService.countByResearchArea(rowModel.getObject()) < 1 - ); + setVisibilityAllowed(keywordService.countByResearchArea(rowModel.getObject()) < 1); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java index 92e4470c9f..cb9a1c2d05 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java @@ -37,10 +37,7 @@ public abstract class AdminResearchAreaEditPanel extends GenericPanel<ResearchAr KeywordAutoComplete autoComplete = new KeywordAutoComplete("inputField") { @Override protected void action(AjaxRequestTarget pTarget, Keyword newSelection) { - keywordService.addConnection( - newSelection, - AdminResearchAreaEditPanel.this.getModelObject() - ); + keywordService.addConnection(newSelection, AdminResearchAreaEditPanel.this.getModelObject()); info( "Relation added, Keyword: " + newSelection.getKeyword() + @@ -65,9 +62,7 @@ public abstract class AdminResearchAreaEditPanel extends GenericPanel<ResearchAr item.add( new AjaxConfirmationLink<Void>( "removeLink", - "Are you sure you want to delete the relationship to " + - keyword.getKeyword() + - "?" + "Are you sure you want to delete the relationship to " + keyword.getKeyword() + "?" ) { @Override public void onClick(AjaxRequestTarget target) { diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java index 22597e047c..2a7cd04bd3 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java @@ -33,10 +33,7 @@ public class AdminResearchAreaKeywordPanel extends Panel { @Override public Iterator<Keyword> iterator(long first, long count) { return keywordService - .findByResearchArea( - areaModel.getObject(), - new PageAdapter(first, count, getSort()) - ) + .findByResearchArea(areaModel.getObject(), new PageAdapter(first, count, getSort())) .iterator(); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java index 36f7130660..2c9c84346c 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java @@ -35,10 +35,7 @@ public class AdminResearchAreaSupervisorPanel extends Panel { @Override public Iterator<? extends User> iterator(long first, long count) { return supervisorService - .findByResearchArea( - areaModel.getObject(), - new PageAdapter(first, count, getSort()) - ) + .findByResearchArea(areaModel.getObject(), new PageAdapter(first, count, getSort())) .iterator(); } @@ -60,9 +57,7 @@ public class AdminResearchAreaSupervisorPanel extends Panel { List<IColumn<User, String>> columns = new ArrayList<>(); columns.add(new LambdaColumn<>(Model.of("First name"), "firstName", User::getFirstName)); columns.add(new LambdaColumn<>(Model.of("Last name"), "lastName", User::getLastName)); - columns.add( - new LambdaColumn<>(Model.of("E-mail address"), "emailAddress", User::getEmailAddress) - ); + columns.add(new LambdaColumn<>(Model.of("E-mail address"), "emailAddress", User::getEmailAddress)); return columns; } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java index 8345d6dac3..2df36c77ff 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java @@ -67,10 +67,7 @@ public class AdminUnitPage extends AbstractAdminMatchPage { modalWindowPlus.setTitle("Create new unit"); Unit unit = new Unit(); modalWindowPlus.setContent( - new EditUnitPanel( - modalWindowPlus.getContentId(), - new DetachableServiceModel<>(unitService, unit) - ) { + new EditUnitPanel(modalWindowPlus.getContentId(), new DetachableServiceModel<>(unitService, unit)) { @Override public void onSave(AjaxRequestTarget target) { target.add(dp); @@ -94,20 +91,12 @@ public class AdminUnitPage extends AbstractAdminMatchPage { String componentId, IModel<Unit> rowModel ) { - String hasExternalIdentifier = (rowModel.getObject().getIdentifier() == null) - ? "No" - : "Yes"; + String hasExternalIdentifier = (rowModel.getObject().getIdentifier() == null) ? "No" : "Yes"; cellItem.add(new Label(componentId, Model.of(hasExternalIdentifier))); } } ); - columns.add( - new LambdaColumn<>( - Model.of("Match responsible"), - "matchResponsible", - Unit::getMatchResponsible - ) - ); + columns.add(new LambdaColumn<>(Model.of("Match responsible"), "matchResponsible", Unit::getMatchResponsible)); columns.add( new ClickableIconColumn<>(Model.of("Edit unit"), null, ClickableIconColumn.EDIT) { @Override diff --git a/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java index b03721e226..12fbbd875a 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java @@ -79,11 +79,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new AjaxCheckBoxMultipleChoice<>( "statusFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getStatuses, - IdeaService.Filter::setStatuses - ), + LambdaModel.of(getModel(), IdeaService.Filter::getStatuses, IdeaService.Filter::setStatuses), getStatusChoices(), new EnumChoiceRenderer<>(AjaxIdeaFilterPanel.this) ) { @@ -103,11 +99,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new AjaxCheckBoxMultipleChoice<>( "typeFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getTypes, - IdeaService.Filter::setTypes - ), + LambdaModel.of(getModel(), IdeaService.Filter::getTypes, IdeaService.Filter::setTypes), asList(Idea.Type.STUDENT, Idea.Type.SUPERVISOR), new EnumChoiceRenderer<>(AjaxIdeaFilterPanel.this) ) { @@ -123,11 +115,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new AjaxCheckBoxMultipleChoice<>( "projectTypeFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getLevels, - IdeaService.Filter::setLevels - ), + LambdaModel.of(getModel(), IdeaService.Filter::getLevels, IdeaService.Filter::setLevels), projectTypeService.findWithModule(ProjectModule.MATCH), new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) ) { @@ -143,11 +131,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new AjaxDropDownChoice<>( "unitFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getUnit, - IdeaService.Filter::setUnit - ), + LambdaModel.of(getModel(), IdeaService.Filter::getUnit, IdeaService.Filter::setUnit), unitService.findAll(), new LambdaChoiceRenderer<>(Unit::getTitle, Unit::getId) ) { @@ -189,11 +173,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new AjaxDropDownChoice<>( "areaFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getResearchArea, - IdeaService.Filter::setResearchArea - ), + LambdaModel.of(getModel(), IdeaService.Filter::getResearchArea, IdeaService.Filter::setResearchArea), researchAreaService.findNotDeleted(), new LambdaChoiceRenderer<>(ResearchArea::getTitle, ResearchArea::getId) ) { @@ -201,8 +181,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte public void onNewSelection(AjaxRequestTarget target, ResearchArea objectSelected) { filterChanged(target); keywordPanel.setVisible( - objectSelected != null && - !keywordService.findByResearchArea(objectSelected).isEmpty() + objectSelected != null && !keywordService.findByResearchArea(objectSelected).isEmpty() ); target.add(keywordPanel); } @@ -214,11 +193,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new EmployeeAutoComplete( "supervisorFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getSupervisor, - IdeaService.Filter::setSupervisor - ) + LambdaModel.of(getModel(), IdeaService.Filter::getSupervisor, IdeaService.Filter::setSupervisor) ) { @Override protected void action(AjaxRequestTarget target, User employee) { @@ -232,11 +207,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new AuthorAutoComplete( "authorFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getAuthor, - IdeaService.Filter::setAuthor - ) + LambdaModel.of(getModel(), IdeaService.Filter::getAuthor, IdeaService.Filter::setAuthor) ) { @Override protected void action(AjaxRequestTarget target, User newSelection) { @@ -250,11 +221,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new ProgramAutoComplete( "programFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getProgram, - IdeaService.Filter::setProgram - ) + LambdaModel.of(getModel(), IdeaService.Filter::getProgram, IdeaService.Filter::setProgram) ) { @Override protected void action(AjaxRequestTarget target, Program object) { @@ -300,30 +267,26 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte private void newApplicationPeriodFilter() { List<ApplicationPeriod> list = applicationPeriodService.findAll(); list.sort(Comparator.comparing(ApplicationPeriod::getStartDate).reversed()); - final AjaxDropDownChoice<ApplicationPeriod> applicationPeriodAjaxDropDownChoice = - new AjaxDropDownChoice<>( - "applicationPeriodFilter", - LambdaModel.of( - getModel(), - IdeaService.Filter::getApplicationPeriod, - IdeaService.Filter::setApplicationPeriod - ), - list, - new LambdaChoiceRenderer<>(ApplicationPeriod::getName, ApplicationPeriod::getId) - ) { - @Override - public void onNewSelection( - AjaxRequestTarget target, - ApplicationPeriod objectSelected - ) { - filterChanged(target); - getSession() - .setMetaData( - PRESELECTED_APPLICATION_PERIOD, - objectSelected != null ? objectSelected.getId() : null - ); - } - }; + final AjaxDropDownChoice<ApplicationPeriod> applicationPeriodAjaxDropDownChoice = new AjaxDropDownChoice<>( + "applicationPeriodFilter", + LambdaModel.of( + getModel(), + IdeaService.Filter::getApplicationPeriod, + IdeaService.Filter::setApplicationPeriod + ), + list, + new LambdaChoiceRenderer<>(ApplicationPeriod::getName, ApplicationPeriod::getId) + ) { + @Override + public void onNewSelection(AjaxRequestTarget target, ApplicationPeriod objectSelected) { + filterChanged(target); + getSession() + .setMetaData( + PRESELECTED_APPLICATION_PERIOD, + objectSelected != null ? objectSelected.getId() : null + ); + } + }; applicationPeriodAjaxDropDownChoice.setNullValid(true); add(applicationPeriodAjaxDropDownChoice); } @@ -332,11 +295,7 @@ public abstract class AjaxIdeaFilterPanel extends GenericPanel<IdeaService.Filte add( new AjaxCheckBox( "noFirstMeeting", - LambdaModel.of( - getModel(), - IdeaService.Filter::getNoFirstMeeting, - IdeaService.Filter::setNoFirstMeeting - ) + LambdaModel.of(getModel(), IdeaService.Filter::getNoFirstMeeting, IdeaService.Filter::setNoFirstMeeting) ) { @Override protected void onUpdate(final AjaxRequestTarget target) { diff --git a/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java b/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java index b80b4c0f80..a6b43ea949 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java @@ -98,13 +98,7 @@ public class CompleteIdeaDialogPanel extends GenericPanel<Idea> { ).map(GeneralSystemSettings::getActiveProjectIdeaSupportMail); activePartnerProjectWarning = new WebMarkupContainer("activePartnerProjectWarning") { { - add( - new ExternalLink( - "supportMail", - supportMail.map(mail -> "mailto:" + mail), - supportMail - ) - ); + add(new ExternalLink("supportMail", supportMail.map(mail -> "mailto:" + mail), supportMail)); } @Override @@ -115,10 +109,7 @@ public class CompleteIdeaDialogPanel extends GenericPanel<Idea> { .getModelObject() .stream() .map(partner -> - projectService.getActiveProjectsByUserAndProjectType( - partner, - selectedProjectType - ) + projectService.getActiveProjectsByUserAndProjectType(partner, selectedProjectType) ) .flatMap(Collection::stream) .findAny() @@ -154,11 +145,7 @@ public class CompleteIdeaDialogPanel extends GenericPanel<Idea> { public void renderHead(IHeaderResponse response) { super.renderHead(response); response.render( - OnEventHeaderItem.forMarkupId( - "cidp_program_toggle", - "click", - "$('#cidp_program').toggle()" - ) + OnEventHeaderItem.forMarkupId("cidp_program_toggle", "click", "$('#cidp_program').toggle()") ); } @@ -196,17 +183,8 @@ public class CompleteIdeaDialogPanel extends GenericPanel<Idea> { } final ProjectType projectType = getModelObject().getProjectType(); for (User partner : partners) { - if ( - !projectService - .getActiveProjectsByUserAndProjectType(partner, projectType) - .isEmpty() - ) { - error( - getString( - "partner.already.has.an.active.project.on.this.level", - Model.of(partner) - ) - ); + if (!projectService.getActiveProjectsByUserAndProjectType(partner, projectType).isEmpty()) { + error(getString("partner.already.has.an.active.project.on.this.level", Model.of(partner))); } } if ( @@ -231,11 +209,7 @@ public class CompleteIdeaDialogPanel extends GenericPanel<Idea> { authors.add(SciProSession.get().getUser()); authors.addAll(coAuthorChoice.getModelObject()); ideaService.setAuthors(idea, authors, SciProSession.get().getUser()); - ideaService.savePartnerProgram( - idea, - getCurrentUser(), - programDropDownChoice.getModelObject() - ); + ideaService.savePartnerProgram(idea, getCurrentUser(), programDropDownChoice.getModelObject()); ideaService.save(idea); success(getString("idea.updated")); } @@ -252,25 +226,13 @@ public class CompleteIdeaDialogPanel extends GenericPanel<Idea> { @Override protected void onConfigure() { super.onConfigure(); - setVisible( - applicationPeriodService.isOpen(getModelObject().getApplicationPeriod()) - ); + setVisible(applicationPeriodService.isOpen(getModelObject().getApplicationPeriod())); } }; - unselect.add( - new JavascriptEventConfirmation( - "click", - new ResourceModel("unselect_idea_confirmation") - ) - ); + unselect.add(new JavascriptEventConfirmation("click", new ResourceModel("unselect_idea_confirmation"))); add(unselect); - add( - new Label( - "research_area", - model.map(Idea::getResearchArea).map(ResearchArea::getTitle) - ) - ); + add(new Label("research_area", model.map(Idea::getResearchArea).map(ResearchArea::getTitle))); add( new ListView<>("keywords", model.map(Idea::getKeywords).map(ArrayList::new)) { diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java index ac436ffb0b..7f74350cb6 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java @@ -89,11 +89,7 @@ public abstract class EditKeywordPanel extends Panel { item.add( new Label( "title", - LambdaModel.of( - item.getModel(), - ResearchArea::getTitle, - ResearchArea::setTitle - ) + LambdaModel.of(item.getModel(), ResearchArea::getTitle, ResearchArea::setTitle) ) ); item.add( @@ -121,8 +117,7 @@ public abstract class EditKeywordPanel extends Panel { } ); - FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered() - ); + FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered()); feedback.setOutputMarkupId(true); wmc.add(feedback); @@ -149,9 +144,7 @@ public abstract class EditKeywordPanel extends Panel { ); } - private IModel<List<ResearchArea>> getSelectableResearchAreas( - List<ResearchArea> currentAreas - ) { + private IModel<List<ResearchArea>> getSelectableResearchAreas(List<ResearchArea> currentAreas) { return LoadableDetachableModel.of(() -> { List<ResearchArea> notDeleted = researchAreaService.findNotDeleted(); ArrayList<ResearchArea> selectable = new ArrayList<>(notDeleted); diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java index bf00e7d1fe..13fadc0177 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java @@ -53,8 +53,7 @@ public abstract class EditProgramPanel extends Panel { wmc.add(code); wmc.add(new ComponentFeedbackPanel("codeFeedback", code)); - FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered() - ); + FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered()); feedback.setOutputMarkupId(true); wmc.add(feedback); @@ -64,9 +63,7 @@ public abstract class EditProgramPanel extends Panel { new AjaxButton("save") { @Override protected void onSubmit(AjaxRequestTarget target) { - ProgramForm.this.setModelObject( - programService.save(ProgramForm.this.getModelObject()) - ); + ProgramForm.this.setModelObject(programService.save(ProgramForm.this.getModelObject())); info("Saved"); target.add(wmc); onSave(target); diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java index 110234d32c..63f7bccec6 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java @@ -40,8 +40,7 @@ public abstract class EditResearchAreaPanel extends Panel { wmc.add(researchArea); wmc.add(new ComponentFeedbackPanel("researchAreaFeedback", researchArea)); - FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered() - ); + FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered()); feedback.setOutputMarkupId(true); wmc.add(feedback); diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java index 57e9944c39..663f8cfba2 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java @@ -51,8 +51,7 @@ public abstract class EditUnitPanel extends Panel { wmc.add(matchResponsible); wmc.add(new ComponentFeedbackPanel("matchResponsibleFeedback", matchResponsible)); - FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered() - ); + FeedbackPanel feedback = new FeedbackPanel("feedback", message -> !message.isRendered()); feedback.setOutputMarkupId(true); wmc.add(feedback); @@ -62,9 +61,7 @@ public abstract class EditUnitPanel extends Panel { new AjaxButton("save") { @Override protected void onSubmit(AjaxRequestTarget target) { - UnitForm.this.setModelObject( - unitService.save(UnitForm.this.getModelObject()) - ); + UnitForm.this.setModelObject(unitService.save(UnitForm.this.getModelObject())); info("Saved"); target.add(wmc); onSave(target); diff --git a/view/src/main/java/se/su/dsv/scipro/match/IdeaAuthorInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/match/IdeaAuthorInfoPanel.java index 20dc856d53..774f584048 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/IdeaAuthorInfoPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/IdeaAuthorInfoPanel.java @@ -13,15 +13,10 @@ public class IdeaAuthorInfoPanel extends GenericPanel<Idea> { public IdeaAuthorInfoPanel(String id, IModel<Idea> model) { super(id, model); add( - new ListView<>( - "authors", - new ListAdapterModel<>(model.map(Idea::getIdeaParticipations)) - ) { + new ListView<>("authors", new ListAdapterModel<>(model.map(Idea::getIdeaParticipations))) { @Override protected void populateItem(ListItem<IdeaParticipation> item) { - item.add( - new UserLabel("user", item.getModel().map(IdeaParticipation::getUser)) - ); + item.add(new UserLabel("user", item.getModel().map(IdeaParticipation::getUser))); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/match/IdeaDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/match/IdeaDetailsPanel.java index a6dec9b2e8..7afbe8fd28 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/IdeaDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/IdeaDetailsPanel.java @@ -22,9 +22,7 @@ public class IdeaDetailsPanel extends Panel { add( new ListView<>( "languages", - new ListAdapterModel<>( - LambdaModel.of(model, Idea::getLanguages, Idea::setLanguages) - ) + new ListAdapterModel<>(LambdaModel.of(model, Idea::getLanguages, Idea::setLanguages)) ) { @Override protected void populateItem(final ListItem<Language> item) { @@ -72,11 +70,7 @@ public class IdeaDetailsPanel extends Panel { } private void addKeywords(IModel<Idea> model) { - add( - new Label("noKeysLabel", "No keywords available").setVisible( - model.getObject().getKeywords().isEmpty() - ) - ); + add(new Label("noKeysLabel", "No keywords available").setVisible(model.getObject().getKeywords().isEmpty())); add(new Label("keywords", new KeywordsModel(model))); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/IdeaDownloadPanel.java b/view/src/main/java/se/su/dsv/scipro/match/IdeaDownloadPanel.java index 88c59e21f3..11a7f0479c 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/IdeaDownloadPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/IdeaDownloadPanel.java @@ -29,30 +29,10 @@ public class IdeaDownloadPanel extends GenericPanel<Idea> { StringBuilder sb = new StringBuilder("<<IDEA SPECIFICATION>>"); String separator = System.getProperty("line.separator"); sb.append(separator).append(separator); - sb - .append("Title: ") - .append(separator) - .append(idea.getTitle()) - .append(separator) - .append(separator); - sb - .append("Description: ") - .append(separator) - .append(idea.getDescription()) - .append(separator) - .append(separator); - sb - .append("Type: ") - .append(separator) - .append(idea.getType()) - .append(separator) - .append(separator); - sb - .append("Language: ") - .append(separator) - .append(getLanguageNames(idea)) - .append(separator) - .append(separator); + sb.append("Title: ").append(separator).append(idea.getTitle()).append(separator).append(separator); + sb.append("Description: ").append(separator).append(idea.getDescription()).append(separator).append(separator); + sb.append("Type: ").append(separator).append(idea.getType()).append(separator).append(separator); + sb.append("Language: ").append(separator).append(getLanguageNames(idea)).append(separator).append(separator); sb .append("Prerequisites: ") .append(separator) @@ -67,24 +47,12 @@ public class IdeaDownloadPanel extends GenericPanel<Idea> { .append(separator) .append(separator); } - sb - .append("Keywords: ") - .append(separator) - .append(idea.getKeywordNames()) - .append(separator) - .append(separator); - sb - .append("Authors: ") - .append(separator) - .append(idea.getAuthorNames()) - .append(separator) - .append(separator); + sb.append("Keywords: ").append(separator).append(idea.getKeywordNames()).append(separator).append(separator); + sb.append("Authors: ").append(separator).append(idea.getAuthorNames()).append(separator).append(separator); sb .append("Application period: ") .append(separator) - .append( - idea.getApplicationPeriod() == null ? "" : idea.getApplicationPeriod().getName() - ) + .append(idea.getApplicationPeriod() == null ? "" : idea.getApplicationPeriod().getName()) .append(separator) .append(separator); sb.append("<<\"Student idea form\">>").append(separator).append(separator); @@ -112,11 +80,7 @@ public class IdeaDownloadPanel extends GenericPanel<Idea> { .append(idea.getTholanderBox().getMethod()) .append(separator) .append(separator); - sb - .append("Interests? ") - .append(separator) - .append(idea.getTholanderBox().getInterests()) - .append(separator); + sb.append("Interests? ").append(separator).append(idea.getTholanderBox().getInterests()).append(separator); return sb.toString(); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/IdeaExportPanel.java b/view/src/main/java/se/su/dsv/scipro/match/IdeaExportPanel.java index e20cf8536c..21df7c2059 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/IdeaExportPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/IdeaExportPanel.java @@ -16,8 +16,6 @@ public class IdeaExportPanel extends GenericPanel<Idea> { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - getModelObject().isExported() && !getModelObject().wasExportSuccessful() - ); + setVisibilityAllowed(getModelObject().isExported() && !getModelObject().wasExportSuccessful()); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderCompletionPanel.java b/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderCompletionPanel.java index b6be25a22f..26d4ce15c0 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderCompletionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderCompletionPanel.java @@ -12,27 +12,17 @@ public class IdeaTholanderCompletionPanel extends Panel { super(id, model); final IModel<TholanderBox> tholanderBox = model.map(Idea::getTholanderBox); - final StringValidator lengthValidator = StringValidator.maximumLength( - TholanderBox.MAX_CHARS - ); + final StringValidator lengthValidator = StringValidator.maximumLength(TholanderBox.MAX_CHARS); add( new TextArea<>( "background", - LambdaModel.of( - tholanderBox, - TholanderBox::getBackground, - TholanderBox::setBackground - ) + LambdaModel.of(tholanderBox, TholanderBox::getBackground, TholanderBox::setBackground) ).add(lengthValidator) ); add( new TextArea<>( "literature", - LambdaModel.of( - tholanderBox, - TholanderBox::getLiterature, - TholanderBox::setLiterature - ) + LambdaModel.of(tholanderBox, TholanderBox::getLiterature, TholanderBox::setLiterature) ).add(lengthValidator) ); add( diff --git a/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderInfoPanel.java index 31df6caf0f..4ebd630bcb 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderInfoPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/IdeaTholanderInfoPanel.java @@ -7,9 +7,7 @@ import org.apache.wicket.model.IModel; public class IdeaTholanderInfoPanel extends GenericPanel<Idea> { - private static final java.util.Date WATSON_TO_THOLANDER_SWITCH = new java.util.Date( - 1475591820000L - ); + private static final java.util.Date WATSON_TO_THOLANDER_SWITCH = new java.util.Date(1475591820000L); public IdeaTholanderInfoPanel(String id, IModel<Idea> model) { super(id, model); @@ -17,9 +15,7 @@ public class IdeaTholanderInfoPanel extends GenericPanel<Idea> { @Override protected void onConfigure() { super.onConfigure(); - setVisible( - getModelObject().getMatch().getDateCreated().before(WATSON_TO_THOLANDER_SWITCH) - ); + setVisible(getModelObject().getMatch().getDateCreated().before(WATSON_TO_THOLANDER_SWITCH)); } }; add(watson); @@ -27,37 +23,23 @@ public class IdeaTholanderInfoPanel extends GenericPanel<Idea> { watson.add(new Label("what", replaceEmpty(watsonModel.map(Watson::getWhat)))); watson.add(new Label("why", replaceEmpty(watsonModel.map(Watson::getWhy)))); watson.add(new Label("theoryHow", replaceEmpty(watsonModel.map(Watson::getTheoryHow)))); - watson.add( - new Label("practicalHow", replaceEmpty(watsonModel.map(Watson::getPracticalHow))) - ); + watson.add(new Label("practicalHow", replaceEmpty(watsonModel.map(Watson::getPracticalHow)))); watson.add(new Label("literature", replaceEmpty(watsonModel.map(Watson::getLiterature)))); final WebMarkupContainer tholander = new WebMarkupContainer("tholander") { @Override protected void onConfigure() { super.onConfigure(); - setVisible( - getModelObject().getMatch().getDateCreated().after(WATSON_TO_THOLANDER_SWITCH) - ); + setVisible(getModelObject().getMatch().getDateCreated().after(WATSON_TO_THOLANDER_SWITCH)); } }; add(tholander); final IModel<TholanderBox> tholanderModel = model.map(Idea::getTholanderBox); - tholander.add( - new Label("background", replaceEmpty(tholanderModel.map(TholanderBox::getBackground))) - ); - tholander.add( - new Label("literature", replaceEmpty(tholanderModel.map(TholanderBox::getLiterature))) - ); - tholander.add( - new Label("problem", replaceEmpty(tholanderModel.map(TholanderBox::getProblem))) - ); - tholander.add( - new Label("method", replaceEmpty(tholanderModel.map(TholanderBox::getMethod))) - ); - tholander.add( - new Label("interests", replaceEmpty(tholanderModel.map(TholanderBox::getInterests))) - ); + tholander.add(new Label("background", replaceEmpty(tholanderModel.map(TholanderBox::getBackground)))); + tholander.add(new Label("literature", replaceEmpty(tholanderModel.map(TholanderBox::getLiterature)))); + tholander.add(new Label("problem", replaceEmpty(tholanderModel.map(TholanderBox::getProblem)))); + tholander.add(new Label("method", replaceEmpty(tholanderModel.map(TholanderBox::getMethod)))); + tholander.add(new Label("interests", replaceEmpty(tholanderModel.map(TholanderBox::getInterests)))); } private IModel<String> replaceEmpty(final IModel<String> inner) { diff --git a/view/src/main/java/se/su/dsv/scipro/match/KeywordFilterPanel.java b/view/src/main/java/se/su/dsv/scipro/match/KeywordFilterPanel.java index 3cf8cd6ebf..36d20e7a36 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/KeywordFilterPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/KeywordFilterPanel.java @@ -27,11 +27,7 @@ public class KeywordFilterPanel extends GenericPanel<Set<Keyword>> { this(id, model, null); } - public KeywordFilterPanel( - String id, - IModel<Set<Keyword>> selectable, - IModel<List<Keyword>> selected - ) { + public KeywordFilterPanel(String id, IModel<Set<Keyword>> selectable, IModel<List<Keyword>> selected) { super(id, selectable); if (selected != null && selected.getObject() != null) { this.selection = selected.getObject(); @@ -40,10 +36,7 @@ public class KeywordFilterPanel extends GenericPanel<Set<Keyword>> { add( new PaletteForm( FORM, - LambdaModel.<List<Keyword>>of( - () -> selection, - newSelection -> selection = newSelection - ), + LambdaModel.<List<Keyword>>of(() -> selection, newSelection -> selection = newSelection), selectable ) ); @@ -57,27 +50,13 @@ public class KeywordFilterPanel extends GenericPanel<Set<Keyword>> { private class PaletteForm extends Form<Set<Keyword>> { - public PaletteForm( - String id, - IModel<List<Keyword>> selection, - IModel<Set<Keyword>> choices - ) { + public PaletteForm(String id, IModel<List<Keyword>> selection, IModel<Set<Keyword>> choices) { super(id, choices); add(getPalette(selection, choices)); } - private Palette<Keyword> getPalette( - IModel<List<Keyword>> selection, - IModel<Set<Keyword>> choices - ) { - return new CSPPalette<>( - PALETTE, - selection, - choices, - getRenderer(), - DEFAULT_ROWS, - false - ) { + private Palette<Keyword> getPalette(IModel<List<Keyword>> selection, IModel<Set<Keyword>> choices) { + return new CSPPalette<>(PALETTE, selection, choices, getRenderer(), DEFAULT_ROWS, false) { @Override protected Recorder<Keyword> newRecorderComponent() { Recorder<Keyword> recorder = super.newRecorderComponent(); diff --git a/view/src/main/java/se/su/dsv/scipro/match/KeywordsModel.java b/view/src/main/java/se/su/dsv/scipro/match/KeywordsModel.java index 37530925e1..f6d18112c8 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/KeywordsModel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/KeywordsModel.java @@ -14,12 +14,7 @@ class KeywordsModel extends LoadableDetachableModel<String> { @Override protected String load() { - return idea - .getObject() - .getKeywords() - .stream() - .map(Keyword::getKeyword) - .collect(Collectors.joining(", ")); + return idea.getObject().getKeywords().stream().map(Keyword::getKeyword).collect(Collectors.joining(", ")); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java b/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java index dc0ad98186..4c00f673ac 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java @@ -49,56 +49,39 @@ public class ManualMatching extends AbstractAdminMatchPage { applicationPeriodService, getSession().getMetaData(PRESELECTED_APPLICATION_PERIOD) ); - private final IModel<ResearchArea> researchArea = new DetachableServiceModel<>( - researchAreaService - ); - private final IModel<Collection<Keyword>> keywords = new DetachableServiceModelCollection<>( - keywordService - ); + private final IModel<ResearchArea> researchArea = new DetachableServiceModel<>(researchAreaService); + private final IModel<Collection<Keyword>> keywords = new DetachableServiceModelCollection<>(keywordService); private final IModel<User> supervisor = new DetachableServiceModel<>(userService); - private final IModel<Collection<User>> authors = new DetachableServiceModelCollection<>( - userService - ); + private final IModel<Collection<User>> authors = new DetachableServiceModelCollection<>(userService); private final IModel<String> title = new Model<>(); private final IModel<String> description = new Model<>(); - private final IModel<ProjectType> projectType = new DetachableServiceModel<>( - projectTypeService - ); + private final IModel<ProjectType> projectType = new DetachableServiceModel<>(projectTypeService); private final IModel<Set<Language>> languages = Model.ofSet(EnumSet.noneOf(Language.class)); private ManualMatchingForm(final String id) { super(id); add(new FeedbackPanel("feedback")); - final AjaxDropDownChoice<ApplicationPeriod> applicationPeriodChoice = - new AjaxDropDownChoice<>( - "applicationPeriod", - applicationPeriod, - getApplicationPeriods(), - new LambdaChoiceRenderer<>(ApplicationPeriod::getName, ApplicationPeriod::getId) - ) { - @Override - public void onNewSelection( - final AjaxRequestTarget target, - final ApplicationPeriod ap - ) { - getSession() - .setMetaData( - PRESELECTED_APPLICATION_PERIOD, - ap != null ? ap.getId() : null - ); - } - }; + final AjaxDropDownChoice<ApplicationPeriod> applicationPeriodChoice = new AjaxDropDownChoice<>( + "applicationPeriod", + applicationPeriod, + getApplicationPeriods(), + new LambdaChoiceRenderer<>(ApplicationPeriod::getName, ApplicationPeriod::getId) + ) { + @Override + public void onNewSelection(final AjaxRequestTarget target, final ApplicationPeriod ap) { + getSession().setMetaData(PRESELECTED_APPLICATION_PERIOD, ap != null ? ap.getId() : null); + } + }; applicationPeriodChoice.setRequired(true); add(applicationPeriodChoice); - final CheckBoxMultipleChoice<Language> languageChoice = - new BootstrapCheckBoxMultipleChoice<>( - "languages", - this.languages, - Arrays.asList(Language.values()), - new EnumChoiceRenderer<>(this) - ); + final CheckBoxMultipleChoice<Language> languageChoice = new BootstrapCheckBoxMultipleChoice<>( + "languages", + this.languages, + Arrays.asList(Language.values()), + new EnumChoiceRenderer<>(this) + ); languageChoice.setRequired(true); add(languageChoice); @@ -115,10 +98,7 @@ public class ManualMatching extends AbstractAdminMatchPage { add(new TextArea<>("description", description)); - final SupervisorAutoComplete supervisorChoice = new SupervisorAutoComplete( - "supervisor", - this.supervisor - ); + final SupervisorAutoComplete supervisorChoice = new SupervisorAutoComplete("supervisor", this.supervisor); supervisorChoice.setRequired(true); add(supervisorChoice); @@ -134,10 +114,7 @@ public class ManualMatching extends AbstractAdminMatchPage { new LambdaChoiceRenderer<>(ResearchArea::getTitle, ResearchArea::getId) ) { @Override - public void onNewSelection( - final AjaxRequestTarget target, - final ResearchArea objectSelected - ) { + public void onNewSelection(final AjaxRequestTarget target, final ResearchArea objectSelected) { target.add(keywordContainer); } }; @@ -179,12 +156,7 @@ public class ManualMatching extends AbstractAdminMatchPage { for (User author : authors.getObject()) { idea.addIdeaParticipation(new IdeaParticipation(author, idea)); } - ideaService.saveSupervisorIdea( - idea, - supervisor.getObject(), - new ArrayList<>(keywords.getObject()), - true - ); + ideaService.saveSupervisorIdea(idea, supervisor.getObject(), new ArrayList<>(keywords.getObject()), true); getSession().success("Idea created"); setResponsePage(ManualMatching.class); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java index 3cb4ef89a6..6a28e63b07 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java @@ -49,10 +49,7 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri private ExportableDataPanel<Idea, String> dataTable; private IModel<ApplicationPeriod> applicationPeriod; - public ProjectAllSupervisorIdeasPanel( - String id, - final IModel<ApplicationPeriod> applicationPeriod - ) { + public ProjectAllSupervisorIdeasPanel(String id, final IModel<ApplicationPeriod> applicationPeriod) { super(id, applicationPeriod); this.applicationPeriod = applicationPeriod; addDialog(); @@ -101,11 +98,7 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri private List<IColumn<Idea, String>> createColumns() { List<IColumn<Idea, String>> columns = new ArrayList<>(); columns.add(new DateColumn<>(Model.of("Created"), Idea::getDateCreated, "dateCreated")); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> - idea.getProjectType().getName() - ) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> idea.getProjectType().getName())); columns.add( new AbstractColumn<>(Model.of("Languages")) { @@ -118,9 +111,7 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri cellItem.add( new DisplayMultiplesPanel<>( componentId, - new ListAdapterModel<>( - LambdaModel.of(rowModel, Idea::getLanguages, Idea::setLanguages) - ) + new ListAdapterModel<>(LambdaModel.of(rowModel, Idea::getLanguages, Idea::setLanguages)) ) { @Override public Component getComponent(String componentId, IModel<Language> t) { @@ -135,25 +126,13 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri columns.add( new AbstractColumn<>(Model.of("Title"), "title") { @Override - public void populateItem( - Item<ICellPopulator<Idea>> components, - String s, - final IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> components, String s, final IModel<Idea> model) { components.add( - new AjaxLinkPanel<>( - s, - model, - LambdaModel.of(model, Idea::getTitle, Idea::setTitle) - ) { + new AjaxLinkPanel<>(s, model, LambdaModel.of(model, Idea::getTitle, Idea::setTitle)) { @Override public void onClick(AjaxRequestTarget target, IModel<Idea> model) { modalWindowPlus.setContent( - new AcceptIdeaDialogPanel( - modalWindowPlus.getContentId(), - model, - applicationPeriod - ) + new AcceptIdeaDialogPanel(modalWindowPlus.getContentId(), model, applicationPeriod) ); modalWindowPlus.setTitle(model.getObject().getTitle()); modalWindowPlus.show(target); @@ -177,10 +156,7 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri private void addFiltering() { IModel<List<ProjectType>> projectTypes = LoadableDetachableModel.of(() -> - applicationPeriodService.getTypesForStudent( - getModelObject(), - SciProSession.get().getUser() - ) + applicationPeriodService.getTypesForStudent(getModelObject(), SciProSession.get().getUser()) ); params = new IdeaService.Filter(); @@ -202,10 +178,7 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri }; add(projectType); - final KeywordFilterPanel keywordFilter = new KeywordFilterPanel( - "keywordFilter", - getKeywords() - ) { + final KeywordFilterPanel keywordFilter = new KeywordFilterPanel("keywordFilter", getKeywords()) { @Override public void onKeywordsSelected(AjaxRequestTarget target, Set<Keyword> keywords) { params.setKeywords(keywords); @@ -232,8 +205,7 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri params.setResearchArea(getModelObject()); target.add(dataTable); keywordFilter.setVisible( - objectSelected != null && - !keywordService.findByResearchArea(params.getResearchArea()).isEmpty() + objectSelected != null && !keywordService.findByResearchArea(params.getResearchArea()).isEmpty() ); target.add(keywordFilter); } @@ -246,9 +218,7 @@ public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeri @Override protected Set<Keyword> load() { if (params.getResearchArea() != null) { - return new HashSet<>( - keywordService.findByResearchArea(params.getResearchArea()) - ); + return new HashSet<>(keywordService.findByResearchArea(params.getResearchArea())); } return new HashSet<>(); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java index 698a48d7d6..60138e9632 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java @@ -9,9 +9,7 @@ import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightProjectMyIdeas; import se.su.dsv.scipro.data.DetachableServiceModel; import se.su.dsv.scipro.util.PageParameterKeys; -public class ProjectIdeaDetailsPage - extends AbstractIdeaProjectPage - implements MenuHighlightProjectMyIdeas { +public class ProjectIdeaDetailsPage extends AbstractIdeaProjectPage implements MenuHighlightProjectMyIdeas { @Inject IdeaService ideaService; @@ -37,10 +35,7 @@ public class ProjectIdeaDetailsPage throw new RestartResponseException(ProjectIdeaStartPage.class); } - final DetachableServiceModel<Idea> ideaModel = new DetachableServiceModel<>( - ideaService, - idea - ); + final DetachableServiceModel<Idea> ideaModel = new DetachableServiceModel<>(ideaService, idea); add(new Label("title", ideaModel.map(Idea::getTitle))); add( new CompleteIdeaDialogPanel("complete_supervisor_idea", ideaModel) { diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPanel.java index 65624ea127..e1f9112194 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPanel.java @@ -21,21 +21,14 @@ public class ProjectIdeaDetailsPanel extends GenericPanel<Idea> { private final IModel<User> currentUser; - public ProjectIdeaDetailsPanel( - final String id, - final IModel<Idea> model, - final IModel<User> currentUser - ) { + public ProjectIdeaDetailsPanel(final String id, final IModel<Idea> model, final IModel<User> currentUser) { super(id, model); this.currentUser = currentUser; add(new Label("title", model.map(Idea::getTitle))); add(new Label("type", model.map(Idea::getProjectType).map(ProjectType::getName))); add( - new AutoHidingListView<>( - "languages", - model.map(Idea::getLanguages).map(ArrayList::new) - ) { + new AutoHidingListView<>("languages", model.map(Idea::getLanguages).map(ArrayList::new)) { @Override protected void populateItem(final ListItem<Language> item) { item.add(new EnumLabel<>("language", item.getModel())); @@ -80,9 +73,7 @@ public class ProjectIdeaDetailsPanel extends GenericPanel<Idea> { } ); - add( - new Label("research_area", model.map(Idea::getResearchArea).map(ResearchArea::getTitle)) - ); + add(new Label("research_area", model.map(Idea::getResearchArea).map(ResearchArea::getTitle))); add( new ListView<>("keywords", model.map(Idea::getKeywords).map(ArrayList::new)) { @Override diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java index 97ea889b2b..f772a84856 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java @@ -12,9 +12,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.system.User; @Authorization(authorizedRoles = { Roles.AUTHOR }) -public class ProjectIdeaStartPage - extends AbstractIdeaProjectPage - implements MenuHighlightProjectIdeas { +public class ProjectIdeaStartPage extends AbstractIdeaProjectPage implements MenuHighlightProjectIdeas { @Inject private GeneralSystemSettingsService systemSettingsService; diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java index 1fc56bd9d8..eaac821370 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java @@ -13,9 +13,7 @@ import se.su.dsv.scipro.session.SciProSession; import se.su.dsv.scipro.util.PageParameterKeys; @Authorization(authorizedRoles = { Roles.AUTHOR }) -public class ProjectIdeaSubmissionPage - extends AbstractIdeaProjectPage - implements MenuHighlightProjectIdeas { +public class ProjectIdeaSubmissionPage extends AbstractIdeaProjectPage implements MenuHighlightProjectIdeas { public static final String SUBMISSION_PANEL = "submissionPanel"; @@ -28,10 +26,7 @@ public class ProjectIdeaSubmissionPage public ProjectIdeaSubmissionPage(PageParameters pp) { super(pp); Long ideaId = getIdFromParameter(pp, PageParameterKeys.MAP.get(Idea.class)); - Long applicationPeriodId = getIdFromParameter( - pp, - PageParameterKeys.MAP.get(ApplicationPeriod.class) - ); + Long applicationPeriodId = getIdFromParameter(pp, PageParameterKeys.MAP.get(ApplicationPeriod.class)); Idea idea; boolean isNewIdea; @@ -50,14 +45,13 @@ public class ProjectIdeaSubmissionPage if (applicationPeriodId == null) { throw new RestartResponseException(ProjectIdeaStartPage.class); } - final ApplicationPeriod applicationPeriod = applicationPeriodService.findOne( - applicationPeriodId - ); + final ApplicationPeriod applicationPeriod = applicationPeriodService.findOne(applicationPeriodId); if (applicationPeriod == null) { throw new RestartResponseException(ProjectIdeaStartPage.class); } - final List<StudentPeriod> availablePeriods = - applicationPeriodService.getCurrentStudentPeriods(SciProSession.get().getUser()); + final List<StudentPeriod> availablePeriods = applicationPeriodService.getCurrentStudentPeriods( + SciProSession.get().getUser() + ); final boolean isPeriodAvailableForSubmission = availablePeriods .stream() .filter(StudentPeriod::allowedToSubmitIdea) @@ -71,11 +65,7 @@ public class ProjectIdeaSubmissionPage idea.setApplicationPeriod(applicationPeriod); } add( - new ProjectIdeaSubmissionPanel( - SUBMISSION_PANEL, - new DetachableServiceModel<>(ideaService, idea), - isNewIdea - ) + new ProjectIdeaSubmissionPanel(SUBMISSION_PANEL, new DetachableServiceModel<>(ideaService, idea), isNewIdea) ); } @@ -89,8 +79,6 @@ public class ProjectIdeaSubmissionPage } private void failAndRedirect() { - throw new RestartResponseException( - getApplication().getApplicationSettings().getAccessDeniedPage() - ); + throw new RestartResponseException(getApplication().getApplicationSettings().getAccessDeniedPage()); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java index dff23a49da..acdf6b0655 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java @@ -64,10 +64,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { public ProjectIdeaSubmissionPanel(String id, IModel<Idea> model, boolean isNewIdea) { super(id, model); pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(ApplicationPeriod.class), - model.getObject().getApplicationPeriod().getId() - ); + pp.add(PageParameterKeys.MAP.get(ApplicationPeriod.class), model.getObject().getApplicationPeriod().getId()); IdeaForm form = new IdeaForm(IDEA_FORM, model, isNewIdea); add(form); @@ -114,13 +111,10 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { super(id, model); this.isNewIdea = isNewIdea; this.creator = SciProSession.get().getUser(); - final LoadableDetachableModel<GeneralSystemSettings> generalSystemSettings = - LoadableDetachableModel.of( - generalSystemSettingsService::getGeneralSystemSettingsInstance - ); - supportMail = generalSystemSettings.map( - GeneralSystemSettings::getActiveProjectIdeaSupportMail + final LoadableDetachableModel<GeneralSystemSettings> generalSystemSettings = LoadableDetachableModel.of( + generalSystemSettingsService::getGeneralSystemSettingsInstance ); + supportMail = generalSystemSettings.map(GeneralSystemSettings::getActiveProjectIdeaSupportMail); addProjectTypeSelection(); addLanguageSelection(); addCoAuthorSelection(); @@ -130,12 +124,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { addResearchAreaAndKeywordsSelection(); addContract(); addDeleteButton(); - add( - new Label( - "save", - isNewIdea ? new ResourceModel("save") : new ResourceModel("update") - ) - ); + add(new Label("save", isNewIdea ? new ResourceModel("save") : new ResourceModel("update"))); } @Override @@ -144,20 +133,13 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { final ApplicationPeriod applicationPeriod = getModelObject().getApplicationPeriod(); setEnabled( applicationPeriodService.isOpen(applicationPeriod) || - applicationPeriodService.hasCurrentSubmitIdeaExemption( - applicationPeriod, - SciProSession.get().getUser() - ) + applicationPeriodService.hasCurrentSubmitIdeaExemption(applicationPeriod, SciProSession.get().getUser()) ); } private void addDeleteButton() { add( - new ConfirmationLink<>( - "delete", - getModel(), - Model.of("Are you sure you want to delete the idea?") - ) { + new ConfirmationLink<>("delete", getModel(), Model.of("Are you sure you want to delete the idea?")) { @Override protected void onConfigure() { super.onConfigure(); @@ -177,20 +159,11 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { IModel<List<ProjectType>> projectTypes = getModel() .map(Idea::getApplicationPeriod) .map(applicationPeriod -> - applicationPeriodService.getTypesForStudent( - applicationPeriod, - SciProSession.get().getUser() - ) + applicationPeriodService.getTypesForStudent(applicationPeriod, SciProSession.get().getUser()) ); final var activeProjectWarning = new WebMarkupContainer("activeProjectWarning") { { - add( - new ExternalLink( - "supportMail", - supportMail.map(mail -> "mailto:" + mail), - supportMail - ) - ); + add(new ExternalLink("supportMail", supportMail.map(mail -> "mailto:" + mail), supportMail)); } @Override @@ -199,10 +172,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { final ProjectType selectedProjectType = getModelObject().getProjectType(); if (selectedProjectType != null) { final boolean hasActiveProject = !projectService - .getActiveProjectsByUserAndProjectType( - SciProSession.get().getUser(), - selectedProjectType - ) + .getActiveProjectsByUserAndProjectType(SciProSession.get().getUser(), selectedProjectType) .isEmpty(); setVisible(hasActiveProject); } else { @@ -241,13 +211,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { .collect(Collectors.toSet()); activePartnerProjectWarning = new WebMarkupContainer("activePartnerProjectWarning") { { - add( - new ExternalLink( - "supportMail", - supportMail.map(mail -> "mailto:" + mail), - supportMail - ) - ); + add(new ExternalLink("supportMail", supportMail.map(mail -> "mailto:" + mail), supportMail)); } @Override @@ -259,10 +223,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { .getModelObject() .stream() .map(partner -> - projectService.getActiveProjectsByUserAndProjectType( - partner, - selectedProjectType - ) + projectService.getActiveProjectsByUserAndProjectType(partner, selectedProjectType) ) .flatMap(Collection::stream) .findAny() @@ -358,9 +319,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { ) { @Override public void onNewSelection(AjaxRequestTarget target, ResearchArea selected) { - Set<Keyword> keywordHashSet = new HashSet<>( - keywordService.findByResearchArea(selected) - ); + Set<Keyword> keywordHashSet = new HashSet<>(keywordService.findByResearchArea(selected)); keywordsPanel.setModelObject(keywordHashSet); keywordsPanel.setVisible(!keywordHashSet.isEmpty()); target.add(areaContainer); @@ -373,9 +332,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { final Set<Keyword> keywords = getModelObject().getResearchArea() == null ? new HashSet<>() - : new HashSet<>( - keywordService.findByResearchArea(getModelObject().getResearchArea()) - ); + : new HashSet<>(keywordService.findByResearchArea(getModelObject().getResearchArea())); ProjectIdeaSubmissionPanel.this.keywords = getModelObject().getKeywords(); keywordsPanel = new KeywordFilterPanel( "keywords", @@ -401,13 +358,7 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { contract.add(new CheckBoxRequiredValidator()); add(contract); add(new ComponentFeedbackPanel("contractFeedback", contract)); - add( - new BookmarkablePageLink<Void>( - "sibottom", - ProjectNewAllSupervisorIdeasPage.class, - pp - ) - ); + add(new BookmarkablePageLink<Void>("sibottom", ProjectNewAllSupervisorIdeasPage.class, pp)); } @Override @@ -469,26 +420,14 @@ public class ProjectIdeaSubmissionPanel extends GenericPanel<Idea> { if (projectType != null) { if ( !projectService - .getActiveProjectsByUserAndProjectType( - SciProSession.get().getUser(), - projectType - ) + .getActiveProjectsByUserAndProjectType(SciProSession.get().getUser(), projectType) .isEmpty() ) { error(getString("you.already.have.an.active.project.on.this.level")); } for (User partner : partners) { - if ( - !projectService - .getActiveProjectsByUserAndProjectType(partner, projectType) - .isEmpty() - ) { - error( - getString( - "partner.already.has.an.active.project.on.this.level", - Model.of(partner) - ) - ); + if (!projectService.getActiveProjectsByUserAndProjectType(partner, projectType).isEmpty()) { + error(getString("partner.already.has.an.active.project.on.this.level", Model.of(partner))); } } if ( diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java index ae340fe457..5d4c93d4e4 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java @@ -82,11 +82,7 @@ public class ProjectMyIdeasPanel extends Panel { private List<IColumn<Idea, String>> createColumns() { List<IColumn<Idea, String>> columns = new ArrayList<>(); columns.add(new DateColumn<>(Model.of("Created"), Idea::getDateCreated, "dateCreated")); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> - idea.getProjectType().getName() - ) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> idea.getProjectType().getName())); columns.add( new AbstractColumn<>(Model.of("Title"), "title") { @@ -99,10 +95,7 @@ public class ProjectMyIdeasPanel extends Panel { cellItem.add( LinkWrapper.apply(componentId, linkId -> { PageParameters pageParameters = new PageParameters(); - pageParameters.set( - PageParameterKeys.MAP.get(Idea.class), - model.getObject().getId() - ); + pageParameters.set(PageParameterKeys.MAP.get(Idea.class), model.getObject().getId()); AbstractLink link = new BookmarkablePageLink<>( linkId, ProjectIdeaDetailsPage.class, @@ -128,18 +121,11 @@ public class ProjectMyIdeasPanel extends Panel { new DisplayMultiplesPanel<>( componentId, new ListAdapterModel<>( - LambdaModel.of( - rowModel, - Idea::getIdeaParticipations, - Idea::setIdeaParticipations - ) + LambdaModel.of(rowModel, Idea::getIdeaParticipations, Idea::setIdeaParticipations) ) ) { @Override - public Component getComponent( - String componentId, - IModel<IdeaParticipation> t - ) { + public Component getComponent(String componentId, IModel<IdeaParticipation> t) { return new StudentProfileProgramPanel(componentId, t, false); } } @@ -150,11 +136,7 @@ public class ProjectMyIdeasPanel extends Panel { columns.add( new AbstractColumn<>(Model.of("Status"), "match.status") { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> model) { item.add( new Label( id, @@ -163,9 +145,7 @@ public class ProjectMyIdeasPanel extends Panel { case UNMATCHED -> "Submitted, waiting for matching by administrator"; case MATCHED -> { if ( - applicationPeriodService.courseStartHasPassed( - idea.getApplicationPeriod() - ) + applicationPeriodService.courseStartHasPassed(idea.getApplicationPeriod()) ) { yield "Matched, project creation delayed. This is under investigation and handled manually. No action needed from you."; } else { @@ -185,18 +165,9 @@ public class ProjectMyIdeasPanel extends Panel { columns.add( new AbstractColumn<>(Model.of("Course start date")) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - IModel<Idea> iModel - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> iModel) { item.add( - new Label( - id, - iModel - .map(Idea::getApplicationPeriod) - .map(ApplicationPeriod::getCourseStartDate) - ) + new Label(id, iModel.map(Idea::getApplicationPeriod).map(ApplicationPeriod::getCourseStartDate)) ); } } @@ -205,17 +176,11 @@ public class ProjectMyIdeasPanel extends Panel { columns.add( new AbstractColumn<>(Model.of("Supervisor")) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> model) { Idea idea = model.getObject(); if ( (idea.getType() == Type.SUPERVISOR || - applicationPeriodService.courseStartHasPassed( - idea.getApplicationPeriod() - )) && + applicationPeriodService.courseStartHasPassed(idea.getApplicationPeriod())) && idea.getMatch().getSupervisor() != null ) { item.add(new Label(id, idea.getMatch().getSupervisor().getFullName())); @@ -229,18 +194,11 @@ public class ProjectMyIdeasPanel extends Panel { columns.add( new AbstractColumn<>(Model.of("First meeting")) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> model) { item.add( new FirstMeetingColumnPanel(id, model) { @Override - protected void onColumnClick( - AjaxRequestTarget target, - IModel<Idea> model - ) { + protected void onColumnClick(AjaxRequestTarget target, IModel<Idea> model) { openFirstMeetingDialog(target, model); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java index 86769add37..71b4e674f3 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java @@ -15,9 +15,7 @@ import se.su.dsv.scipro.session.SciProSession; import se.su.dsv.scipro.util.PageParameterKeys; @Authorization(authorizedRoles = { Roles.AUTHOR }) -public class ProjectNewAllSupervisorIdeasPage - extends AbstractIdeaProjectPage - implements MenuHighlightProjectIdeas { +public class ProjectNewAllSupervisorIdeasPage extends AbstractIdeaProjectPage implements MenuHighlightProjectIdeas { @Inject private ApplicationPeriodService applicationPeriodService; @@ -28,9 +26,7 @@ public class ProjectNewAllSupervisorIdeasPage long applicationPeriodId; try { - applicationPeriodId = pp - .get(PageParameterKeys.MAP.get(ApplicationPeriod.class)) - .toLong(); + applicationPeriodId = pp.get(PageParameterKeys.MAP.get(ApplicationPeriod.class)).toLong(); } catch (StringValueConversionException ignored) { throw new RestartResponseException(ProjectIdeaStartPage.class); } @@ -38,8 +34,9 @@ public class ProjectNewAllSupervisorIdeasPage applicationPeriodService, applicationPeriodId ); - final List<StudentPeriod> availablePeriods = - applicationPeriodService.getCurrentStudentPeriods(SciProSession.get().getUser()); + final List<StudentPeriod> availablePeriods = applicationPeriodService.getCurrentStudentPeriods( + SciProSession.get().getUser() + ); final boolean isPeriodAvailableForSelection = availablePeriods .stream() .filter(StudentPeriod::allowedToSelectIdeas) diff --git a/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java index 11658b7b57..f4ebd4c4fd 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java @@ -47,10 +47,7 @@ public class StudentApplicationPeriodInfoPanel extends Panel { @Override protected void populateItem(ListItem<StudentPeriod> item) { item.add( - new ApplicationPeriodInfoPanel( - "info", - item.getModel().map(StudentPeriod::getApplicationPeriod) - ) + new ApplicationPeriodInfoPanel("info", item.getModel().map(StudentPeriod::getApplicationPeriod)) ); addStudentStuff(item); } @@ -61,9 +58,7 @@ public class StudentApplicationPeriodInfoPanel extends Panel { PageParameterKeys.MAP.get(ApplicationPeriod.class), item.getModelObject().getApplicationPeriod().getId() ); - WebMarkupContainer studentContainer = new WebMarkupContainer( - STUDENT_CONTAINER - ) { + WebMarkupContainer studentContainer = new WebMarkupContainer(STUDENT_CONTAINER) { @Override protected void onConfigure() { super.onConfigure(); @@ -77,11 +72,7 @@ public class StudentApplicationPeriodInfoPanel extends Panel { }; item.add(studentContainer); studentContainer.add( - new BookmarkablePageLink<Void>( - SELECT_SUPERVISOR, - ProjectNewAllSupervisorIdeasPage.class, - pp - ) { + new BookmarkablePageLink<Void>(SELECT_SUPERVISOR, ProjectNewAllSupervisorIdeasPage.class, pp) { @Override protected void onConfigure() { super.onConfigure(); @@ -90,11 +81,7 @@ public class StudentApplicationPeriodInfoPanel extends Panel { } ); studentContainer.add( - new BookmarkablePageLink<Void>( - CREATE, - ProjectIdeaSubmissionPage.class, - pp - ) { + new BookmarkablePageLink<Void>(CREATE, ProjectIdeaSubmissionPage.class, pp) { @Override protected void onConfigure() { super.onConfigure(); diff --git a/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java index 270714a53f..18183717ef 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java @@ -42,11 +42,7 @@ public class StudentIdeaStatusColumnPanel extends Panel { ); } else { add( - new Label( - LABEL, - "Matched, course starting " + - idea.getApplicationPeriod().getCourseStartDate() - ) + new Label(LABEL, "Matched, course starting " + idea.getApplicationPeriod().getCourseStartDate()) ); } break; diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java index f3ff2fae0e..69821fa3bb 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java @@ -49,8 +49,7 @@ public class SupervisorAcceptIdeaDialogPanel extends Panel { supervisor ); if (acceptance.isRight()) { - getSession() - .info("You are now supervising idea: " + acceptance.right().getTitle()); + getSession().info("You are now supervising idea: " + acceptance.right().getTitle()); setResponsePage(SupervisorIdeaStartPage.class); } else { switch (acceptance.left()) { diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java index b64899b65e..af74c2a00c 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java @@ -13,10 +13,7 @@ public class SupervisorAllSelectableStudentIdeasPanel extends SupervisorAllStude @Inject private TargetService targetService; - public SupervisorAllSelectableStudentIdeasPanel( - String id, - IModel<ApplicationPeriod> applicationPeriod - ) { + public SupervisorAllSelectableStudentIdeasPanel(String id, IModel<ApplicationPeriod> applicationPeriod) { super(id, applicationPeriod); } @@ -29,10 +26,7 @@ public class SupervisorAllSelectableStudentIdeasPanel extends SupervisorAllStude @Override protected List<ProjectType> getChoices() { return new ArrayList<>( - targetService.projectTypesWithTargetsLeft( - getModelObject(), - SciProSession.get().getUser() - ) + targetService.projectTypesWithTargetsLeft(getModelObject(), SciProSession.get().getUser()) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java index 6993b22797..ca706ab34a 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java @@ -18,8 +18,7 @@ public class SupervisorAllStudentIdeasPage public SupervisorAllStudentIdeasPage(PageParameters pp) { super(pp); - List<ApplicationPeriod> currentPeriods = - applicationPeriodService.getCurrentSupervisorPeriods(loggedInUser()); + List<ApplicationPeriod> currentPeriods = applicationPeriodService.getCurrentSupervisorPeriods(loggedInUser()); if (currentPeriods.isEmpty()) { add(new Label("ideas", new ResourceModel("no.current.period"))); } else { diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java index 98497b5e4b..6a3f3f11b8 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java @@ -48,10 +48,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri private ExportableDataPanel<Idea, String> dataTable; private FeedbackPanel feedback; - public SupervisorAllStudentIdeasPanel( - String id, - final IModel<ApplicationPeriod> applicationPeriod - ) { + public SupervisorAllStudentIdeasPanel(String id, final IModel<ApplicationPeriod> applicationPeriod) { super(id, applicationPeriod); } @@ -80,8 +77,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - getModelObject() != null && - applicationPeriodService.isVisibleForSupervisors(getModelObject()) + getModelObject() != null && applicationPeriodService.isVisibleForSupervisors(getModelObject()) ); } @@ -91,10 +87,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri } private void addDataTable() { - SortableDataProvider<Idea, String> provider = new FilteredDataProvider<>( - ideaService, - Model.of(filter) - ); + SortableDataProvider<Idea, String> provider = new FilteredDataProvider<>(ideaService, Model.of(filter)); provider.setSort("dateCreated", SortOrder.DESCENDING); dataTable = new ExportableDataPanel<>("dataTable", createColumns(), provider); add(dataTable); @@ -103,11 +96,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri private List<IColumn<Idea, String>> createColumns() { List<IColumn<Idea, String>> columns = new ArrayList<>(); columns.add(new DateColumn<>(Model.of("Created"), Idea::getDateCreated, "dateCreated")); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> - idea.getProjectType().getName() - ) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> idea.getProjectType().getName())); columns.add( new AbstractColumn<>(Model.of("Languages")) { @@ -120,9 +109,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri cellItem.add( new DisplayMultiplesPanel<>( componentId, - new ListAdapterModel<>( - LambdaModel.of(rowModel, Idea::getLanguages, Idea::setLanguages) - ) + new ListAdapterModel<>(LambdaModel.of(rowModel, Idea::getLanguages, Idea::setLanguages)) ) { @Override public Component getComponent(String componentId, IModel<Language> t) { @@ -137,24 +124,13 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri columns.add( new AbstractColumn<>(Model.of("Title"), "title") { @Override - public void populateItem( - Item<ICellPopulator<Idea>> components, - String s, - final IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> components, String s, final IModel<Idea> model) { components.add( - new AjaxLinkPanel<>( - s, - model, - LambdaModel.of(model, Idea::getTitle, Idea::setTitle) - ) { + new AjaxLinkPanel<>(s, model, LambdaModel.of(model, Idea::getTitle, Idea::setTitle)) { @Override public void onClick(AjaxRequestTarget target, IModel<Idea> model) { modalWindowPlus.setContent( - new SupervisorAcceptIdeaDialogPanel( - modalWindowPlus.getContentId(), - model - ) + new SupervisorAcceptIdeaDialogPanel(modalWindowPlus.getContentId(), model) ); modalWindowPlus.setTitle(model.getObject().getTitle()); modalWindowPlus.show(target); @@ -177,18 +153,11 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri new DisplayMultiplesPanel<>( componentId, new ListAdapterModel<>( - LambdaModel.of( - rowModel, - Idea::getIdeaParticipations, - Idea::setIdeaParticipations - ) + LambdaModel.of(rowModel, Idea::getIdeaParticipations, Idea::setIdeaParticipations) ) ) { @Override - public Component getComponent( - String componentId, - IModel<IdeaParticipation> t - ) { + public Component getComponent(String componentId, IModel<IdeaParticipation> t) { return new StudentProfileProgramPanel(componentId, t, false); } } @@ -213,30 +182,21 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri Idea idea = rowModel.getObject(); if (idea.hasSupervisor()) { cellItem.add( - new UserLinkPanel( - componentId, - rowModel.map(Idea::getMatch).map(Match::getSupervisor) - ) + new UserLinkPanel(componentId, rowModel.map(Idea::getMatch).map(Match::getSupervisor)) ); } else { cellItem.add( - new AjaxConfirmingLinkPanel<>( - componentId, - rowModel, - Model.of("Select") - ) { + new AjaxConfirmingLinkPanel<>(componentId, rowModel, Model.of("Select")) { @Override public void onClick(AjaxRequestTarget target, IModel<Idea> model) { User supervisor = getCurrentSupervisor(); - Either<SelectionError, Idea> acceptance = - ideaService.supervisorAcceptIdea( - model.getObject(), - supervisor - ); + Either<SelectionError, Idea> acceptance = ideaService.supervisorAcceptIdea( + model.getObject(), + supervisor + ); if (acceptance.isRight()) { SupervisorAllStudentIdeasPanel.this.success( - "You are now supervising idea: " + - acceptance.right().getTitle() + "You are now supervising idea: " + acceptance.right().getTitle() ); setResponsePage(SupervisorIdeaStartPage.class); } else { @@ -288,10 +248,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri }; add(projectType); - final KeywordFilterPanel keywordFilter = new KeywordFilterPanel( - "keywordFilter", - getKeywords() - ) { + final KeywordFilterPanel keywordFilter = new KeywordFilterPanel("keywordFilter", getKeywords()) { @Override public void onKeywordsSelected(AjaxRequestTarget target, Set<Keyword> keywords) { filter.setKeywords(keywords); @@ -318,8 +275,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri filter.setResearchArea(getModelObject()); target.add(dataTable); keywordFilter.setVisible( - getModelObject() != null && - !keywordService.findByResearchArea(getModelObject()).isEmpty() + getModelObject() != null && !keywordService.findByResearchArea(getModelObject()).isEmpty() ); target.add(keywordFilter); } @@ -341,9 +297,7 @@ public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeri @Override protected Set<Keyword> load() { if (filter.getResearchArea() != null) { - return new HashSet<>( - keywordService.findByResearchArea(filter.getResearchArea()) - ); + return new HashSet<>(keywordService.findByResearchArea(filter.getResearchArea())); } return new HashSet<>(); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java index 6384e14db9..16ad283a3b 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java @@ -66,26 +66,14 @@ public class SupervisorAllSupervisorIdeasPanel extends Panel { private List<IColumn<Idea, String>> columns() { List<IColumn<Idea, String>> columns = new ArrayList<>(); columns.add(new DateColumn<>(Model.of("Created"), Idea::getDateCreated, "dateCreated")); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> - idea.getProjectType().getName() - ) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> idea.getProjectType().getName())); columns.add( new AbstractColumn<>(Model.of("Title")) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - final IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, final IModel<Idea> model) { item.add( - new AjaxLinkPanel<>( - id, - model, - LambdaModel.of(model, Idea::getTitle, Idea::setTitle) - ) { + new AjaxLinkPanel<>(id, model, LambdaModel.of(model, Idea::getTitle, Idea::setTitle)) { @Override public void onClick(AjaxRequestTarget target, IModel<Idea> model) { openDialog(model, target); @@ -108,11 +96,7 @@ public class SupervisorAllSupervisorIdeasPanel extends Panel { columns.add( new AbstractColumn<>(Model.of("Status"), "match.status") { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> model) { item.add(new Label(id, ideaService.getStatusString(model.getObject()))); } } @@ -121,17 +105,13 @@ public class SupervisorAllSupervisorIdeasPanel extends Panel { } private void openDialog(IModel<Idea> model, AjaxRequestTarget target) { - modalWindowPlus.setContent( - new IdeaDetailsPanel(modalWindowPlus.getContentId(), model, true) - ); + modalWindowPlus.setContent(new IdeaDetailsPanel(modalWindowPlus.getContentId(), model, true)); modalWindowPlus.setTitle(model.getObject().getTitle()); modalWindowPlus.show(target); } private void addFiltering() { - params.setStatuses( - Arrays.asList(Idea.Status.COMPLETED, Idea.Status.MATCHED, Idea.Status.UNMATCHED) - ); + params.setStatuses(Arrays.asList(Idea.Status.COMPLETED, Idea.Status.MATCHED, Idea.Status.UNMATCHED)); params.setTypes(Collections.singletonList(Type.SUPERVISOR)); AjaxCheckBoxMultipleChoice<ProjectType> projectType = new AjaxCheckBoxMultipleChoice<>( @@ -151,10 +131,7 @@ public class SupervisorAllSupervisorIdeasPanel extends Panel { params.setLevels(projectType.getModelObject()); add(projectType); - final KeywordFilterPanel keywordFilter = new KeywordFilterPanel( - "keywordFilter", - getKeywords() - ) { + final KeywordFilterPanel keywordFilter = new KeywordFilterPanel("keywordFilter", getKeywords()) { @Override public void onKeywordsSelected(AjaxRequestTarget target, Set<Keyword> keywords) { params.setKeywords(keywords); @@ -185,8 +162,7 @@ public class SupervisorAllSupervisorIdeasPanel extends Panel { params.setResearchArea(getModelObject()); target.add(dataTable); keywordFilter.setVisible( - getModelObject() != null && - !keywordService.findByResearchArea(getModelObject()).isEmpty() + getModelObject() != null && !keywordService.findByResearchArea(getModelObject()).isEmpty() ); target.add(keywordFilter); } @@ -199,9 +175,7 @@ public class SupervisorAllSupervisorIdeasPanel extends Panel { @Override protected Set<Keyword> load() { if (params.getResearchArea() != null) { - return new HashSet<>( - keywordService.findByResearchArea(params.getResearchArea()) - ); + return new HashSet<>(keywordService.findByResearchArea(params.getResearchArea())); } return new HashSet<>(); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java index 2a7a83b56c..94bc844edc 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java @@ -43,25 +43,15 @@ public class SupervisorApplicationPeriodInfoPanel extends Panel { item.add(new ApplicationPeriodInfoPanel("info", item.getModel())); PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(ApplicationPeriod.class), - item.getModelObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(ApplicationPeriod.class), item.getModelObject().getId()); item.add( - new BookmarkablePageLink<Void>( - SELECT_STUDENT, - SupervisorSelectableStudentIdeasPage.class, - pp - ) { + new BookmarkablePageLink<Void>(SELECT_STUDENT, SupervisorSelectableStudentIdeasPage.class, pp) { @Override protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - targetService.hasTargetsLeft( - item.getModelObject(), - SciProSession.get().getUser() - ) + targetService.hasTargetsLeft(item.getModelObject(), SciProSession.get().getUser()) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java index 86f9145b50..8c8b293540 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java @@ -52,9 +52,7 @@ public class SupervisorEditIdeaPanel extends Panel { } if (model.getObject().getResearchArea() != null) { - selectableKeywords = new HashSet<>( - keywordService.findByResearchArea(model.getObject().getResearchArea()) - ); + selectableKeywords = new HashSet<>(keywordService.findByResearchArea(model.getObject().getResearchArea())); } else { selectableKeywords = new HashSet<>(); } @@ -131,10 +129,7 @@ public class SupervisorEditIdeaPanel extends Panel { add( new Label( "titleSmallText", - new StringResourceModel("titleDesc").setParameters( - MIN_TITLE_LENGTH, - MAX_TITLE_LENGTH - ) + new StringResourceModel("titleDesc").setParameters(MIN_TITLE_LENGTH, MAX_TITLE_LENGTH) ) ); add(new InfoPanel("titleInfo", new ResourceModel("titleInfo"))); @@ -178,9 +173,7 @@ public class SupervisorEditIdeaPanel extends Panel { modalWindow.setContent(id -> new UpdateResearchAreasPanel(id, getUser()) { @Override - protected void onResearchAreasUpdated( - final AjaxRequestTarget target - ) { + protected void onResearchAreasUpdated(final AjaxRequestTarget target) { target.add(areaContainer); modalWindow.refresh(target); } @@ -198,9 +191,7 @@ public class SupervisorEditIdeaPanel extends Panel { add(areaContainer); - areaContainer.add( - new InfoPanel("researchAreaInfo", new ResourceModel("researchAreaInfo")) - ); + areaContainer.add(new InfoPanel("researchAreaInfo", new ResourceModel("researchAreaInfo"))); } private AjaxDropDownChoice<ResearchArea> getResearchAreaDropDown() { @@ -212,9 +203,7 @@ public class SupervisorEditIdeaPanel extends Panel { ) { @Override public void onNewSelection(AjaxRequestTarget target, ResearchArea selected) { - Set<Keyword> keywordsModelObject = new HashSet<>( - keywordService.findByResearchArea(selected) - ); + Set<Keyword> keywordsModelObject = new HashSet<>(keywordService.findByResearchArea(selected)); keywordsPanel.setModelObject(keywordsModelObject); if (!keywordsModelObject.isEmpty()) { keywordsPanel.setVisible(true); @@ -226,13 +215,9 @@ public class SupervisorEditIdeaPanel extends Panel { return areaDropDown; } - private IModel<List<ResearchArea>> getSelectableResearchAreas( - final IModel<Idea> ideaModel - ) { + private IModel<List<ResearchArea>> getSelectableResearchAreas(final IModel<Idea> ideaModel) { return LoadableDetachableModel.of(() -> { - final Set<ResearchArea> supervisorResearchAreas = getUser() - .getObject() - .getResearchAreas(); + final Set<ResearchArea> supervisorResearchAreas = getUser().getObject().getResearchAreas(); final List<ResearchArea> available = new ArrayList<>(supervisorResearchAreas); final ResearchArea ideaResearchArea = ideaModel.getObject().getResearchArea(); if (ideaResearchArea != null && !available.contains(ideaResearchArea)) { @@ -307,11 +292,7 @@ public class SupervisorEditIdeaPanel extends Panel { ); } - private void addComponentFeedback( - WebMarkupContainer container, - String id, - Component component - ) { + private void addComponentFeedback(WebMarkupContainer container, String id, Component component) { ComponentFeedbackPanel feedbackPanel = new ComponentFeedbackPanel(id, component); feedbackPanel.setOutputMarkupId(true); container.add(feedbackPanel); @@ -327,9 +308,7 @@ public class SupervisorEditIdeaPanel extends Panel { private boolean keywordsNotWithinLimits() { return ( - selectedKeywords == null || - selectedKeywords.isEmpty() || - selectedKeywords.size() > MAX_KEYWORDS_SIZE + selectedKeywords == null || selectedKeywords.isEmpty() || selectedKeywords.size() > MAX_KEYWORDS_SIZE ); } @@ -350,10 +329,7 @@ public class SupervisorEditIdeaPanel extends Panel { } @Override - public Boolean getObject( - final String id, - final IModel<? extends List<? extends Boolean>> choices - ) { + public Boolean getObject(final String id, final IModel<? extends List<? extends Boolean>> choices) { return Boolean.TRUE.toString().equals(id); } }; @@ -370,8 +346,6 @@ public class SupervisorEditIdeaPanel extends Panel { } private void updateFeedbackPanels(final AjaxRequestTarget target) { - target - .getPage() - .visitChildren(FeedbackPanel.class, (feedback, visit) -> target.add(feedback)); + target.getPage().visitChildren(FeedbackPanel.class, (feedback, visit) -> target.add(feedback)); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPage.java index f5f4f3651b..704cdb2689 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPage.java @@ -18,10 +18,7 @@ public class SupervisorIdeaDetailsPage super(pp); StringValue ideaId = pp.get(PageParameterKeys.MAP.get(Idea.class)); - DetachableServiceModel<Idea> ideaModel = new DetachableServiceModel<>( - ideaService, - ideaId.toLongObject() - ); + DetachableServiceModel<Idea> ideaModel = new DetachableServiceModel<>(ideaService, ideaId.toLongObject()); add(new SupervisorIdeaDetailsPanel("ideaDetails", ideaModel)); } diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanel.java index a9fbe07dbb..184e13dea5 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanel.java @@ -12,13 +12,7 @@ public class SupervisorIdeaDetailsPanel extends GenericPanel<Idea> { super(id, model); add(new Label("title", LambdaModel.of(model, Idea::getTitle, Idea::setTitle))); add(new IdeaExportPanel("exportStatus", model)); - add( - new IdeaDetailsPanel( - "ideaDetails", - model, - model.getObject().getType() == Type.SUPERVISOR - ) - ); + add(new IdeaDetailsPanel("ideaDetails", model, model.getObject().getType() == Type.SUPERVISOR)); add(new IdeaAuthorInfoPanel("authors", model)); add(new IdeaTholanderInfoPanel("tholander", model)); add(new IdeaDownloadPanel("download", model)); diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java index 52599a0335..cd8642c1fc 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java @@ -39,11 +39,7 @@ public class SupervisorIdeaSubmissionPage if (SciProSession.get().hasActualRole(Roles.SUPERVISOR)) { add( - new SupervisorEditIdeaPanel( - "ideaPanel", - new DetachableServiceModel<>(ideaService, idea), - isNewIdea - ) { + new SupervisorEditIdeaPanel("ideaPanel", new DetachableServiceModel<>(ideaService, idea), isNewIdea) { @Override protected void onConfigure() { super.onConfigure(); @@ -56,10 +52,7 @@ public class SupervisorIdeaSubmissionPage } add( - new Label( - "noLabel", - "You don't have the Employee role, so you cant create ideas here." - ) { + new Label("noLabel", "You don't have the Employee role, so you cant create ideas here.") { @Override protected void onConfigure() { super.onConfigure(); diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java index fe5a39e871..cd59b023bf 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java @@ -61,13 +61,7 @@ public class SupervisorMyIdeasPanel extends Panel { new AjaxLink<Void>("create") { @Override public void onClick(AjaxRequestTarget target) { - if ( - supervisor - .getObject() - .getResearchAreas() - .stream() - .allMatch(ResearchArea::isDeleted) - ) { + if (supervisor.getObject().getResearchAreas().stream().allMatch(ResearchArea::isDeleted)) { modalWindowPlus.setTitle(new ResourceModel("select.research.area")); modalWindowPlus.setContent(SelectResearchAreaFragment::new); modalWindowPlus.setFooter(SelectResearchAreaFooterFragment::new); @@ -178,11 +172,7 @@ public class SupervisorMyIdeasPanel extends Panel { private void addDataTable() { List<IColumn<Idea, String>> columns = new ArrayList<>(); columns.add(new DateColumn<>(Model.of("Created"), Idea::getDateCreated, "dateCreated")); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> - idea.getProjectType().getName() - ) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> idea.getProjectType().getName())); columns.add(newTitleColumn()); columns.add(newAuthorsColumn()); columns.add( @@ -244,27 +234,16 @@ public class SupervisorMyIdeasPanel extends Panel { private IColumn<Idea, String> newAuthorsColumn() { return new AbstractColumn<>(Model.of("Authors")) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> cellItem, - String componentId, - IModel<Idea> rowModel - ) { + public void populateItem(Item<ICellPopulator<Idea>> cellItem, String componentId, IModel<Idea> rowModel) { cellItem.add( new DisplayMultiplesPanel<>( componentId, new ListAdapterModel<>( - LambdaModel.of( - rowModel, - Idea::getIdeaParticipations, - Idea::setIdeaParticipations - ) + LambdaModel.of(rowModel, Idea::getIdeaParticipations, Idea::setIdeaParticipations) ) ) { @Override - public Component getComponent( - String componentId, - IModel<IdeaParticipation> t - ) { + public Component getComponent(String componentId, IModel<IdeaParticipation> t) { return new StudentProfileProgramPanel(componentId, t, false); } } @@ -304,10 +283,7 @@ public class SupervisorMyIdeasPanel extends Panel { @Override public boolean shouldBeVisible(IModel<Idea> model) { - return ( - model.getObject().getMatchStatus() == Status.UNMATCHED && - !model.getObject().isExported() - ); + return (model.getObject().getMatchStatus() == Status.UNMATCHED && !model.getObject().isExported()); } }; } @@ -315,11 +291,7 @@ public class SupervisorMyIdeasPanel extends Panel { private AbstractColumn<Idea, String> newFirstMeetingColumn() { return new AbstractColumn<>(Model.of("First meeting")) { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - final IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, final IModel<Idea> model) { item.add( new FirstMeetingColumnPanel(id, model) { @Override @@ -335,20 +307,12 @@ public class SupervisorMyIdeasPanel extends Panel { private AbstractColumn<Idea, String> newTitleColumn() { return new AbstractExportableColumn<>(Model.of("Title"), "title") { @Override - public void populateItem( - Item<ICellPopulator<Idea>> components, - String s, - IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> components, String s, IModel<Idea> model) { components.add( LinkWrapper.apply(s, id -> { PageParameters pp = new PageParameters(); pp.add(PageParameterKeys.MAP.get(Idea.class), model.getObject().getId()); - var link = new BookmarkablePageLink<>( - id, - SupervisorIdeaDetailsPage.class, - pp - ); + var link = new BookmarkablePageLink<>(id, SupervisorIdeaDetailsPage.class, pp); link.setBody(model.map(Idea::getTitle)); return link; }) @@ -365,11 +329,7 @@ public class SupervisorMyIdeasPanel extends Panel { private AbstractColumn<Idea, String> newStatusColumn() { return new AbstractColumn<>(Model.of("Status"), "match.status") { @Override - public void populateItem( - Item<ICellPopulator<Idea>> item, - String id, - IModel<Idea> model - ) { + public void populateItem(Item<ICellPopulator<Idea>> item, String id, IModel<Idea> model) { item.add(new Label(id, model.map(this::getStatusString))); } @@ -385,11 +345,7 @@ public class SupervisorMyIdeasPanel extends Panel { case INACTIVE: return getString("status.inactive"); case MATCHED: - if ( - applicationPeriodService.courseStartHasPassed( - idea.getApplicationPeriod() - ) - ) { + if (applicationPeriodService.courseStartHasPassed(idea.getApplicationPeriod())) { if (idea.isExported()) { if (idea.wasExportSuccessful()) { return getString("status.project.created"); @@ -400,10 +356,7 @@ public class SupervisorMyIdeasPanel extends Panel { return getString("status.awaiting.project.creation"); } } else { - return getString( - "status.awaiting.course.start", - Model.of(idea.getApplicationPeriod()) - ); + return getString("status.awaiting.course.start", Model.of(idea.getApplicationPeriod())); } } return "-"; // can't happen diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java index 297725242b..4ca8ffca35 100755 --- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java +++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java @@ -22,10 +22,7 @@ public class SupervisorSelectableStudentIdeasPage add(new BookmarkablePageLink<Void>(BACK_LINK, SupervisorIdeaStartPage.class)); long id = pp.get(PageParameterKeys.MAP.get(ApplicationPeriod.class)).toLong(); - IModel<ApplicationPeriod> applicationPeriod = new DetachableServiceModel<>( - applicationPeriodService, - id - ); + IModel<ApplicationPeriod> applicationPeriod = new DetachableServiceModel<>(applicationPeriodService, id); add(new SupervisorAllSelectableStudentIdeasPanel("ideaPanel", applicationPeriod)); } } diff --git a/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java index 40d4237fbe..75c01ec9bd 100644 --- a/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java @@ -26,14 +26,8 @@ public class UpdateResearchAreasPanel extends Panel { public UpdateResearchAreasPanel(final String id, final IModel<User> supervisor) { super(id, supervisor); - GeneralSystemSettings generalSystemSettings = - generalSystemSettingsService.getGeneralSystemSettingsInstance(); - add( - new ExternalLink( - "selectResearchArea", - generalSystemSettings.getDaisySelectResearchAreaURL() - ) - ); + GeneralSystemSettings generalSystemSettings = generalSystemSettingsService.getGeneralSystemSettingsInstance(); + add(new ExternalLink("selectResearchArea", generalSystemSettings.getDaisySelectResearchAreaURL())); FeedbackPanel feedback = new FeedbackPanel("feedback"); feedback.setOutputMarkupId(true); @@ -51,10 +45,7 @@ public class UpdateResearchAreasPanel extends Panel { if (imported.stream().allMatch(ResearchArea::isDeleted)) { error(getString("no.research.areas.found")); } else { - String names = imported - .stream() - .map(ResearchArea::getTitle) - .collect(Collectors.joining(", ")); + String names = imported.stream().map(ResearchArea::getTitle).collect(Collectors.joining(", ")); success(getString("research.areas.imported", Model.of(names))); } target.add(feedback); diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java index 30fb053c2b..468f00dbd9 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java @@ -45,11 +45,7 @@ public class EditMileStonePhasePanel extends Panel { add( new RequiredTextField<>( TITLE, - LambdaModel.of( - model, - MilestonePhaseTemplate::getTitle, - MilestonePhaseTemplate::setTitle - ) + LambdaModel.of(model, MilestonePhaseTemplate::getTitle, MilestonePhaseTemplate::setTitle) ) ); add( diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java index 0a0f0be4bb..abadfa8c3b 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java @@ -68,11 +68,7 @@ public class EditMilestoneActivityPanel extends Panel { add( new RequiredTextField<>( TITLE, - LambdaModel.of( - model, - MilestoneActivityTemplate::getTitle, - MilestoneActivityTemplate::setTitle - ) + LambdaModel.of(model, MilestoneActivityTemplate::getTitle, MilestoneActivityTemplate::setTitle) ) ); add( @@ -88,11 +84,7 @@ public class EditMilestoneActivityPanel extends Panel { add( new BootstrapRadioChoice<>( TYPE, - LambdaModel.of( - model, - MilestoneActivityTemplate::getType, - MilestoneActivityTemplate::setType - ), + LambdaModel.of(model, MilestoneActivityTemplate::getType, MilestoneActivityTemplate::setType), Arrays.asList(MilestoneActivityTemplate.Type.values()) ).setRequired(true) ); @@ -123,10 +115,7 @@ public class EditMilestoneActivityPanel extends Panel { MilestoneActivityTemplate::setMilestonePhaseTemplate ), phaseService.findAll(new Sort(Sort.Direction.ASC, SORT_ORDER)), - new LambdaChoiceRenderer<>( - MilestonePhaseTemplate::getTitle, - MilestonePhaseTemplate::getId - ) + new LambdaChoiceRenderer<>(MilestonePhaseTemplate::getTitle, MilestonePhaseTemplate::getId) ).setRequired(true) ); add( diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java index bd109f8562..5b62406b84 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java @@ -84,9 +84,7 @@ public class MileStoneActivityAdminPanel extends Panel { new ListView<>(PHASE_LIST, getPhaseListModel()) { @Override protected void populateItem(ListItem<MilestonePhaseTemplate> item) { - item.add( - new Label(TITLE, item.getModel().map(MilestonePhaseTemplate::getTitle)) - ); + item.add(new Label(TITLE, item.getModel().map(MilestonePhaseTemplate::getTitle))); addMileStoneList(item); } } @@ -131,17 +129,10 @@ public class MileStoneActivityAdminPanel extends Panel { ) ) { @Override - public Component getComponent( - String componentId, - IModel<ProjectType> model - ) { + public Component getComponent(String componentId, IModel<ProjectType> model) { return new Label( componentId, - LambdaModel.of( - model, - ProjectType::getName, - ProjectType::setName - ) + LambdaModel.of(model, ProjectType::getName, ProjectType::setName) ); } } @@ -165,18 +156,12 @@ public class MileStoneActivityAdminPanel extends Panel { }; } - private AjaxCheckBox newActiveCheckBox( - String id, - final IModel<MilestoneActivityTemplate> activityModel - ) { + private AjaxCheckBox newActiveCheckBox(String id, final IModel<MilestoneActivityTemplate> activityModel) { return new AjaxCheckBox(id, Model.of(!activityModel.getObject().isDeleted())) { @Override protected void onUpdate(AjaxRequestTarget target) { activityModel.getObject().setDeleted(!getModelObject()); - activityService.save( - activityModel.getObject(), - activityModel.getObject().getMilestonePhaseTemplate() - ); + activityService.save(activityModel.getObject(), activityModel.getObject().getMilestonePhaseTemplate()); target.add(container); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java index 25ea8974b8..ca7ab2c9df 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java @@ -59,9 +59,7 @@ public class MileStonePhaseAdminPanel extends Panel { @Override protected void populateItem(ListItem<MilestonePhaseTemplate> item) { item.add(new SortOrderPanel<>(MOVE, item.getModel(), phaseService)); - item.add( - new Label(TITLE, item.getModel().map(MilestonePhaseTemplate::getTitle)) - ); + item.add(new Label(TITLE, item.getModel().map(MilestonePhaseTemplate::getTitle))); item.add(newActiveCheckBox(STATE_SWITCH, item.getModel())); item.add(newEditLink(EDIT, item.getModel())); } @@ -80,10 +78,7 @@ public class MileStonePhaseAdminPanel extends Panel { }; } - private AjaxLink<MilestonePhaseTemplate> newEditLink( - String id, - final IModel<MilestonePhaseTemplate> phaseModel - ) { + private AjaxLink<MilestonePhaseTemplate> newEditLink(String id, final IModel<MilestonePhaseTemplate> phaseModel) { return new AjaxLink<>(id, phaseModel) { @Override public void onClick(final AjaxRequestTarget target) { diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/pages/ProjectMileStonePage.java b/view/src/main/java/se/su/dsv/scipro/milestones/pages/ProjectMileStonePage.java index 74f9a6de8b..11a8cfe74c 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/pages/ProjectMileStonePage.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/pages/ProjectMileStonePage.java @@ -11,9 +11,7 @@ import se.su.dsv.scipro.system.ProjectModule; @Authorization(authorizedRoles = { Roles.AUTHOR }) @ProjectModuleComponent(ProjectModule.MILESTONES) -public class ProjectMileStonePage - extends AbstractProjectDetailsPage - implements MenuHighlightAuthorMyProjects { +public class ProjectMileStonePage extends AbstractProjectDetailsPage implements MenuHighlightAuthorMyProjects { public ProjectMileStonePage(PageParameters pp) { super(pp); diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java index d35c2955bd..6c7e3f3a9d 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java @@ -102,10 +102,7 @@ public class MileStoneCheckBoxPanel extends Panel { private boolean isSeminarActivity(IModel<MilestoneActivityTemplate> activityModel) { MilestoneActivityTemplate activity = activityModel.getObject(); - return ( - activity.isAutomatic() && - MilestoneActivityTemplate.CREATE_SEMINAR.equals(activity.getCode()) - ); + return (activity.isAutomatic() && MilestoneActivityTemplate.CREATE_SEMINAR.equals(activity.getCode())); } private boolean isCorrectActivityType(IModel<MilestoneActivityTemplate> activityModel) { @@ -140,15 +137,8 @@ public class MileStoneCheckBoxPanel extends Panel { ); } - private void updateProjectMileStone( - IModel<MilestoneActivityTemplate> activityModel, - boolean isConfirmed - ) { - mileStoneService.setConfirmed( - projectModel.getObject(), - activityModel.getObject(), - !isConfirmed - ); + private void updateProjectMileStone(IModel<MilestoneActivityTemplate> activityModel, boolean isConfirmed) { + mileStoneService.setConfirmed(projectModel.getObject(), activityModel.getObject(), !isConfirmed); } private String getConfirmationMessage(boolean isConfirmed) { diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java index 372feb68d4..2c08e4e10a 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java @@ -48,10 +48,7 @@ public class MileStoneOverviewPanel extends Panel { private void addTableHeaderWithStudentNames() { container.add( - new ListView<>( - STUDENT_HEADER, - new ArrayList<>(projectModel.getObject().getProjectParticipants()) - ) { + new ListView<>(STUDENT_HEADER, new ArrayList<>(projectModel.getObject().getProjectParticipants())) { @Override protected void populateItem(ListItem<User> item) { item.add(new Label(STUDENT_NAME, item.getModelObject().getFullName())); @@ -65,13 +62,9 @@ public class MileStoneOverviewPanel extends Panel { new ListView<>(PHASE_LIST, getPhaseListModel()) { @Override protected void populateItem(ListItem<MilestonePhaseTemplate> item) { - ListView<MilestoneActivityTemplate> mileStoneList = addMileStoneList( - item.getModel() - ); + ListView<MilestoneActivityTemplate> mileStoneList = addMileStoneList(item.getModel()); item.add(mileStoneList); - item.add( - new Label(TITLE, item.getModel().map(MilestonePhaseTemplate::getTitle)) - ); + item.add(new Label(TITLE, item.getModel().map(MilestonePhaseTemplate::getTitle))); item.setVisible(mileStoneList.getViewSize() > 0); } } @@ -88,10 +81,7 @@ public class MileStoneOverviewPanel extends Panel { ) ); container.add( - new ListView<>( - STUDENT_COUNTER_LIST, - new ArrayList<>(projectModel.getObject().getProjectParticipants()) - ) { + new ListView<>(STUDENT_COUNTER_LIST, new ArrayList<>(projectModel.getObject().getProjectParticipants())) { @Override protected void populateItem(ListItem<User> item) { item.add( @@ -107,23 +97,13 @@ public class MileStoneOverviewPanel extends Panel { ); } - private ListView<MilestoneActivityTemplate> addMileStoneList( - final IModel<MilestonePhaseTemplate> phaseModel - ) { + private ListView<MilestoneActivityTemplate> addMileStoneList(final IModel<MilestonePhaseTemplate> phaseModel) { return new ListView<>(MILESTONE_LIST, getActivityListModel(phaseModel)) { @Override protected void populateItem(ListItem<MilestoneActivityTemplate> item) { + item.add(new Label(MILESTONE_TITLE, item.getModel().map(MilestoneActivityTemplate::getTitle))); item.add( - new Label( - MILESTONE_TITLE, - item.getModel().map(MilestoneActivityTemplate::getTitle) - ) - ); - item.add( - new InfoPanel( - MILESTONE_DESCRIPTION, - item.getModel().map(MilestoneActivityTemplate::getDescription) - ) + new InfoPanel(MILESTONE_DESCRIPTION, item.getModel().map(MilestoneActivityTemplate::getDescription)) ); addSupervisorCheckBox(item); addAuthorStatusCheck(item); @@ -144,9 +124,7 @@ public class MileStoneOverviewPanel extends Panel { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - isSupervisorView() || activityModel.getObject().isEditableByStudents() - ); + setVisibilityAllowed(isSupervisorView() || activityModel.getObject().isEditableByStudents()); } } ); @@ -164,9 +142,7 @@ public class MileStoneOverviewPanel extends Panel { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - !isSupervisorView() && !activityModel.getObject().isEditableByStudents() - ); + setVisibilityAllowed(!isSupervisorView() && !activityModel.getObject().isEditableByStudents()); } } ); @@ -175,10 +151,7 @@ public class MileStoneOverviewPanel extends Panel { private void addStudentColumns(ListItem<MilestoneActivityTemplate> item) { final IModel<MilestoneActivityTemplate> activityModel = item.getModel(); item.add( - new ListView<>( - STUDENTS, - new ArrayList<>(projectModel.getObject().getProjectParticipants()) - ) { + new ListView<>(STUDENTS, new ArrayList<>(projectModel.getObject().getProjectParticipants())) { @Override protected void populateItem(ListItem<User> item) { item.add( @@ -193,8 +166,7 @@ public class MileStoneOverviewPanel extends Panel { protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - isSupervisorView() || - activityModel.getObject().isEditableByStudents() + isSupervisorView() || activityModel.getObject().isEditableByStudents() ); } } @@ -211,8 +183,7 @@ public class MileStoneOverviewPanel extends Panel { protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - !isSupervisorView() && - !activityModel.getObject().isEditableByStudents() + !isSupervisorView() && !activityModel.getObject().isEditableByStudents() ); } } @@ -237,10 +208,7 @@ public class MileStoneOverviewPanel extends Panel { return new LoadableDetachableModel<>() { @Override protected List<MilestoneActivityTemplate> load() { - return activityService.findActiveByPhase( - phaseModel.getObject(), - projectModel.getObject() - ); + return activityService.findActiveByPhase(phaseModel.getObject(), projectModel.getObject()); } }; } @@ -251,11 +219,7 @@ public class MileStoneOverviewPanel extends Panel { protected Long load() { return studentModel == null ? mileStoneService.countProjectMilestones(projectModel.getObject(), true) - : mileStoneService.countMileStones( - projectModel.getObject(), - studentModel.getObject(), - true - ); + : mileStoneService.countMileStones(projectModel.getObject(), studentModel.getObject(), true); } }; } diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java index d22ceaedd6..22af7e2583 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java @@ -49,17 +49,12 @@ public class MileStoneProgressPanel extends Panel { int index, IModel<MilestoneActivityTemplate> itemModel ) { - return new ListItem<MilestoneActivityTemplate>( - index, - getListItemModel(getModel(), index) - ) { + return new ListItem<MilestoneActivityTemplate>(index, getListItemModel(getModel(), index)) { @Override protected void onComponentTag(final ComponentTag tag) { tag.put( "class", - (getIndex() > completed.getObject() - 1) - ? "progress-white" - : "progress-green" + (getIndex() > completed.getObject() - 1) ? "progress-white" : "progress-green" ); super.onComponentTag(tag); } diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java index 7548945539..81c287b63e 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java @@ -44,9 +44,7 @@ public class MileStoneStatusPanel extends Panel { this.activityType = type; final boolean isProjectMileStone = studentModel == null; - final Milestone milestone = isProjectMileStone - ? getProjectMileStone() - : getStudentMileStone(studentModel); + final Milestone milestone = isProjectMileStone ? getProjectMileStone() : getStudentMileStone(studentModel); add( new WebComponent(CHECK_ICON) { @@ -64,8 +62,7 @@ public class MileStoneStatusPanel extends Panel { protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - !milestone.isConfirmed() && - activityType == activityModel.getObject().getType() + !milestone.isConfirmed() && activityType == activityModel.getObject().getType() ); } }.add(new AttributeAppender("title", getNotCompletedModel(), "")) diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java index 209af3cbd7..6c67199ea9 100644 --- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java @@ -53,11 +53,7 @@ public class MilestoneSummaryPanel extends Panel { new ListView<>( STUDENT_LIST, new ListAdapterModel<>( - LambdaModel.of( - projectModel, - Project::getProjectParticipants, - Project::setProjectParticipants - ) + LambdaModel.of(projectModel, Project::getProjectParticipants, Project::setProjectParticipants) ) ) { @Override @@ -77,9 +73,7 @@ public class MilestoneSummaryPanel extends Panel { } private void addUpcomingActivities() { - final FilteredListModel<MilestoneActivityTemplate> upcoming = new FilteredListModel<>( - getActivitiesInOrder() - ) { + final FilteredListModel<MilestoneActivityTemplate> upcoming = new FilteredListModel<>(getActivitiesInOrder()) { @Override protected boolean accept(MilestoneActivityTemplate mileStoneActivity) { return !mileStoneService.isConfirmed(projectModel.getObject(), mileStoneActivity); @@ -88,9 +82,7 @@ public class MilestoneSummaryPanel extends Panel { ListView<MilestoneActivityTemplate> listView = new ListView<>(UPCOMING_LIST, upcoming) { @Override protected void populateItem(final ListItem<MilestoneActivityTemplate> item) { - item.add( - new Label(TITLE, item.getModel().map(MilestoneActivityTemplate::getTitle)) - ); + item.add(new Label(TITLE, item.getModel().map(MilestoneActivityTemplate::getTitle))); } }; listView.setViewSize(ACTIVITIES_TO_SHOW); @@ -98,13 +90,7 @@ public class MilestoneSummaryPanel extends Panel { } private IModel<Long> countStudent(final IModel<User> studentModel) { - return Model.of( - mileStoneService.countMileStones( - projectModel.getObject(), - studentModel.getObject(), - true - ) - ); + return Model.of(mileStoneService.countMileStones(projectModel.getObject(), studentModel.getObject(), true)); } private IModel<Long> countProject() { diff --git a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java index bc18c8375c..aa720b0876 100755 --- a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java @@ -41,11 +41,7 @@ public abstract class NonWorkDaysCRUDPanel extends Panel { form.add( new RequiredTextField<>( START_DATE, - LambdaModel.of( - model, - NonWorkDayPeriod::getStartDate, - NonWorkDayPeriod::setStartDate - ), + LambdaModel.of(model, NonWorkDayPeriod::getStartDate, NonWorkDayPeriod::setStartDate), LocalDate.class ).add(new BootstrapDatePicker()) ); diff --git a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java index dd79ac45d0..8e2dcd5b65 100644 --- a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java +++ b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java @@ -75,9 +75,7 @@ public class NonWorkDaysPage extends AbstractAdminProjectPage { } private void addDataTable() { - SortableDataProvider<NonWorkDayPeriod, String> provider = new GenericDataProvider<>( - nonWorkDayPeriodService - ); + SortableDataProvider<NonWorkDayPeriod, String> provider = new GenericDataProvider<>(nonWorkDayPeriodService); provider.setSort("startDate", SortOrder.DESCENDING); dp = new ExportableDataPanel<>(DATA_PANEL, createColumns(), provider); add(dp); @@ -85,9 +83,7 @@ public class NonWorkDaysPage extends AbstractAdminProjectPage { private List<IColumn<NonWorkDayPeriod, String>> createColumns() { List<IColumn<NonWorkDayPeriod, String>> columns = new ArrayList<>(); - columns.add( - new LambdaColumn<>(Model.of("From"), "startDate", NonWorkDayPeriod::getStartDate) - ); + columns.add(new LambdaColumn<>(Model.of("From"), "startDate", NonWorkDayPeriod::getStartDate)); columns.add(new LambdaColumn<>(Model.of("To"), "endDate", NonWorkDayPeriod::getEndDate)); columns.add(new LambdaColumn<>(Model.of("Comment"), NonWorkDayPeriod::getComment)); columns.add( diff --git a/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java b/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java index 73031d1ffc..858744f8cf 100644 --- a/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java +++ b/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java @@ -34,10 +34,7 @@ public class NotesPage extends MenuPage { add( new NoteForm( "form", - new DetachableServiceModel<>( - noteService, - noteService.getNote(SciProSession.get().getUser()) - ) + new DetachableServiceModel<>(noteService, noteService.getNote(SciProSession.get().getUser())) ) ); } @@ -66,13 +63,7 @@ public class NotesPage extends MenuPage { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render( - OnEventHeaderItem.forComponent( - get("content"), - "keydown", - "$('#feedback').fadeOut()" - ) - ); + response.render(OnEventHeaderItem.forComponent(get("content"), "keydown", "$('#feedback').fadeOut()")); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/NotificationLoader.java b/view/src/main/java/se/su/dsv/scipro/notifications/NotificationLoader.java index d8807609a4..156484db01 100755 --- a/view/src/main/java/se/su/dsv/scipro/notifications/NotificationLoader.java +++ b/view/src/main/java/se/su/dsv/scipro/notifications/NotificationLoader.java @@ -14,33 +14,19 @@ public class NotificationLoader implements IStringResourceLoader { private static final Logger LOGGER = LoggerFactory.getLogger(NotificationLoader.class); @Override - public String loadStringResource( - Class<?> clazz, - String key, - Locale locale, - String style, - String variation - ) { + public String loadStringResource(Class<?> clazz, String key, Locale locale, String style, String variation) { return getKeywordString(key); } @Override - public String loadStringResource( - Component component, - String key, - Locale locale, - String style, - String variation - ) { + public String loadStringResource(Component component, String key, Locale locale, String style, String variation) { return getKeywordString(key); } private String getKeywordString(String key) { String keyWord = null; try { - Properties p = PropsUtils.load( - "se/su/dsv/scipro/notifications/notifications.properties" - ); + Properties p = PropsUtils.load("se/su/dsv/scipro/notifications/notifications.properties"); keyWord = p.getProperty(key); } catch (IOException e) { LOGGER.error("Could not get property", e); diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java b/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java index 5a6e2f73b6..4a999d66f4 100644 --- a/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java +++ b/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java @@ -43,9 +43,7 @@ import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.util.PageParameterKeys; @Authorization( - authorizedRoles = { - Roles.AUTHOR, Roles.SUPERVISOR, Roles.REVIEWER, Roles.EXAMINER, Roles.ADMIN, Roles.SYSADMIN, - } + authorizedRoles = { Roles.AUTHOR, Roles.SUPERVISOR, Roles.REVIEWER, Roles.EXAMINER, Roles.ADMIN, Roles.SYSADMIN } ) public class NotificationLandingPage extends WebPage { @@ -135,15 +133,8 @@ public class NotificationLandingPage extends WebPage { EXPORTED_SUCCESS: defaultSplit.accept(ProjectDetailsPage.class, SupervisorProjectDetailsPage.class); break; - case ACTIVITY_ADDED, - ACTIVITY_REMOVED, - ACTIVITY_EDITED, - CHECKLIST_ADDED, - CHECKLIST_ANSWERED: - defaultSplit.accept( - ProjectActivityPlanPage.class, - SupervisorActivityPlanPage.class - ); + case ACTIVITY_ADDED, ACTIVITY_REMOVED, ACTIVITY_EDITED, CHECKLIST_ADDED, CHECKLIST_ANSWERED: + defaultSplit.accept(ProjectActivityPlanPage.class, SupervisorActivityPlanPage.class); break; case FILE_UPLOADED: defaultSplit.accept(ProjectFilePage.class, SupervisorFilePage.class); @@ -152,36 +143,25 @@ public class NotificationLandingPage extends WebPage { defaultSplit.accept(ProjectMileStonePage.class, SupervisorMileStonePage.class); break; case FILE_SIZE_TOO_BIG: - defaultSplit.accept( - ProjectFinalSeminarPage.class, - SupervisorFinalSeminarPage.class - ); + defaultSplit.accept(ProjectFinalSeminarPage.class, SupervisorFinalSeminarPage.class); break; case FINAL_THESIS_UPLOADED: defaultSplit.accept(ProjectDetailsPage.class, SupervisorGradingReportPage.class); break; - case FINAL_SEMINAR_APPROVAL_REQUESTED, - FINAL_SEMINAR_APPROVAL_APPROVED, - FINAL_SEMINAR_APPROVAL_REJECTED: + case FINAL_SEMINAR_APPROVAL_REQUESTED, FINAL_SEMINAR_APPROVAL_APPROVED, FINAL_SEMINAR_APPROVAL_REJECTED: final PageParameters finalSeminarApprovalPP = new PageParameters(pp); finalSeminarApprovalPP.set("anchor", "finalSeminarApproval"); if (project.isSupervisor(currentUser)) { - setResponsePage( - SupervisorInteractWithReviewerPage.class, - finalSeminarApprovalPP - ); + setResponsePage(SupervisorInteractWithReviewerPage.class, finalSeminarApprovalPP); } else if (project.isReviewer(currentUser)) { setResponsePage(ReviewerStartPage.class, finalSeminarApprovalPP); } break; - case ROUGH_DRAFT_APPROVAL_REQUESTED, - ROUGH_DRAFT_APPROVAL_APPROVED, - ROUGH_DRAFT_APPROVAL_REJECTED: + case ROUGH_DRAFT_APPROVAL_REQUESTED, ROUGH_DRAFT_APPROVAL_APPROVED, ROUGH_DRAFT_APPROVAL_REJECTED: if (project.isSupervisor(currentUser)) { setResponsePage(SupervisorInteractWithReviewerPage.class, pp); } else if (project.isReviewer(currentUser)) { - PageParameters reviewerParameters = - RoughDraftApprovalDecisionPage.pageParametersFor(project); + PageParameters reviewerParameters = RoughDraftApprovalDecisionPage.pageParametersFor(project); setResponsePage(RoughDraftApprovalDecisionPage.class, reviewerParameters); } break; @@ -198,16 +178,10 @@ public class NotificationLandingPage extends WebPage { } break; case FIRST_MEETING: - defaultSplit.accept( - ProjectFirstMeetingPage.class, - SupervisorFirstMeetingPage.class - ); + defaultSplit.accept(ProjectFirstMeetingPage.class, SupervisorFirstMeetingPage.class); break; case OPPOSITION_FAILED: - defaultSplit.accept( - ProjectOppositionPage.class, - SupervisorProjectDetailsPage.class - ); + defaultSplit.accept(ProjectOppositionPage.class, SupervisorProjectDetailsPage.class); break; default: // no specific redirect, will default to start page @@ -218,9 +192,7 @@ public class NotificationLandingPage extends WebPage { final User currentUser = SciProSession.get().getUser(); final Idea idea = ideaEvent.getIdea(); - if ( - idea.getIdeaParticipations().stream().anyMatch(ip -> ip.getUser().equals(currentUser)) - ) { + if (idea.getIdeaParticipations().stream().anyMatch(ip -> ip.getUser().equals(currentUser))) { setResponsePage(ProjectIdeaStartPage.class); } else if ( idea.getMatch() != null && @@ -243,8 +215,7 @@ public class NotificationLandingPage extends WebPage { } else if (hasSupervisingRole(seminar.getProject(), currentUser)) { setResponsePage(SupervisorFinalSeminarPage.class, pp); } else if ( - seminar.getActiveParticipants().contains(currentUser) || - seminar.getOpponents().contains(currentUser) + seminar.getActiveParticipants().contains(currentUser) || seminar.getOpponents().contains(currentUser) ) { setResponsePage(ProjectFinalSeminarDetailsPage.class, pp); } @@ -299,10 +270,7 @@ public class NotificationLandingPage extends WebPage { case REQUEST_DELETED: if (peerRequest.getRequester().equals(currentUser)) { final PageParameters pp = new PageParameters(); - pp.set( - PageParameterKeys.MAP.get(Project.class), - peerRequestEvent.getProject().getId() - ); + pp.set(PageParameterKeys.MAP.get(Project.class), peerRequestEvent.getProject().getId()); setResponsePage(PeerPortalPage.class, pp); } break; @@ -314,10 +282,7 @@ public class NotificationLandingPage extends WebPage { .findAny(); if (peerReview.isPresent()) { final PageParameters pp = new PageParameters(); - pp.set( - PageParameterKeys.MAP.get(Project.class), - peerReview.get().getProject().getId() - ); + pp.set(PageParameterKeys.MAP.get(Project.class), peerReview.get().getProject().getId()); setResponsePage(PeerPortalPage.class, pp); } break; @@ -345,16 +310,9 @@ public class NotificationLandingPage extends WebPage { final PageParameters pp = new PageParameters(); pp.set(PageParameterKeys.MAP.get(Group.class), group.getId()); - if ( - group - .getProjects() - .stream() - .anyMatch(project -> hasSupervisingRole(project, currentUser)) - ) { + if (group.getProjects().stream().anyMatch(project -> hasSupervisingRole(project, currentUser))) { setResponsePage(SupervisorGroupPage.class, pp); - } else if ( - group.getProjects().stream().anyMatch(project -> project.isParticipant(currentUser)) - ) { + } else if (group.getProjects().stream().anyMatch(project -> project.isParticipant(currentUser))) { setResponsePage(AuthorGroupPage.class, pp); } } @@ -368,13 +326,7 @@ public class NotificationLandingPage extends WebPage { switch (projectForumEvent.getEvent()) { case NEW_FORUM_POST, NEW_FORUM_POST_COMMENT: - roleSplit( - currentUser, - project, - ProjectForumBasePage.class, - SupervisorForumBasePage.class, - pp - ); + roleSplit(currentUser, project, ProjectForumBasePage.class, SupervisorForumBasePage.class, pp); break; case NEW_REVIEWER_INTERACTION: if (project.isSupervisor(currentUser)) { @@ -403,8 +355,6 @@ public class NotificationLandingPage extends WebPage { } private boolean hasSupervisingRole(final Project project, final User user) { - return ( - project.isSupervisor(user) || project.isReviewer(user) || project.isCoSupervisor(user) - ); + return (project.isSupervisor(user) || project.isReviewer(user) || project.isCoSupervisor(user)); } } diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java index eb698dccce..7513a65046 100755 --- a/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java @@ -105,19 +105,14 @@ public class NotificationDataPanel extends Panel { createColumnSubject(), createColumnFrom(), createColumnRole(), - new ProjectColumn( - new StringResourceModel("column.project", NotificationDataPanel.this, null) - ) + new ProjectColumn(new StringResourceModel("column.project", NotificationDataPanel.this, null)) ); } private void addNotificationsPanel() { IModel<NotificationService.Filter> filter = getFilter(); add(new FilterForm("filterForm", filter)); - SortableDataProvider<Notification, String> provider = new FilteredDataProvider<>( - notificationService, - filter - ); + SortableDataProvider<Notification, String> provider = new FilteredDataProvider<>(notificationService, filter); provider.setSort("dateCreated", SortOrder.DESCENDING); add(new ExportableDataPanel<>("dataPanel", columns(), provider)); } @@ -151,9 +146,7 @@ public class NotificationDataPanel extends Panel { } private IColumn<Notification, String> createColumnRole() { - return new AbstractColumn<>( - new StringResourceModel("column.role", NotificationDataPanel.this, null) - ) { + return new AbstractColumn<>(new StringResourceModel("column.role", NotificationDataPanel.this, null)) { @Override public void populateItem( Item<ICellPopulator<Notification>> cellItem, @@ -163,32 +156,20 @@ public class NotificationDataPanel extends Panel { User user = rowModel.getObject().getCausedBy(); if (user == null) { cellItem.add( - new Label( - componentId, - new StringResourceModel("role.SYSTEM", NotificationDataPanel.this, null) - ) + new Label(componentId, new StringResourceModel("role.SYSTEM", NotificationDataPanel.this, null)) ); } else { Project project = rowModel.getObject().getProject(); - Member.Type type = project != null - ? projectService.getMemberType(project, user) - : null; + Member.Type type = project != null ? projectService.getMemberType(project, user) : null; if (type == null) { cellItem.add( - new Label( - componentId, - new StringResourceModel("unknown", NotificationDataPanel.this, null) - ) + new Label(componentId, new StringResourceModel("unknown", NotificationDataPanel.this, null)) ); } else { cellItem.add( new Label( componentId, - new StringResourceModel( - "role.${name()}", - NotificationDataPanel.this, - Model.of(type) - ) + new StringResourceModel("role.${name()}", NotificationDataPanel.this, Model.of(type)) ) ); } @@ -198,9 +179,7 @@ public class NotificationDataPanel extends Panel { } private IColumn<Notification, String> createColumnFrom() { - return new AbstractColumn<>( - new StringResourceModel("column.from", NotificationDataPanel.this, null) - ) { + return new AbstractColumn<>(new StringResourceModel("column.from", NotificationDataPanel.this, null)) { @Override public void populateItem( Item<ICellPopulator<Notification>> cellItem, @@ -210,9 +189,7 @@ public class NotificationDataPanel extends Panel { User user = rowModel.getObject().getCausedBy(); if (user != null) { - cellItem.add( - new UserLinkPanel(componentId, rowModel.map(Notification::getCausedBy)) - ); + cellItem.add(new UserLinkPanel(componentId, rowModel.map(Notification::getCausedBy))); } else { cellItem.add(new Label(componentId, "SciPro")); } @@ -221,16 +198,10 @@ public class NotificationDataPanel extends Panel { } private IColumn<Notification, String> createColumnSubject() { - return new AbstractExportableColumn<>( - new StringResourceModel("column.subject", this, null) - ) { + return new AbstractExportableColumn<>(new StringResourceModel("column.subject", this, null)) { @Override public IModel<String> getDataModel(IModel<Notification> model) { - return new StringResourceModel( - "${type}.${event}.title", - NotificationDataPanel.this, - model - ) + return new StringResourceModel("${type}.${event}.title", NotificationDataPanel.this, model) .setDefaultValue( MessageFormat.format( "Missing property: {0}.{1}.title", @@ -261,11 +232,7 @@ public class NotificationDataPanel extends Panel { ); link.setBody(getDataModel(rowModel)); - final Fragment fragment = new Fragment( - componentId, - "subject", - NotificationDataPanel.this - ); + final Fragment fragment = new Fragment(componentId, "subject", NotificationDataPanel.this); fragment.add(link); cellItem.add(fragment); @@ -281,10 +248,7 @@ public class NotificationDataPanel extends Panel { @Override public IModel<String> getDataModel(final IModel<Notification> rowModel) { - return rowModel - .map(Notification::getProject) - .map(Project::getTitle) - .orElseGet(() -> getString("unknown")); + return rowModel.map(Notification::getProject).map(Project::getTitle).orElseGet(() -> getString("unknown")); } @Override @@ -298,11 +262,7 @@ public class NotificationDataPanel extends Panel { if (project != null) { pp.add(PageParameterKeys.MAP.get(Project.class), project.getId()); } - Fragment fragment = new Fragment( - componentId, - "projectTitle", - NotificationDataPanel.this - ); + Fragment fragment = new Fragment(componentId, "projectTitle", NotificationDataPanel.this); BookmarkablePageLink<Object> link = new BookmarkablePageLink<>( "projectLink", getProjectDetailsPageClass(project), @@ -325,11 +285,7 @@ public class NotificationDataPanel extends Panel { private boolean shallBeEnable(Project project) { if (project != null) { User user = SciProSession.get().getUser(); - return ( - project.isParticipant(user) || - project.isSupervisor(user) || - project.isCoSupervisor(user) - ); + return (project.isParticipant(user) || project.isSupervisor(user) || project.isCoSupervisor(user)); } return false; } @@ -349,11 +305,7 @@ public class NotificationDataPanel extends Panel { super(id, filter); UserAutoComplete fromUser = new UserAutoComplete( "fromUser", - LambdaModel.of( - filter, - NotificationService.Filter::getFromUser, - NotificationService.Filter::setFromUser - ) + LambdaModel.of(filter, NotificationService.Filter::getFromUser, NotificationService.Filter::setFromUser) ) { @Override protected void action(final AjaxRequestTarget target, final User object) { diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java index d3160567e7..1c13f0691b 100644 --- a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java @@ -23,9 +23,7 @@ import se.su.dsv.scipro.session.SciProSession; public abstract class AbstractReceiverConfigurationPanel extends Panel { - private static final Logger LOGGER = LoggerFactory.getLogger( - AbstractReceiverConfigurationPanel.class - ); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractReceiverConfigurationPanel.class); static final String EVENT_LIST = "events"; static final String EVENT = "event"; @@ -42,25 +40,14 @@ public abstract class AbstractReceiverConfigurationPanel extends Panel { private final List<Enum> events; - public AbstractReceiverConfigurationPanel( - final String id, - final Notification.Type group, - final Enum[] events - ) { + public AbstractReceiverConfigurationPanel(final String id, final Notification.Type group, final Enum[] events) { super(id); this.group = group; this.events = Arrays.asList(events); } protected boolean updateSetting(Enum event, Member.Type member, boolean setting) { - LOGGER.info( - "{} is changing {}.{} for {} to {}", - SciProSession.get().getUser(), - group, - event, - member, - setting - ); + LOGGER.info("{} is changing {}.{} for {} to {}", SciProSession.get().getUser(), group, event, member, setting); return configurationService.setReceiving(group, event, member, setting); } @@ -78,12 +65,7 @@ public abstract class AbstractReceiverConfigurationPanel extends Panel { new ListView<>(MEMBER_LIST, getMemberTypes()) { @Override protected void populateItem(ListItem<Member.Type> item) { - item.add( - new Label( - MEMBER, - new StringResourceModel("${name()}", this, item.getModel()) - ) - ); + item.add(new Label(MEMBER, new StringResourceModel("${name()}", this, item.getModel()))); } } ); @@ -97,23 +79,13 @@ public abstract class AbstractReceiverConfigurationPanel extends Panel { new Label( DESCRIPTION, getString( - eventItem - .getModelObject() - .getClass() - .getEnclosingClass() - .getSimpleName() + + eventItem.getModelObject().getClass().getEnclosingClass().getSimpleName() + "." + eventItem.getModelObject().name() ) ) ); - eventItem.add( - new ConfigurationList( - CONFIGURATIONS, - getMemberTypes(), - eventItem.getModelObject() - ) - ); + eventItem.add(new ConfigurationList(CONFIGURATIONS, getMemberTypes(), eventItem.getModelObject())); } } ); @@ -132,14 +104,7 @@ public abstract class AbstractReceiverConfigurationPanel extends Panel { protected void populateItem(ListItem<Member.Type> item) { boolean setting = getSetting(event, item.getModelObject()); - item.add( - new ReceiverSettingCheckbox( - CONFIGURATION, - Model.of(setting), - event, - item.getModelObject() - ) - ); + item.add(new ReceiverSettingCheckbox(CONFIGURATION, Model.of(setting), event, item.getModelObject())); } } @@ -149,12 +114,7 @@ public abstract class AbstractReceiverConfigurationPanel extends Panel { private final Member.Type member; - public ReceiverSettingCheckbox( - String id, - IModel<Boolean> model, - Enum event, - Member.Type member - ) { + public ReceiverSettingCheckbox(String id, IModel<Boolean> model, Enum event, Member.Type member) { super(id, model); this.event = event; this.member = member; @@ -173,9 +133,7 @@ public abstract class AbstractReceiverConfigurationPanel extends Panel { protected void updateAjaxAttributes(final AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); AjaxCallListener ajaxCallListener = new AjaxCallListener(); - ajaxCallListener.onPrecondition( - "if (!confirm('Are you sure?')) {window.location.reload(); return false;}" - ); + ajaxCallListener.onPrecondition("if (!confirm('Are you sure?')) {window.location.reload(); return false;}"); attributes.getAjaxCallListeners().add(ajaxCallListener); } } diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/DeliveryConfigurationPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/DeliveryConfigurationPanel.java index dbaca8f434..ef259e3de2 100644 --- a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/DeliveryConfigurationPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/DeliveryConfigurationPanel.java @@ -13,36 +13,12 @@ public class DeliveryConfigurationPanel extends Panel { protected void onInitialize() { super.onInitialize(); - add( - createDeliveryPanel( - PROJECT_EVENTS, - Notification.Type.PROJECT, - ProjectEvent.Event.values() - ) - ); - add( - createDeliveryPanel( - SEMINAR_EVENTS, - Notification.Type.FINAL_SEMINAR, - SeminarEvent.Event.values() - ) - ); + add(createDeliveryPanel(PROJECT_EVENTS, Notification.Type.PROJECT, ProjectEvent.Event.values())); + add(createDeliveryPanel(SEMINAR_EVENTS, Notification.Type.FINAL_SEMINAR, SeminarEvent.Event.values())); add(createDeliveryPanel(IDEA_EVENTS, Notification.Type.IDEA, IdeaEvent.Event.values())); add(createDeliveryPanel(PEER_EVENTS, Notification.Type.PEER, PeerEvent.Event.values())); - add( - createDeliveryPanel( - MILESTONE_EVENTS, - Notification.Type.MILESTONE, - MileStoneEvent.Event.values() - ) - ); - add( - createDeliveryPanel( - FORUM_EVENTS, - Notification.Type.FORUM, - ProjectForumEvent.Event.values() - ) - ); + add(createDeliveryPanel(MILESTONE_EVENTS, Notification.Type.MILESTONE, MileStoneEvent.Event.values())); + add(createDeliveryPanel(FORUM_EVENTS, Notification.Type.FORUM, ProjectForumEvent.Event.values())); add(createDeliveryPanel(GROUP_EVENTS, Notification.Type.GROUP, GroupEvent.Event.values())); } diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/ReceiverConfigurationPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/ReceiverConfigurationPanel.java index 591e5df086..8815b9f79a 100644 --- a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/ReceiverConfigurationPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/ReceiverConfigurationPanel.java @@ -65,27 +65,15 @@ public class ReceiverConfigurationPanel extends Panel { } ); add( - new AbstractReceiverConfigurationPanel( - IDEA_RECEIVERS, - Notification.Type.IDEA, - IdeaEvent.Event.values() - ) { + new AbstractReceiverConfigurationPanel(IDEA_RECEIVERS, Notification.Type.IDEA, IdeaEvent.Event.values()) { @Override protected List<Member.Type> getMemberTypes() { - return Arrays.asList( - Member.Type.CREATOR, - Member.Type.CO_AUTHOR, - Member.Type.SUPERVISOR - ); + return Arrays.asList(Member.Type.CREATOR, Member.Type.CO_AUTHOR, Member.Type.SUPERVISOR); } } ); add( - new AbstractReceiverConfigurationPanel( - PEER_RECEIVERS, - Notification.Type.PEER, - PeerEvent.Event.values() - ) { + new AbstractReceiverConfigurationPanel(PEER_RECEIVERS, Notification.Type.PEER, PeerEvent.Event.values()) { @Override protected List<Member.Type> getMemberTypes() { return Arrays.asList( @@ -119,11 +107,7 @@ public class ReceiverConfigurationPanel extends Panel { ) { @Override protected List<Member.Type> getMemberTypes() { - return Arrays.asList( - Member.Type.SUPERVISOR, - Member.Type.CO_SUPERVISOR, - Member.Type.AUTHOR - ); + return Arrays.asList(Member.Type.SUPERVISOR, Member.Type.CO_SUPERVISOR, Member.Type.AUTHOR); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java index cec5da3ece..ef4ba46141 100644 --- a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java @@ -26,9 +26,7 @@ import se.su.dsv.scipro.system.User; public class TypeDeliveryConfigurationPanel extends Panel { - private static final Logger LOGGER = LoggerFactory.getLogger( - TypeDeliveryConfigurationPanel.class - ); + private static final Logger LOGGER = LoggerFactory.getLogger(TypeDeliveryConfigurationPanel.class); static final String METHODS = "methods"; static final String METHOD = "method"; @@ -43,11 +41,7 @@ public class TypeDeliveryConfigurationPanel extends Panel { private Enum<?>[] eventValues; private List<Enum<?>> events; - public TypeDeliveryConfigurationPanel( - final String id, - final Notification.Type type, - final Enum<?>[] events - ) { + public TypeDeliveryConfigurationPanel(final String id, final Notification.Type type, final Enum<?>[] events) { super(id); this.type = type; this.eventValues = events.clone(); @@ -66,11 +60,7 @@ public class TypeDeliveryConfigurationPanel extends Panel { item.add( new Label( METHOD, - new StringResourceModel( - "${name()}", - TypeDeliveryConfigurationPanel.this, - item.getModel() - ) + new StringResourceModel("${name()}", TypeDeliveryConfigurationPanel.this, item.getModel()) ) ); } @@ -86,11 +76,7 @@ public class TypeDeliveryConfigurationPanel extends Panel { new Label( DESCRIPTION, getString( - item - .getModelObject() - .getClass() - .getEnclosingClass() - .getSimpleName() + + item.getModelObject().getClass().getEnclosingClass().getSimpleName() + "." + item.getModelObject().name() ) @@ -109,14 +95,7 @@ public class TypeDeliveryConfigurationPanel extends Panel { } private void setDeliverySetting(Enum<?> event, DeliveryMethod method, boolean setting) { - LOGGER.info( - "{} is changing {} for {}.{} to {}", - SciProSession.get().getUser(), - method, - type, - event, - setting - ); + LOGGER.info("{} is changing {} for {}.{} to {}", SciProSession.get().getUser(), method, type, event, setting); configurationService.setDelivery(type, event, method, setting, getUser()); } @@ -176,12 +155,7 @@ public class TypeDeliveryConfigurationPanel extends Panel { private final DeliveryMethod method; - private MethodCheckbox( - final String id, - final IModel<Boolean> model, - Enum<?> event, - DeliveryMethod method - ) { + private MethodCheckbox(final String id, final IModel<Boolean> model, Enum<?> event, DeliveryMethod method) { super(id, model); this.event = event; this.method = method; @@ -202,9 +176,7 @@ public class TypeDeliveryConfigurationPanel extends Panel { protected void updateAjaxAttributes(final AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); AjaxCallListener ajaxCallListener = new AjaxCallListener(); - ajaxCallListener.onPrecondition( - "if (!confirm('Are you sure?')) {window.location.reload(); return false;}" - ); + ajaxCallListener.onPrecondition("if (!confirm('Are you sure?')) {window.location.reload(); return false;}"); attributes.getAjaxCallListeners().add(ajaxCallListener); } } diff --git a/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java b/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java index f5b26e73c0..4781b7ce2b 100644 --- a/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java +++ b/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java @@ -22,11 +22,7 @@ public class CallbackPage extends WebPage { final TokenResponse tokenResponse = oAuthService.exchangeForToken(code); if (tokenResponse != null) { getSession().setMetaData(OAuth.TOKEN, tokenResponse.accessToken()); - getSession() - .setMetaData( - OAuth.EXPIRATION, - Instant.now().plusSeconds(tokenResponse.expiresIn()) - ); + getSession().setMetaData(OAuth.EXPIRATION, Instant.now().plusSeconds(tokenResponse.expiresIn())); if (returnUrl != null) { throw new RedirectToUrlException(returnUrl); } else { diff --git a/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java b/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java index 404ce65931..e33e58686c 100755 --- a/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java @@ -53,13 +53,7 @@ public class CommentThreadPanel extends GenericPanel<PeerReview> { @Override protected void populateItem(ListItem<Comment> item) { final IModel<Comment> comment = item.getModel(); - item.add( - new DateLabel( - DATE, - comment.map(Comment::getDateCreated), - DateStyle.DATETIME - ) - ); + item.add(new DateLabel(DATE, comment.map(Comment::getDateCreated), DateStyle.DATETIME)); item.add(new UserLinkPanel(FROM, comment.map(Comment::getCreator))); item.add(new MultiLineLabel(MESSAGE, comment.map(Comment::getComment))); item.add(new DeleteLink(DELETE_LINK, item.getModel())); @@ -139,9 +133,7 @@ public class CommentThreadPanel extends GenericPanel<PeerReview> { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - getModelObject().getCreator().equals(SciProSession.get().getUser()) - ); + setVisibilityAllowed(getModelObject().getCreator().equals(SciProSession.get().getUser())); } } } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java index 4b2d3c2d8f..683a33a6c5 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java @@ -10,9 +10,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel; import se.su.dsv.scipro.statistics.AbstractAdminStatisticsPage; import se.su.dsv.scipro.util.PageParameterKeys; -public class AdminPeerReviewPage - extends AbstractAdminStatisticsPage - implements MenuHighlightAdminPeer { +public class AdminPeerReviewPage extends AbstractAdminStatisticsPage implements MenuHighlightAdminPeer { @Inject private PeerReviewService peerReviewService; @@ -28,10 +26,7 @@ public class AdminPeerReviewPage ) ); add( - new UserLinkPanel( - "reviewer", - LambdaModel.of(reviewModel, PeerReview::getReviewer, PeerReview::setReviewer) - ) + new UserLinkPanel("reviewer", LambdaModel.of(reviewModel, PeerReview::getReviewer, PeerReview::setReviewer)) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewStatusStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewStatusStatisticsPage.java index e38eca498d..33a4ec562a 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewStatusStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewStatusStatisticsPage.java @@ -6,9 +6,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.statistics.AbstractAdminStatisticsPage; @Authorization(authorizedRoles = { Roles.ADMIN }) -public class AdminPeerReviewStatusStatisticsPage - extends AbstractAdminStatisticsPage - implements MenuHighlightAdminPeer { +public class AdminPeerReviewStatusStatisticsPage extends AbstractAdminStatisticsPage implements MenuHighlightAdminPeer { public static final boolean IS_SUPERVISOR_VIEW = false; diff --git a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java index c2217961b4..f69280f767 100755 --- a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java @@ -41,9 +41,7 @@ public class AdminPeerSettingsPage extends AbstractAdminSystemPage { @Override protected void populateItem(ListItem<ProjectType> item) { item.add(new Label("projectTypeName", item.getModelObject().getName())); - item.add( - new PeerProjectTypeSettingsForm("projectTypeSettingsForm", item.getModel()) - ); + item.add(new PeerProjectTypeSettingsForm("projectTypeSettingsForm", item.getModel())); add(item); } } @@ -69,9 +67,7 @@ public class AdminPeerSettingsPage extends AbstractAdminSystemPage { } private IModel<GeneralSystemSettings> getSettingsModel() { - return LoadableDetachableModel.of( - generalSystemSettingsService::getGeneralSystemSettingsInstance - ); + return LoadableDetachableModel.of(generalSystemSettingsService::getGeneralSystemSettingsInstance); } private class PeerRatingsSettingsForm extends Form<GeneralSystemSettings> { @@ -139,9 +135,7 @@ public class AdminPeerSettingsPage extends AbstractAdminSystemPage { public PeerProjectTypeSettingsForm(final String id, IModel<ProjectType> projectType) { super(id, projectType); - IModel<ProjectTypeSettings> projectTypeSettings = projectType.map( - ProjectType::getProjectTypeSettings - ); + IModel<ProjectTypeSettings> projectTypeSettings = projectType.map(ProjectType::getProjectTypeSettings); TextField<Integer> numDaysBetweenPeerReviewsOnSameProject = new TextField<>( "numDaysBetweenPeerReviewsOnSameProject", diff --git a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeersPage.java b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeersPage.java index 465bd5626b..8c0663d99f 100755 --- a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeersPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeersPage.java @@ -17,10 +17,7 @@ public class AdminPeersPage extends AbstractAdminStatisticsPage { "peerReviewList", new PeerReviewStatisticsPanel.PageSupplier() { @Override - public Page statusPage( - IModel<PeerReview.ReviewStatus> model, - PeerReviewService.Filter filter - ) { + public Page statusPage(IModel<PeerReview.ReviewStatus> model, PeerReviewService.Filter filter) { filter.setStatuses(Collections.singletonList(model.getObject())); return new AdminPeerReviewStatusStatisticsPage(filter); } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/DisplayReviewPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/DisplayReviewPanel.java index 3a2612c19c..6581fd299a 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/DisplayReviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/DisplayReviewPanel.java @@ -35,11 +35,7 @@ public class DisplayReviewPanel extends GenericPanel<PeerReview> { protected void populateItem(ListItem<Answer> item) { int index = item.getIndex(); - DisplayQuestionPanel dqPanel = new DisplayQuestionPanel( - "questionPanel", - item.getModel(), - index - ); + DisplayQuestionPanel dqPanel = new DisplayQuestionPanel("questionPanel", item.getModel(), index); dqPanel.setOutputMarkupId(true); item.add(dqPanel); } @@ -62,10 +58,7 @@ public class DisplayReviewPanel extends GenericPanel<PeerReview> { add(reviewComment); add( - new ViewAttachmentPanel( - "file", - reviewModel.map(PeerReview::getFile).map(FileReference::getFileDescription) - ) + new ViewAttachmentPanel("file", reviewModel.map(PeerReview::getFile).map(FileReference::getFileDescription)) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java index 1baa8426be..ed96466d52 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java @@ -50,16 +50,10 @@ public class LatestReviewPanel extends Panel { @Override protected void populateItem(ListItem<PeerReview> item) { item.add( - new Label( - "reviewer", - item.getModel().map(PeerReview::getReviewer).map(User::getFullName) - ) + new Label("reviewer", item.getModel().map(PeerReview::getReviewer).map(User::getFullName)) ); PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(PeerReview.class), - item.getModelObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(PeerReview.class), item.getModelObject().getId()); BookmarkablePageLink<Void> link = new BookmarkablePageLink<>( REVIEW_LINK, ViewPeerReviewPage.class, diff --git a/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java index 6899e22336..109353d3b7 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java @@ -56,11 +56,7 @@ public class MyPeerPanel extends GenericPanel<Project> { item.add( new DateLabel( REVIEW_DATE, - LambdaModel.of( - item.getModel(), - PeerReview::getDateCreated, - PeerReview::setDateCreated - ) + LambdaModel.of(item.getModel(), PeerReview::getDateCreated, PeerReview::setDateCreated) ) ); BookmarkablePageLink<Object> link = new BookmarkablePageLink<>( @@ -82,11 +78,7 @@ public class MyPeerPanel extends GenericPanel<Project> { item.add( new EnumLabel<>( REVIEW_STATUS, - LambdaModel.of( - item.getModel(), - PeerReview::getStatus, - PeerReview::setStatus - ) + LambdaModel.of(item.getModel(), PeerReview::getStatus, PeerReview::setStatus) ) ); } @@ -112,12 +104,7 @@ public class MyPeerPanel extends GenericPanel<Project> { new ListView<>(REQUEST_LIST, getPeerRequests()) { @Override protected void populateItem(ListItem<PeerRequest> item) { - item.add( - new DateLabel( - REQUEST_DATE, - item.getModel().map(PeerRequest::getDateCreated) - ) - ); + item.add(new DateLabel(REQUEST_DATE, item.getModel().map(PeerRequest::getDateCreated))); item.add(new RequestLink(REQUEST_LINK, item.getModel())); item.add(new CancelLink(CANCEL, item.getModel())); } @@ -136,10 +123,7 @@ public class MyPeerPanel extends GenericPanel<Project> { private PageParameters getReviewParameters(PeerReview review) { PageParameters pageParameters = new PageParameters(); - pageParameters.add( - PageParameterKeys.MAP.get(PeerReview.class), - review != null ? review.getId() : "" - ); + pageParameters.add(PageParameterKeys.MAP.get(PeerReview.class), review != null ? review.getId() : ""); return pageParameters; } @@ -159,10 +143,7 @@ public class MyPeerPanel extends GenericPanel<Project> { return new LoadableDetachableModel<>() { @Override protected List<PeerRequest> load() { - return peerRequestService.findByRequesterAndProject( - SciProSession.get().getUser(), - getModelObject() - ); + return peerRequestService.findByRequesterAndProject(SciProSession.get().getUser(), getModelObject()); } }; } @@ -172,18 +153,9 @@ public class MyPeerPanel extends GenericPanel<Project> { private IModel<PeerRequest> model; public RequestLink(String id, IModel<PeerRequest> model) { - super( - id, - ViewPeerReviewPage.class, - getReviewParameters(model.getObject().getPeerReview()) - ); + super(id, ViewPeerReviewPage.class, getReviewParameters(model.getObject().getPeerReview())); this.model = model; - add( - new EnumLabel<>( - REQUEST_STATUS, - LambdaModel.of(model, PeerRequest::getStatus, PeerRequest::setStatus) - ) - ); + add(new EnumLabel<>(REQUEST_STATUS, LambdaModel.of(model, PeerRequest::getStatus, PeerRequest::setStatus))); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java index fca3ba5f35..05b40ec993 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java @@ -78,15 +78,11 @@ public class PeerPortalHeader extends GenericPanel<Project> { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render( - OnEventHeaderItem.forMarkupId("toggleDown", "click", "$('#submit').slideDown();") - ); + response.render(OnEventHeaderItem.forMarkupId("toggleDown", "click", "$('#submit').slideDown();")); } private boolean hasReviewInProgress() { - return !peerReviewService - .findInProgressReviews(SciProSession.get().getUser(), getModelObject()) - .isEmpty(); + return !peerReviewService.findInProgressReviews(SciProSession.get().getUser(), getModelObject()).isEmpty(); } protected boolean submissionStartsCollapsed() { @@ -101,9 +97,7 @@ public class PeerPortalHeader extends GenericPanel<Project> { PeerReviewService.Filter reviewParams = new PeerReviewService.Filter(); reviewParams.setAuthor(SciProSession.get().getUser()); reviewParams.setAuthorProject(getModelObject()); - reviewParams.setStatuses( - Arrays.asList(PeerReview.ReviewStatus.COMPLETED, PeerReview.ReviewStatus.IN_PROGRESS) - ); + reviewParams.setStatuses(Arrays.asList(PeerReview.ReviewStatus.COMPLETED, PeerReview.ReviewStatus.IN_PROGRESS)); return peerReviewService.count(reviewParams); } @@ -115,9 +109,7 @@ public class PeerPortalHeader extends GenericPanel<Project> { private PeerRequestService.Filter getRequestParams() { PeerRequestService.Filter requestParams = new PeerRequestService.Filter(); requestParams.setAuthor(SciProSession.get().getUser()); - requestParams.setStatuses( - Arrays.asList(RequestStatus.WAITING, RequestStatus.FINISHED, RequestStatus.TAKEN) - ); + requestParams.setStatuses(Arrays.asList(RequestStatus.WAITING, RequestStatus.FINISHED, RequestStatus.TAKEN)); requestParams.setProject(getModelObject()); return requestParams; } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java index 8a8756e7f2..fc4f6e54f0 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java @@ -7,9 +7,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAuthorMyProjects; import se.su.dsv.scipro.session.SciProSession; -public class PeerPortalPage - extends AbstractPeerPortalPage - implements MenuHighlightAuthorMyProjects { +public class PeerPortalPage extends AbstractPeerPortalPage implements MenuHighlightAuthorMyProjects { @Inject private PerformReviewService performReviewService; @@ -21,10 +19,7 @@ public class PeerPortalPage IModel<PeerReview> peerReview = new LoadableDetachableModel<>() { @Override protected PeerReview load() { - return performReviewService.getInProgressReview( - SciProSession.get().getUser(), - getActiveProject() - ); + return performReviewService.getInProgressReview(SciProSession.get().getUser(), getActiveProject()); } }; add(new PerformReviewPanel("performReview", peerReview)); diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java index ba6f880bbd..6be64d9a11 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java @@ -78,25 +78,13 @@ public class PeerRequestListPanel extends Panel { ); columns.add( - new UserColumn<>( - new ResourceModel("authorHeader"), - "requester.fullName", - PeerRequest::getRequester - ) + new UserColumn<>(new ResourceModel("authorHeader"), "requester.fullName", PeerRequest::getRequester) ); columns.add( - new LambdaColumn<>(new ResourceModel("projectHeader"), "project.title", pr -> - pr.getProject().getTitle() - ) - ); - columns.add( - new EnumLambdaColumn<>( - new ResourceModel("statusHeader"), - "status", - PeerRequest::getStatus - ) + new LambdaColumn<>(new ResourceModel("projectHeader"), "project.title", pr -> pr.getProject().getTitle()) ); + columns.add(new EnumLambdaColumn<>(new ResourceModel("statusHeader"), "status", PeerRequest::getStatus)); return columns; } @@ -116,10 +104,7 @@ public class PeerRequestListPanel extends Panel { add(authorField); java.util.List<Language> languages = Arrays.asList(Language.values()); - final IModel<Language> languagePropertyModel = LambdaModel.of( - filter::getLanguage, - filter::setLanguage - ); + final IModel<Language> languagePropertyModel = LambdaModel.of(filter::getLanguage, filter::setLanguage); final DropDownChoice<Language> languageFilter = new DropDownChoice<>( "filterLanguage", languagePropertyModel, @@ -141,18 +126,17 @@ public class PeerRequestListPanel extends Panel { addProjectTypesFilter(); - AjaxCheckBoxMultipleChoice<RequestStatus> requestStatus = - new AjaxCheckBoxMultipleChoice<>( - "statusFilter", - getRequestStatusModel(), - asList(RequestStatus.values()), - new EnumChoiceRenderer<>(this) - ) { - @Override - public void onUpdate(AjaxRequestTarget target) { - target.add(table); - } - }; + AjaxCheckBoxMultipleChoice<RequestStatus> requestStatus = new AjaxCheckBoxMultipleChoice<>( + "statusFilter", + getRequestStatusModel(), + asList(RequestStatus.values()), + new EnumChoiceRenderer<>(this) + ) { + @Override + public void onUpdate(AjaxRequestTarget target) { + target.add(table); + } + }; add(requestStatus); Instant start = Instant.now().minus(Duration.of(DAYS_IN_YEAR, ChronoUnit.DAYS)); @@ -172,10 +156,7 @@ public class PeerRequestListPanel extends Panel { filter.setCreatedAfter(Date.from(start)); filter.setCreatedBefore(datePanel.getEndDate()); add(datePanel); - final AjaxCheckBox supervisorProjects = new AjaxCheckBox( - "supervisorCheckBox", - Model.of(false) - ) { + final AjaxCheckBox supervisorProjects = new AjaxCheckBox("supervisorCheckBox", Model.of(false)) { @Override protected void onUpdate(AjaxRequestTarget target) { if (this.getModelObject()) { @@ -191,19 +172,18 @@ public class PeerRequestListPanel extends Panel { } private void addProjectTypesFilter() { - AjaxCheckBoxMultipleChoice<ProjectType> projectTypeFilter = - new AjaxCheckBoxMultipleChoice<>( - "projectTypeFilter", - projectTypeService.findWithModule(ProjectModule.PEER), - projectTypeService.findWithModule(ProjectModule.PEER), - new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) - ) { - @Override - public void onUpdate(AjaxRequestTarget target) { - filter.setProjectTypes(getModelObject()); - target.add(table); - } - }; + AjaxCheckBoxMultipleChoice<ProjectType> projectTypeFilter = new AjaxCheckBoxMultipleChoice<>( + "projectTypeFilter", + projectTypeService.findWithModule(ProjectModule.PEER), + projectTypeService.findWithModule(ProjectModule.PEER), + new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) + ) { + @Override + public void onUpdate(AjaxRequestTarget target) { + filter.setProjectTypes(getModelObject()); + target.add(table); + } + }; filter.setProjectTypes(projectTypeFilter.getModelObject()); add(projectTypeFilter); } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java index 18d65e1553..6c5f768924 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java @@ -65,12 +65,7 @@ public class PeerRequestSelectionPanel extends GenericPanel<Project> { ) { @Override protected void populateItem(Item<PeerRequest> item) { - item.add( - new Label( - TITLE, - item.getModel().map(PeerRequest::getProject).map(Project::getTitle) - ) - ); + item.add(new Label(TITLE, item.getModel().map(PeerRequest::getProject).map(Project::getTitle))); item.add(new RequestDetailsPanel(REQUEST_DETAILS, item.getModel())); item.add(new AcceptLink(ACCEPT, item.getModel())); } @@ -95,18 +90,8 @@ public class PeerRequestSelectionPanel extends GenericPanel<Project> { final IModel<ProjectTypeSettings> projectTypeSettingsModel = getModel() .map(Project::getProjectType) .map(ProjectType::getProjectTypeSettings); - add( - new Label( - DAYS_TO_SUBMIT, - new StringResourceModel("daysToSubmit", projectTypeSettingsModel) - ) - ); - add( - new Label( - RECENTLY_REVIEWED, - new StringResourceModel("recentlyReviewed", projectTypeSettingsModel) - ) - ); + add(new Label(DAYS_TO_SUBMIT, new StringResourceModel("daysToSubmit", projectTypeSettingsModel))); + add(new Label(RECENTLY_REVIEWED, new StringResourceModel("recentlyReviewed", projectTypeSettingsModel))); } @Override @@ -123,18 +108,14 @@ public class PeerRequestSelectionPanel extends GenericPanel<Project> { PeerReviewService.Filter reviewParams = new PeerReviewService.Filter(); reviewParams.setAuthor(getUser()); reviewParams.setAuthorProject(getModelObject()); - reviewParams.setStatuses( - Arrays.asList(PeerReview.ReviewStatus.COMPLETED, PeerReview.ReviewStatus.IN_PROGRESS) - ); + reviewParams.setStatuses(Arrays.asList(PeerReview.ReviewStatus.COMPLETED, PeerReview.ReviewStatus.IN_PROGRESS)); return peerReviewService.count(reviewParams); } private long countRequests() { PeerRequestService.Filter requestParams = new PeerRequestService.Filter(); requestParams.setAuthor(getUser()); - requestParams.setStatuses( - Arrays.asList(RequestStatus.WAITING, RequestStatus.FINISHED, RequestStatus.TAKEN) - ); + requestParams.setStatuses(Arrays.asList(RequestStatus.WAITING, RequestStatus.FINISHED, RequestStatus.TAKEN)); requestParams.setProject(getModelObject()); return peerRequestService.count(requestParams); } @@ -161,11 +142,7 @@ public class PeerRequestSelectionPanel extends GenericPanel<Project> { getUser(), PeerRequestSelectionPanel.this.getModelObject() ); - notificationController.notifyPeer( - review, - PeerEvent.Event.REVIEW_ACCEPTED, - new NotificationSource() - ); + notificationController.notifyPeer(review, PeerEvent.Event.REVIEW_ACCEPTED, new NotificationSource()); } catch (PartOfProjectException ignored) { String partOfProjectException = getString("partOfProjectException"); getSession().error(partOfProjectException); diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java index c30f1e0ce1..c846ee4673 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java @@ -62,9 +62,7 @@ public class PeerRequestSubmissionPanel extends GenericPanel<Project> { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render( - OnEventHeaderItem.forMarkupId("toggleUp", "click", "$('#submit').slideUp();") - ); + response.render(OnEventHeaderItem.forMarkupId("toggleUp", "click", "$('#submit').slideUp();")); } @Override @@ -89,23 +87,18 @@ public class PeerRequestSubmissionPanel extends GenericPanel<Project> { final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); listContainer.setOutputMarkupId(true); - IModel<List<ChecklistTemplate>> checklistTemplateModel = - new LoadableDetachableModel<>() { - @Override - protected List<ChecklistTemplate> load() { - return checklistTemplateService.findPeerRequestChecklists( - PeerRequestSubmissionPanel.this.getModelObject() - ); - } - }; + IModel<List<ChecklistTemplate>> checklistTemplateModel = new LoadableDetachableModel<>() { + @Override + protected List<ChecklistTemplate> load() { + return checklistTemplateService.findPeerRequestChecklists( + PeerRequestSubmissionPanel.this.getModelObject() + ); + } + }; RadioGroup<ChecklistTemplate> templateRadios = new RadioGroup<>( "radioGroup", - LambdaModel.of( - getModel(), - PeerRequest::getChecklistTemplate, - PeerRequest::setChecklistTemplate - ) + LambdaModel.of(getModel(), PeerRequest::getChecklistTemplate, PeerRequest::setChecklistTemplate) ); listContainer.add(templateRadios); @@ -117,22 +110,14 @@ public class PeerRequestSubmissionPanel extends GenericPanel<Project> { @Override protected void populateItem(final ListItem<ChecklistTemplate> item) { item.add( - new Radio<>("radio", item.getModel()).setLabel( - item.getModel().map(ChecklistTemplate::getName) - ) + new Radio<>("radio", item.getModel()).setLabel(item.getModel().map(ChecklistTemplate::getName)) ); - AjaxLink<ChecklistTemplate> templateLink = new AjaxLink<>( - "templateLink", - item.getModel() - ) { + AjaxLink<ChecklistTemplate> templateLink = new AjaxLink<>("templateLink", item.getModel()) { @Override public void onClick(AjaxRequestTarget target) { modalWindowPlus.setContent( - new ViewChecklistTemplatePanelPeer( - modalWindowPlus.getContentId(), - getModel() - ) + new ViewChecklistTemplatePanelPeer(modalWindowPlus.getContentId(), getModel()) ); modalWindowPlus.setTitle("Preview of chosen checklist template"); modalWindowPlus.show(target); @@ -178,10 +163,7 @@ public class PeerRequestSubmissionPanel extends GenericPanel<Project> { add(listContainer); add( - new TextArea<>( - "comment", - LambdaModel.of(getModel(), PeerRequest::getComment, PeerRequest::setComment) - ) + new TextArea<>("comment", LambdaModel.of(getModel(), PeerRequest::getComment, PeerRequest::setComment)) ); fileUpload = new FileUploadField("fileUpload"); diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewFilterDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewFilterDetailsPanel.java index c3f593a407..287a8b5c3a 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewFilterDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewFilterDetailsPanel.java @@ -34,11 +34,7 @@ public class PeerReviewFilterDetailsPanel extends Panel { protected class FilterStringFormatter implements IClusterable { public String projectTypeNames() { - return filter - .getProjectTypes() - .stream() - .map(ProjectType::getName) - .collect(Collectors.joining(", ")); + return filter.getProjectTypes().stream().map(ProjectType::getName).collect(Collectors.joining(", ")); } public String supervisorName() { @@ -80,10 +76,7 @@ public class PeerReviewFilterDetailsPanel extends Panel { if (filter.getCreatedBefore() == null) { sb.append(getString("notAvailable")); } else { - String createdBefore = dateService.format( - filter.getCreatedBefore(), - DateStyle.DATE - ); + String createdBefore = dateService.format(filter.getCreatedBefore(), DateStyle.DATE); sb.append(createdBefore); } return sb.toString(); diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java index fd9e7c56c2..1d5d3cf571 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java @@ -86,10 +86,7 @@ public class PeerReviewStatisticsPanel extends Panel { } private void addOtherFilter() { - final AjaxCheckBox supervisorProjects = new AjaxCheckBox( - "supervisorCheckBox", - Model.of(false) - ) { + final AjaxCheckBox supervisorProjects = new AjaxCheckBox("supervisorCheckBox", Model.of(false)) { @Override protected void onUpdate(AjaxRequestTarget target) { if (this.getModelObject()) { @@ -122,10 +119,7 @@ public class PeerReviewStatisticsPanel extends Panel { private void addLanguageFilter() { List<Language> languages = Arrays.asList(Language.values()); - final IModel<Language> languagePropertyModel = LambdaModel.of( - filter::getLanguage, - filter::setLanguage - ); + final IModel<Language> languagePropertyModel = LambdaModel.of(filter::getLanguage, filter::setLanguage); final DropDownChoice<Language> languageFilter = new DropDownChoice<>( "filterLanguage", languagePropertyModel, @@ -176,17 +170,11 @@ public class PeerReviewStatisticsPanel extends Panel { } ) ); - ListView<ReviewStatus> statusListView = new ListView<>( - "statusList", - Arrays.asList(ReviewStatus.values()) - ) { + ListView<ReviewStatus> statusListView = new ListView<>("statusList", Arrays.asList(ReviewStatus.values())) { @Override protected void populateItem(final ListItem<ReviewStatus> item) { item.add( - new Label( - "numberOfPeerReviews", - peerReviewService.countByStatus(item.getModelObject(), filter) - ) + new Label("numberOfPeerReviews", peerReviewService.countByStatus(item.getModelObject(), filter)) ); Link<Void> detailsLink = new Link<>("detailsLink") { @Override @@ -194,17 +182,12 @@ public class PeerReviewStatisticsPanel extends Panel { setResponsePage(pageSupplier.statusPage(item.getModel(), filter)); } }; - detailsLink.add( - new Label("status", new ResourceModel(item.getModelObject().name())) - ); + detailsLink.add(new Label("status", new ResourceModel(item.getModelObject().name()))); item.add(detailsLink); item.add( new Label( "withOutChecklistTmp", - peerReviewService.countByStatusAndNoCheckListTemplate( - filter, - item.getModelObject() - ) + peerReviewService.countByStatusAndNoCheckListTemplate(filter, item.getModelObject()) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatusStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatusStatisticsPanel.java index faf4d7e55f..60e563e2e7 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatusStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatusStatisticsPanel.java @@ -32,11 +32,7 @@ public class PeerReviewStatusStatisticsPanel extends Panel { private PeerReviewService.Filter filter; private boolean isSupervisorView; - public PeerReviewStatusStatisticsPanel( - String id, - PeerReviewService.Filter filter, - boolean isSupervisorView - ) { + public PeerReviewStatusStatisticsPanel(String id, PeerReviewService.Filter filter, boolean isSupervisorView) { super(id); this.filter = filter; this.isSupervisorView = isSupervisorView; @@ -58,35 +54,18 @@ public class PeerReviewStatusStatisticsPanel extends Panel { private List<IColumn<PeerReview, String>> createColumns() { List<IColumn<PeerReview, String>> columns = new ArrayList<>(); columns.add( - new DateColumn<>( - Model.of("Commenced"), - PeerReview::getDateCreated, - "dateCreated", - DateStyle.DATETIME + new DateColumn<>(Model.of("Commenced"), PeerReview::getDateCreated, "dateCreated", DateStyle.DATETIME) + ); + + columns.add(new UserColumn<>(Model.of("Reviewing author"), "reviewer.fullName", PeerReview::getReviewer)); + + columns.add( + new UserColumn<>(Model.of("Requesting author"), "peerRequest.requester.fullName", review -> + review.getPeerRequest().getRequester() ) ); - columns.add( - new UserColumn<>( - Model.of("Reviewing author"), - "reviewer.fullName", - PeerReview::getReviewer - ) - ); - - columns.add( - new UserColumn<>( - Model.of("Requesting author"), - "peerRequest.requester.fullName", - review -> review.getPeerRequest().getRequester() - ) - ); - - columns.add( - new LambdaColumn<>(Model.of("Title"), review -> - review.getPeerRequest().getProject().getTitle() - ) - ); + columns.add(new LambdaColumn<>(Model.of("Title"), review -> review.getPeerRequest().getProject().getTitle())); columns.add( new AbstractColumn<>(Model.of("Status"), "status") { @@ -103,15 +82,9 @@ public class PeerReviewStatusStatisticsPanel extends Panel { LambdaModel.of(rowModel, PeerReview::getStatus, PeerReview::setStatus) ) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<PeerReview> model - ) { + public void onClick(AjaxRequestTarget target, IModel<PeerReview> model) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(PeerReview.class), - getModelObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(PeerReview.class), getModelObject().getId()); if (isSupervisorView) { setResponsePage(SupervisorViewPeerReviewAllPeersPage.class, pp); } else { diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java index 03e4cabf6b..73a1f1b10d 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java @@ -69,23 +69,11 @@ public class PeerSummaryPanel extends GenericPanel<Project> { @Override protected void populateItem(ListItem<PeerReview> item) { PageParameters parameters = new PageParameters(); - parameters.add( - PageParameterKeys.MAP.get(PeerReview.class), - item.getModelObject().getId() - ); - BookmarkablePageLink<Void> link = new BookmarkablePageLink<>( - REVIEW_LINK, - getReviewPage(), - parameters - ); + parameters.add(PageParameterKeys.MAP.get(PeerReview.class), item.getModelObject().getId()); + BookmarkablePageLink<Void> link = new BookmarkablePageLink<>(REVIEW_LINK, getReviewPage(), parameters); link.add(new DateLabel(DATE_CREATED, item.getModel().map(PeerReview::getDateCreated))); item.add(link); - item.add( - new Label( - REVIEWER, - item.getModel().map(PeerReview::getReviewer).map(User::getFullName) - ) - ); + item.add(new Label(REVIEWER, item.getModel().map(PeerReview::getReviewer).map(User::getFullName))); } } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java index 4430616a09..3f9af89965 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java @@ -66,13 +66,7 @@ public class PerformReviewPanel extends GenericPanel<PeerReview> { super(id, reviewModel); setMultiPart(true); - add( - new DateLabel( - DEADLINE, - reviewModel.map(PeerReview::getDeadline), - DateStyle.DATETIME - ) - ); + add(new DateLabel(DEADLINE, reviewModel.map(PeerReview::getDeadline), DateStyle.DATETIME)); add( new ListView<>(ANSWERS, reviewModel.map(PeerReview::getAnswers)) { @@ -81,10 +75,7 @@ public class PerformReviewPanel extends GenericPanel<PeerReview> { final IModel<Answer> answer = item.getModel(); item.add(new Label(QUESTION, answer.map(Answer::getQuestion))); item.add( - new TrafficLightPanel( - ANSWER, - LambdaModel.of(answer, Answer::getAnswer, Answer::setAnswer) - ) + new TrafficLightPanel(ANSWER, LambdaModel.of(answer, Answer::getAnswer, Answer::setAnswer)) ); item.add( new TextArea<>( @@ -94,9 +85,7 @@ public class PerformReviewPanel extends GenericPanel<PeerReview> { new AutoSavingBehaviour() { @Override protected void onUpdate(final AjaxRequestTarget target) { - performReviewService.save( - PerformReviewForm.this.getModelObject() - ); + performReviewService.save(PerformReviewForm.this.getModelObject()); } } ) @@ -112,18 +101,13 @@ public class PerformReviewPanel extends GenericPanel<PeerReview> { ); add( - new TextArea<>( - COMMENT, - LambdaModel.of(reviewModel, PeerReview::getComment, PeerReview::setComment) - ) { + new TextArea<>(COMMENT, LambdaModel.of(reviewModel, PeerReview::getComment, PeerReview::setComment)) { { add( new AutoSavingBehaviour() { @Override protected void onUpdate(final AjaxRequestTarget target) { - performReviewService.save( - PerformReviewForm.this.getModelObject() - ); + performReviewService.save(PerformReviewForm.this.getModelObject()); } } ); @@ -149,14 +133,10 @@ public class PerformReviewPanel extends GenericPanel<PeerReview> { @Override public void onSubmit() { try { - final Optional<se.su.dsv.scipro.file.FileUpload> fileUploadOption = - Optional.ofNullable(reviewFileUpload.getFileUpload()).map( - WicketFileUpload::new - ); - performReviewService.submit( - PerformReviewForm.this.getModelObject(), - fileUploadOption - ); + final Optional<se.su.dsv.scipro.file.FileUpload> fileUploadOption = Optional.ofNullable( + reviewFileUpload.getFileUpload() + ).map(WicketFileUpload::new); + performReviewService.submit(PerformReviewForm.this.getModelObject(), fileUploadOption); success(getString("submitted")); PerformReviewForm.this.detach(); } catch (MissingAnswerException ignored) { diff --git a/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java index b3f37d0ce8..8dc86a3d3e 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java @@ -41,11 +41,7 @@ public class RequestDetailsPanel extends Panel { add( new DateLabel( DATE_REQUESTED, - LambdaModel.of( - peerRequest, - PeerRequest::getDateCreated, - PeerRequest::setDateCreated - ), + LambdaModel.of(peerRequest, PeerRequest::getDateCreated, PeerRequest::setDateCreated), DateStyle.DATETIME ) ); @@ -59,11 +55,7 @@ public class RequestDetailsPanel extends Panel { add( new AjaxLink<>( TEMPLATE_LINK, - LambdaModel.of( - peerRequest, - PeerRequest::getChecklistTemplate, - PeerRequest::setChecklistTemplate - ) + LambdaModel.of(peerRequest, PeerRequest::getChecklistTemplate, PeerRequest::setChecklistTemplate) ) { @Override public void onClick(AjaxRequestTarget target) { @@ -80,13 +72,7 @@ public class RequestDetailsPanel extends Panel { protected void onConfigure() { super.onConfigure(); setEnabled(getModelObject() != null); - setBody( - Model.of( - getModelObject() != null - ? getModelObject().getName() - : "No template attached" - ) - ); + setBody(Model.of(getModelObject() != null ? getModelObject().getName() : "No template attached")); } } ); @@ -117,12 +103,7 @@ public class RequestDetailsPanel extends Panel { .map(PeerRequest::getFile) .map(FileReference::getFileDescription); if (fileModel.getObject() != null) { - add( - new Label( - "fileName", - LambdaModel.of(fileModel, FileDescription::getName, FileDescription::setName) - ) - ); + add(new Label("fileName", LambdaModel.of(fileModel, FileDescription::getName, FileDescription::setName))); } else { add(new Label("fileName", "No file provided")); } @@ -132,11 +113,7 @@ public class RequestDetailsPanel extends Panel { @Override protected void onConfigure() { super.onConfigure(); - setVisible( - generalSystemSettingsService - .getGeneralSystemSettingsInstance() - .isPeerDownloadEnabled() - ); + setVisible(generalSystemSettingsService.getGeneralSystemSettingsInstance().isPeerDownloadEnabled()); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java index a0e9df3b42..e972272ef3 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java @@ -21,13 +21,7 @@ public class ReviewPageRequestDetailsPanel extends Panel { public ReviewPageRequestDetailsPanel(final String id, final IModel<PeerRequest> request) { super(id, request); add(new UserLabel("requester", request.map(PeerRequest::getRequester))); - add( - new DateLabel( - "dateCreated", - request.map(PeerRequest::getDateCreated), - DateStyle.DATETIME - ) - ); + add(new DateLabel("dateCreated", request.map(PeerRequest::getDateCreated), DateStyle.DATETIME)); add(new EnumLabel<>("status", request.map(PeerRequest::getStatus))); // We repack the file in its own dedicated model to prevent NPE when trying to // download the document after the peer review has expired due to PeerRequest being null diff --git a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorPeersPage.java b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorPeersPage.java index 68f93671ba..876933b032 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorPeersPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorPeersPage.java @@ -21,10 +21,7 @@ public class SupervisorPeersPage extends AbstractSupervisorAllProjectsPage { "peerReviewList", new PeerReviewStatisticsPanel.PageSupplier() { @Override - public Page statusPage( - IModel<PeerReview.ReviewStatus> model, - PeerReviewService.Filter filter - ) { + public Page statusPage(IModel<PeerReview.ReviewStatus> model, PeerReviewService.Filter filter) { filter.setStatuses(Collections.singletonList(model.getObject())); return new SupervisorPeerReviewStatusStatisticsPage(filter); } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java index 166a75f173..a80fd6b73c 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java @@ -29,10 +29,7 @@ public class SupervisorViewPeerReviewAllPeersPage ) ); add( - new UserLinkPanel( - "reviewer", - LambdaModel.of(reviewModel, PeerReview::getReviewer, PeerReview::setReviewer) - ) + new UserLinkPanel("reviewer", LambdaModel.of(reviewModel, PeerReview::getReviewer, PeerReview::setReviewer)) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java index 22ef43409f..2288cdc3bd 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java @@ -30,10 +30,7 @@ public class SupervisorViewPeerReviewPage ) ); add( - new UserLinkPanel( - "reviewer", - LambdaModel.of(reviewModel, PeerReview::getReviewer, PeerReview::setReviewer) - ) + new UserLinkPanel("reviewer", LambdaModel.of(reviewModel, PeerReview::getReviewer, PeerReview::setReviewer)) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java b/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java index 36f4fbce84..a85d56e51d 100644 --- a/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java +++ b/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java @@ -17,9 +17,7 @@ import se.su.dsv.scipro.session.SciProSession; import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.util.PageParameterKeys; -public class ViewPeerReviewPage - extends AbstractPeerPortalPage - implements MenuHighlightAuthorMyProjects { +public class ViewPeerReviewPage extends AbstractPeerPortalPage implements MenuHighlightAuthorMyProjects { @Inject private PeerReviewService peerReviewService; @@ -55,28 +53,16 @@ public class ViewPeerReviewPage } add(new DisplayReviewPanel("review", reviewModel)); - add( - new ReviewPageRequestDetailsPanel( - "request", - reviewModel.map(PeerReview::getPeerRequest) - ) - ); + add(new ReviewPageRequestDetailsPanel("request", reviewModel.map(PeerReview::getPeerRequest))); add(new UserLinkPanel("reviewedBy", reviewModel.map(PeerReview::getReviewer))); add(new CommentThreadPanel("comment", reviewModel)); } private boolean checkAccess(User user, PeerReview peerReview) { - if ( - generalSystemSettingsService - .getGeneralSystemSettingsInstance() - .isPublicReviewsActivated() - ) { + if (generalSystemSettingsService.getGeneralSystemSettingsInstance().isPublicReviewsActivated()) { return true; } else { - return peerReview - .getMembers() - .stream() - .anyMatch(member -> Objects.equals(member.getUser(), user)); + return peerReview.getMembers().stream().anyMatch(member -> Objects.equals(member.getUser(), user)); } } } diff --git a/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java b/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java index 313dbdefd1..36e74cce70 100644 --- a/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java @@ -111,9 +111,7 @@ public class UrkundSubmissionPanel extends GenericPanel<FileDescription> { protected void onConfigure() { super.onConfigure(); Object status = getDefaultModelObject(); - setVisibilityAllowed( - status instanceof Status.Error || status instanceof Status.Analysed - ); + setVisibilityAllowed(status instanceof Status.Error || status instanceof Status.Analysed); } } diff --git a/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java b/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java index 3ba411be2f..4ed217b535 100644 --- a/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java +++ b/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java @@ -55,12 +55,7 @@ public class DaisyPicture extends ResourceReference { final ProjectService.Filter filter = new ProjectService.Filter(); filter.setSupervisor(session.getUser()); - filter.setRoles( - Arrays.asList( - ProjectTeamMemberRoles.CO_SUPERVISOR, - ProjectTeamMemberRoles.REVIEWER - ) - ); + filter.setRoles(Arrays.asList(ProjectTeamMemberRoles.CO_SUPERVISOR, ProjectTeamMemberRoles.REVIEWER)); final List<Project> projects = projectService.findAll(filter); final Set<Integer> projectRelations = projects @@ -74,18 +69,12 @@ public class DaisyPicture extends ResourceReference { .stream() .map(finalSeminarService::findByProject) .filter(Objects::nonNull) - .flatMap(fs -> - Stream.concat( - fs.getOpponents().stream(), - fs.getActiveParticipants().stream() - ) - ) + .flatMap(fs -> Stream.concat(fs.getOpponents().stream(), fs.getActiveParticipants().stream())) .map(User::getIdentifier) .collect(Collectors.toSet()); final int userId = attributes.getParameters().get(USER_ID).toInt(0); - final boolean alwaysShow = - projectRelations.contains(userId) || seminarRelations.contains(userId); + final boolean alwaysShow = projectRelations.contains(userId) || seminarRelations.contains(userId); Integer requesterDaisyId = null; if (session.getUser() != null) { requesterDaisyId = session.getUser().getIdentifier(); @@ -123,10 +112,7 @@ public class DaisyPicture extends ResourceReference { new WriteCallback() { @Override public void writeData(final Attributes attributes) throws IOException { - try ( - InputStream is = - DaisyPicture.class.getResourceAsStream("anonymous.png") - ) { + try (InputStream is = DaisyPicture.class.getResourceAsStream("anonymous.png")) { writeStream(attributes, is); } } diff --git a/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java b/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java index 6b28e17cf7..9c967c0b66 100644 --- a/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java @@ -39,11 +39,7 @@ public class DisplayUserProfilePanel extends GenericPanel<User> { add(new UserProfileImage("image", model, UserProfileImage.Size.LARGE)); add( - new ExternalLink( - MAIL, - "mailto:" + model.getObject().getEmailAddress(), - model.getObject().getEmailAddress() - ) + new ExternalLink(MAIL, "mailto:" + model.getObject().getEmailAddress(), model.getObject().getEmailAddress()) ); final IModel<UserProfile> profileModel = getProfile(); @@ -61,11 +57,7 @@ public class DisplayUserProfilePanel extends GenericPanel<User> { new Label( PHONE, new NullReplacementModel( - LambdaModel.of( - profileModel, - UserProfile::getPhoneNumber, - UserProfile::setPhoneNumber - ), + LambdaModel.of(profileModel, UserProfile::getPhoneNumber, UserProfile::setPhoneNumber), "Not entered" ) ) @@ -75,11 +67,7 @@ public class DisplayUserProfilePanel extends GenericPanel<User> { new SmartLinkMultiLineLabel( OTHER, new NullReplacementModel( - LambdaModel.of( - profileModel, - UserProfile::getOtherInfo, - UserProfile::setOtherInfo - ), + LambdaModel.of(profileModel, UserProfile::getOtherInfo, UserProfile::setOtherInfo), "Not entered" ) ) @@ -95,10 +83,7 @@ public class DisplayUserProfilePanel extends GenericPanel<User> { add(employeeWMC); employeeWMC.add( - new Label( - UNIT, - new NullReplacementModel(model.map(User::getUnit).map(Unit::getTitle), "None") - ) + new Label(UNIT, new NullReplacementModel(model.map(User::getUnit).map(Unit::getTitle), "None")) ); ListView<ResearchArea> areas = new AutoHidingListView<>( @@ -125,17 +110,14 @@ public class DisplayUserProfilePanel extends GenericPanel<User> { employeeWMC.add(languages); employeeWMC.add(new Label(NOLANGUAGES, "None").add(new OppositeVisibility(languages))); - GeneralSystemSettings generalSystemSettings = - generalSystemSettingsService.getGeneralSystemSettingsInstance(); + GeneralSystemSettings generalSystemSettings = generalSystemSettingsService.getGeneralSystemSettingsInstance(); String profile = ""; if ( generalSystemSettings.getDaisyProfileLinkBaseURL() != null && !generalSystemSettings.getDaisyProfileLinkBaseURL().isEmpty() && model.getObject().getIdentifier() != null ) { - profile = - generalSystemSettings.getDaisyProfileLinkBaseURL() + - model.getObject().getIdentifier(); + profile = generalSystemSettings.getDaisyProfileLinkBaseURL() + model.getObject().getIdentifier(); } final String finalProfile = profile; employeeWMC.add( diff --git a/view/src/main/java/se/su/dsv/scipro/profile/StudentProfileProgramPanel.java b/view/src/main/java/se/su/dsv/scipro/profile/StudentProfileProgramPanel.java index 2059e6d9b6..6b0e65382c 100644 --- a/view/src/main/java/se/su/dsv/scipro/profile/StudentProfileProgramPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/profile/StudentProfileProgramPanel.java @@ -11,19 +11,9 @@ public class StudentProfileProgramPanel extends Panel { public StudentProfileProgramPanel(String id, IModel<IdeaParticipation> model, boolean shorten) { super(id, model); - add( - new UserLinkPanel( - USER, - LambdaModel.of(model, IdeaParticipation::getUser, IdeaParticipation::setUser) - ) - ); + add(new UserLinkPanel(USER, LambdaModel.of(model, IdeaParticipation::getUser, IdeaParticipation::setUser))); Program program = model.getObject().getProgram(); - add( - new Label( - PROGRAM, - program != null ? shorten ? program.getCode() : program.getName() : "" - ) - ); + add(new Label(PROGRAM, program != null ? shorten ? program.getCode() : program.getName() : "")); } public static final String USER = "user"; diff --git a/view/src/main/java/se/su/dsv/scipro/profile/UserLinkPanel.java b/view/src/main/java/se/su/dsv/scipro/profile/UserLinkPanel.java index 18e57d27e2..de933469f5 100644 --- a/view/src/main/java/se/su/dsv/scipro/profile/UserLinkPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/profile/UserLinkPanel.java @@ -28,9 +28,7 @@ public class UserLinkPanel extends GenericPanel<User> { @Override public void onClick(AjaxRequestTarget target) { modalWindowPlus.setTitle("Profile for " + getModelObject().getFullName()); - modalWindowPlus.setContent( - new DisplayUserProfilePanel(modalWindowPlus.getContentId(), getModel()) - ); + modalWindowPlus.setContent(new DisplayUserProfilePanel(modalWindowPlus.getContentId(), getModel())); modalWindowPlus.show(target); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java index 5d4cd1cd4c..4c76305ffd 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java @@ -81,12 +81,7 @@ public abstract class AbstractProjectDetailsPage extends ProjectPage { setDefaultModel(projectModel); add( - new ProjectSubTabMenuPanel( - "projectSub", - this.getClass(), - getPageParameters(project), - projectModel - ) { + new ProjectSubTabMenuPanel("projectSub", this.getClass(), getPageParameters(project), projectModel) { @Override protected MenuType getMenuType() { return HORIZONTAL; diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java index 6a65de213e..5907ab558d 100755 --- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java @@ -30,9 +30,7 @@ import se.su.dsv.scipro.session.SciProSession; import se.su.dsv.scipro.survey.SurveyService; import se.su.dsv.scipro.thesislink.ExternalLinkPanel; -public class ProjectDetailsPage - extends AbstractProjectDetailsPage - implements MenuHighlightAuthorMyProjects { +public class ProjectDetailsPage extends AbstractProjectDetailsPage implements MenuHighlightAuthorMyProjects { public static final String FINAL_THESIS_PANEL = "finalThesisPanel"; public static final String LATEST_EVENTS = "latestEvents"; @@ -89,9 +87,7 @@ public class ProjectDetailsPage add( new Label( EXTERNAL_ORGANIZATION, - projectModel - .map(Project::getExternalOrganization) - .map(ExternalOrganization::getName) + projectModel.map(Project::getExternalOrganization).map(ExternalOrganization::getName) ) { @Override protected void onConfigure() { @@ -135,21 +131,13 @@ public class ProjectDetailsPage add(new FinalStepsPanel("final_steps", projectModel)); - add( - new FinalThesisReflectionInstructionsPanel( - "final_thesis_and_reflection_instructions", - projectModel - ) - ); + add(new FinalThesisReflectionInstructionsPanel("final_thesis_and_reflection_instructions", projectModel)); } @Override protected void onConfigure() { super.onConfigure(); - if ( - shouldFillOutSurvey && - getSession().getMetaData(ProjectFinalSurveyPage.SURVEY_VISITED) == null - ) { + if (shouldFillOutSurvey && getSession().getMetaData(ProjectFinalSurveyPage.SURVEY_VISITED) == null) { getFeedbackMessages().forEach(getSession().getFeedbackMessages()::add); throw new RestartResponseException( ProjectFinalSurveyPage.class, @@ -162,11 +150,7 @@ public class ProjectDetailsPage public void renderHead(IHeaderResponse response) { super.renderHead(response); response.render( - OnEventHeaderItem.forMarkupId( - "help_groups_toggle", - "click", - "$('#help_groups').slideToggle()" - ) + OnEventHeaderItem.forMarkupId("help_groups_toggle", "click", "$('#help_groups').slideToggle()") ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFilePage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFilePage.java index 37d08bb7ec..98d5297605 100755 --- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFilePage.java +++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFilePage.java @@ -10,9 +10,7 @@ import se.su.dsv.scipro.system.ProjectModule; @Authorization(authorizedRoles = { Roles.AUTHOR }) @ProjectModuleComponent(ProjectModule.FILES) -public class ProjectFilePage - extends AbstractProjectDetailsPage - implements MenuHighlightAuthorMyProjects { +public class ProjectFilePage extends AbstractProjectDetailsPage implements MenuHighlightAuthorMyProjects { public ProjectFilePage(PageParameters pp) { super(pp); diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java index 4467a58d29..0bbf581a45 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java +++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java @@ -54,10 +54,7 @@ public class ProjectFinalSurveyPage extends AbstractProjectDetailsPage { protected void onSubmit() { surveyService.submit(getModelObject()); success(getString("survey.submitted")); - setResponsePage( - ProjectDetailsPage.class, - ProjectDetailsPage.getPageParameters(getActiveProject()) - ); + setResponsePage(ProjectDetailsPage.class, ProjectDetailsPage.getPageParameters(getActiveProject())); } }; add(form); @@ -87,11 +84,7 @@ public class ProjectFinalSurveyPage extends AbstractProjectDetailsPage { final TextArea<String> textArea = new TextArea<>( "freeText", - LambdaModel.of( - item.getModel(), - SurveyAnswer::getAnswer, - SurveyAnswer::setAnswer - ) + LambdaModel.of(item.getModel(), SurveyAnswer::getAnswer, SurveyAnswer::setAnswer) ) { @Override protected void onConfigure() { @@ -108,10 +101,7 @@ public class ProjectFinalSurveyPage extends AbstractProjectDetailsPage { new BootstrapCheckBoxMultipleChoice<>( "multipleChoices", item.getModel().map(SurveyAnswer::getMultipleAnswers), - item - .getModel() - .map(SurveyAnswer::getQuestion) - .map(Question::getChoices), + item.getModel().map(SurveyAnswer::getQuestion).map(Question::getChoices), new ChoiceRenderer<>() ) { @Override @@ -126,15 +116,8 @@ public class ProjectFinalSurveyPage extends AbstractProjectDetailsPage { item.add( new BootstrapRadioChoice<>( "singleChoice", - LambdaModel.of( - item.getModel(), - SurveyAnswer::getAnswer, - SurveyAnswer::setAnswer - ), - item - .getModel() - .map(SurveyAnswer::getQuestion) - .map(Question::getChoices), + LambdaModel.of(item.getModel(), SurveyAnswer::getAnswer, SurveyAnswer::setAnswer), + item.getModel().map(SurveyAnswer::getQuestion).map(Question::getChoices), new ChoiceRenderer<>() ) { @Override @@ -146,10 +129,7 @@ public class ProjectFinalSurveyPage extends AbstractProjectDetailsPage { ); } - private boolean isType( - final ListItem<SurveyAnswer> item, - final Question.Type type - ) { + private boolean isType(final ListItem<SurveyAnswer> item, final Question.Type type) { return (item.getModelObject().getQuestion().getType() == type); } } diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java index 1ccd68e73b..3cbd6e4d98 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java +++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java @@ -30,27 +30,10 @@ public class ProjectFirstMeetingPage extends AbstractProjectDetailsPage { add( new WebMarkupContainer("firstMeeting", model1) { { - add( - new DateLabel( - "date", - model1.map(ProjectFirstMeeting::getDate), - DateStyle.DATE - ) - ); - add( - new DateLabel( - "time", - model1.map(ProjectFirstMeeting::getDate), - DateStyle.TIME - ) - ); + add(new DateLabel("date", model1.map(ProjectFirstMeeting::getDate), DateStyle.DATE)); + add(new DateLabel("time", model1.map(ProjectFirstMeeting::getDate), DateStyle.TIME)); add(new Label("room", model1.map(ProjectFirstMeeting::getRoom))); - add( - new MultiLineLabel( - "description", - model1.map(ProjectFirstMeeting::getDescription) - ) - ); + add(new MultiLineLabel("description", model1.map(ProjectFirstMeeting::getDescription))); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java index 000a7f6644..542c79ecc5 100755 --- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java +++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java @@ -30,9 +30,7 @@ public abstract class ProjectPage extends MenuPage { userProfileService.setSelectedRole(SciProSession.get().getUser(), Roles.AUTHOR); SciProSession.get() - .setSystemModules( - generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules() - ); + .setSystemModules(generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules()); add(new ProjectTabMenuPanel(TAB_MENU, this.getClass())); } } diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java index e2321cd571..ae433b041a 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java @@ -28,16 +28,8 @@ public class ExternalResourcesPanel extends GenericPanel<ProjectType> { item.add( new ExternalLink( "link", - LambdaModel.of( - resource, - ExternalResource::getUrl, - ExternalResource::setUrl - ), - LambdaModel.of( - resource, - ExternalResource::getLabel, - ExternalResource::setLabel - ) + LambdaModel.of(resource, ExternalResource::getUrl, ExternalResource::setUrl), + LambdaModel.of(resource, ExternalResource::getLabel, ExternalResource::setLabel) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java index a6301e4f11..1faccaea0d 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java @@ -80,20 +80,14 @@ public class FinalStepsPanel extends GenericPanel<Project> { private IModel<String> reflectionModel; private IModel<PublishingConsentService.Level> levelModel; - public FinalStepsForm( - String id, - IModel<Project> projectModel, - IModel<Reflection> currentReflection - ) { + public FinalStepsForm(String id, IModel<Project> projectModel, IModel<Reflection> currentReflection) { super(id, projectModel); this.currentReflection = currentReflection; IModel<Reflection.ImprovementsNeeded> improvementsNeeded = this.currentReflection.as(Reflection.ImprovementsNeeded.class); - IModel<String> oldReflection = improvementsNeeded.map( - Reflection.ImprovementsNeeded::oldReflection - ); + IModel<String> oldReflection = improvementsNeeded.map(Reflection.ImprovementsNeeded::oldReflection); add( new MultiLineLabel("old_reflection", oldReflection) { @Override @@ -128,28 +122,23 @@ public class FinalStepsPanel extends GenericPanel<Project> { reflectionTextArea.setRequired(true); add(reflectionTextArea); - IModel<PublishingConsentService.PublishingConsent> publishingConsent = - LoadableDetachableModel.of(() -> - publishingConsentService.getPublishingConsent( - getModelObject(), - SciProSession.get().getUser() - ) - ); + IModel<PublishingConsentService.PublishingConsent> publishingConsent = LoadableDetachableModel.of(() -> + publishingConsentService.getPublishingConsent(getModelObject(), SciProSession.get().getUser()) + ); levelModel = new Model<>(publishingConsent.getObject().selected()); - FormComponent<PublishingConsentService.Level> publishingConsentLevel = - new BootstrapRadioChoice<>( - "publishingConsentLevel", - levelModel, - publishingConsent.map(PublishingConsentService.PublishingConsent::available), - new EnumChoiceRenderer<>(this) - ) { - @Override - protected void onConfigure() { - super.onConfigure(); - setVisible(!publishingConsent.getObject().available().isEmpty()); - } - }; + FormComponent<PublishingConsentService.Level> publishingConsentLevel = new BootstrapRadioChoice<>( + "publishingConsentLevel", + levelModel, + publishingConsent.map(PublishingConsentService.PublishingConsent::available), + new EnumChoiceRenderer<>(this) + ) { + @Override + protected void onConfigure() { + super.onConfigure(); + setVisible(!publishingConsent.getObject().available().isEmpty()); + } + }; publishingConsentLevel.setRequired(true); add(publishingConsentLevel); @@ -158,9 +147,7 @@ public class FinalStepsPanel extends GenericPanel<Project> { protected void onConfigure() { super.onConfigure(); setVisible( - finalThesisService.isUploadAllowed( - FinalStepsPanel.FinalStepsForm.this.getModelObject() - ) + finalThesisService.isUploadAllowed(FinalStepsPanel.FinalStepsForm.this.getModelObject()) ); } }; @@ -169,34 +156,24 @@ public class FinalStepsPanel extends GenericPanel<Project> { IModel<FileDescription> thesisFileModel = LoadableDetachableModel.of(() -> finalThesisService.getFinalThesisFileDescription(getModelObject()) ); - FileDescriptionPanel currentThesisFile = new FileDescriptionPanel( - "current_thesis_file", - thesisFileModel - ); + FileDescriptionPanel currentThesisFile = new FileDescriptionPanel("current_thesis_file", thesisFileModel); currentThesisFile.add(new OppositeVisibility(thesisFileUpload)); add(currentThesisFile); publicationMetadataModel = LoadableDetachableModel.of(() -> publicationMetadataService.getByProject(getModelObject()) ); - WebMarkupContainer publicationMetadata = new WebMarkupContainer( - "publication_metadata" - ) { + WebMarkupContainer publicationMetadata = new WebMarkupContainer("publication_metadata") { @Override protected void onConfigure() { super.onConfigure(); setEnabled( - finalThesisService.isUploadAllowed( - FinalStepsPanel.FinalStepsForm.this.getModelObject() - ) + finalThesisService.isUploadAllowed(FinalStepsPanel.FinalStepsForm.this.getModelObject()) ); } }; add(publicationMetadata); publicationMetadata.add( - new PublicationMetadataFormComponentPanel( - "publication_metadata_components", - publicationMetadataModel - ) + new PublicationMetadataFormComponentPanel("publication_metadata_components", publicationMetadataModel) ); } @@ -212,10 +189,7 @@ public class FinalStepsPanel extends GenericPanel<Project> { FinalThesisUpload finalThesisUpload = thesisFileUpload.getFinalThesisUpload(); if (finalThesisUpload != null) { finalThesisService.upload( - new WicketProjectFileUpload( - finalThesisUpload.fileUpload(), - FinalStepsPanel.this.getModelObject() - ), + new WicketProjectFileUpload(finalThesisUpload.fileUpload(), FinalStepsPanel.this.getModelObject()), finalThesisUpload.englishTitle(), finalThesisUpload.swedishTitle() ); diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java index 859757ec3c..94783e403d 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java @@ -31,14 +31,10 @@ public class FinalThesisReflectionInstructionsPanel extends GenericPanel<Project super(id, projectModel); hasSubmittedReflection = LoadableDetachableModel.of( () -> - reflectionService.getSubmittedReflection( - projectModel.getObject(), - SciProSession.get().getUser() - ) != + reflectionService.getSubmittedReflection(projectModel.getObject(), SciProSession.get().getUser()) != null ); - hasFinalThesis = LoadableDetachableModel.of(() -> - !finalThesisService.isUploadAllowed(projectModel.getObject()) + hasFinalThesis = LoadableDetachableModel.of(() -> !finalThesisService.isUploadAllowed(projectModel.getObject()) ); hasHadFinalSeminar = LoadableDetachableModel.of(() -> finalSeminarService.hasHadFinalSeminar(projectModel.getObject()) @@ -100,8 +96,7 @@ public class FinalThesisReflectionInstructionsPanel extends GenericPanel<Project @Override protected void onConfigure() { super.onConfigure(); - boolean projectIsCompleted = - projectModel.getObject().getProjectStatus() == ProjectStatus.COMPLETED; + boolean projectIsCompleted = projectModel.getObject().getProjectStatus() == ProjectStatus.COMPLETED; setVisible( hasHadFinalSeminar.getObject() && hasFinalThesis.getObject() && @@ -116,8 +111,7 @@ public class FinalThesisReflectionInstructionsPanel extends GenericPanel<Project @Override protected void onConfigure() { super.onConfigure(); - boolean projectIsCompleted = - projectModel.getObject().getProjectStatus() == ProjectStatus.COMPLETED; + boolean projectIsCompleted = projectModel.getObject().getProjectStatus() == ProjectStatus.COMPLETED; setVisible( hasHadFinalSeminar.getObject() && hasFinalThesis.getObject() && diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanel.java index fba5931d8c..27354399bb 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanel.java @@ -49,12 +49,7 @@ public class ProjectHeaderPanel extends GenericPanel<Project> { } } ); - add( - new Label( - "researchArea", - model.map(Project::getResearchArea).map(ResearchArea::getTitle) - ) - ); + add(new Label("researchArea", model.map(Project::getResearchArea).map(ResearchArea::getTitle))); addDetails(); addEditLink(model); @@ -99,10 +94,7 @@ public class ProjectHeaderPanel extends GenericPanel<Project> { } ); add( - new UserLinkPanel( - SUPERVISOR, - LambdaModel.of(model, Project::getHeadSupervisor, Project::setHeadSupervisor) - ) + new UserLinkPanel(SUPERVISOR, LambdaModel.of(model, Project::getHeadSupervisor, Project::setHeadSupervisor)) ); } @@ -111,11 +103,7 @@ public class ProjectHeaderPanel extends GenericPanel<Project> { new ListView<>( AUTHOR_LIST, new ListAdapterModel<>( - LambdaModel.of( - model, - Project::getProjectParticipants, - Project::setProjectParticipants - ) + LambdaModel.of(model, Project::getProjectParticipants, Project::setProjectParticipants) ) ) { @Override @@ -144,9 +132,7 @@ public class ProjectHeaderPanel extends GenericPanel<Project> { add( new AutoHidingListView<>( REVIEWER_LIST, - new ListAdapterModel<>( - LambdaModel.of(model, Project::getReviewers, Project::setReviewers) - ) + new ListAdapterModel<>(LambdaModel.of(model, Project::getReviewers, Project::setReviewers)) ) { @Override protected void populateItem(ListItem<User> item) { diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java index e88660e817..ff85b3365b 100755 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java @@ -24,8 +24,7 @@ import se.su.dsv.scipro.project.pages.*; public class ProjectSubTabMenuPanel extends AbstractMenuPanel { public static final String FINAL_SEMINAR = "Final seminar"; - public static final String OPPOSITION_ACTIVE_PARTICIPATION = - "Opposition & Active participation"; + public static final String OPPOSITION_ACTIVE_PARTICIPATION = "Opposition & Active participation"; public static final String PEER = "Peer"; public static final String FORUM = "Forum"; public static final String FILES = "Files"; @@ -64,28 +63,15 @@ public class ProjectSubTabMenuPanel extends AbstractMenuPanel { final Project project = active.getObject(); List<MenuItem> itemList = new ArrayList<>(); itemList.add(new MenuItem(OVERVIEW, ProjectDetailsPage.class, projectParams)); - if ( - milestoneActivityTemplateService.countActivities( - project.getProjectType(), - project.getStartDate() - ) != - 0 - ) { + if (milestoneActivityTemplateService.countActivities(project.getProjectType(), project.getStartDate()) != 0) { itemList.add(new MenuItem(MILESTONES, ProjectMileStonePage.class, projectParams)); } itemList.add( - new MenuItem( - ACTIVITY_PLAN, - ProjectActivityPlanPage.class, - MenuHighlightActivityPlan.class, - projectParams - ) + new MenuItem(ACTIVITY_PLAN, ProjectActivityPlanPage.class, MenuHighlightActivityPlan.class, projectParams) ); itemList.add(new MenuItem(FIRST_MEETING, ProjectFirstMeetingPage.class, projectParams)); itemList.add(new MenuItem(FILES, ProjectFilePage.class, projectParams)); - itemList.add( - new MenuItem(FORUM, ProjectForumBasePage.class, MenuHighlightForum.class, projectParams) - ); + itemList.add(new MenuItem(FORUM, ProjectForumBasePage.class, MenuHighlightForum.class, projectParams)); itemList.add(new MenuItem(PEER, PeerPortalPage.class, projectParams)); if (finalSeminarService.findByProject(project) != null) { itemList.add(new MenuItem(FINAL_SEMINAR, ProjectFinalSeminarPage.class, projectParams)); diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java index 9368a71f48..c13cead68d 100755 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java @@ -41,16 +41,10 @@ public class ProjectTabMenuPanel extends AbstractMenuPanel { @Override protected List<MenuItem> getItemList() { List<MenuItem> itemList = new ArrayList<>(); - itemList.add( - new MenuItem(MY_PROJECT_S, ProjectStartPage.class, MenuHighlightAuthorMyProjects.class) - ); - itemList.add( - new MenuItem("My groups", AuthorMyGroupsPage.class, MenuHighlightAuthorMyGroups.class) - ); + itemList.add(new MenuItem(MY_PROJECT_S, ProjectStartPage.class, MenuHighlightAuthorMyProjects.class)); + itemList.add(new MenuItem("My groups", AuthorMyGroupsPage.class, MenuHighlightAuthorMyGroups.class)); if (matchIsEnabled()) { - itemList.add( - new MenuItem(IDEAS, ProjectIdeaStartPage.class, MenuHighlightProjectIdeas.class) - ); + itemList.add(new MenuItem(IDEAS, ProjectIdeaStartPage.class, MenuHighlightProjectIdeas.class)); } if (studentHasProjectWithDegreeType()) { itemList.add( @@ -69,11 +63,7 @@ public class ProjectTabMenuPanel extends AbstractMenuPanel { } private boolean studentHasProjectWithDegreeType() { - List<DegreeType> degreeTypes = Arrays.asList( - DegreeType.BACHELOR, - DegreeType.MASTER, - DegreeType.MAGISTER - ); + List<DegreeType> degreeTypes = Arrays.asList(DegreeType.BACHELOR, DegreeType.MASTER, DegreeType.MAGISTER); for (Project project : projectService.getProjectsByUser(SciProSession.get().getUser())) { if (degreeTypes.contains(project.getProjectTypeDegreeType())) { return true; diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java index 0df7de4e7f..872f843c6a 100755 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java @@ -67,15 +67,11 @@ public class ProjectsOverviewPanel extends GenericPanel<List<Project>> { } private boolean hasActiveProject() { - return !projectService - .findByUserAndStatus(SciProSession.get().getUser(), ProjectStatus.ACTIVE) - .isEmpty(); + return !projectService.findByUserAndStatus(SciProSession.get().getUser(), ProjectStatus.ACTIVE).isEmpty(); } private boolean hasCompletedProject() { - return !projectService - .findByUserAndStatus(SciProSession.get().getUser(), ProjectStatus.COMPLETED) - .isEmpty(); + return !projectService.findByUserAndStatus(SciProSession.get().getUser(), ProjectStatus.COMPLETED).isEmpty(); } private void prepareFilter() { @@ -116,16 +112,11 @@ public class ProjectsOverviewPanel extends GenericPanel<List<Project>> { private void setUpNoProjectLabel() { container.add( - new Label( - "emptyLabel", - "You don't have any projects with the selected project status." - ) { + new Label("emptyLabel", "You don't have any projects with the selected project status.") { @Override protected void onConfigure() { super.onConfigure(); - setVisible( - getModelObject().isEmpty() && (hasActiveProject() || hasCompletedProject()) - ); + setVisible(getModelObject().isEmpty() && (hasActiveProject() || hasCompletedProject())); } } ); @@ -139,33 +130,14 @@ public class ProjectsOverviewPanel extends GenericPanel<List<Project>> { Project p = item.getModelObject(); if (p.getStateOfMind() == StateOfMind.FINE) { - item.add( - new ImageObject( - "state", - ImageObject.TWENTYFOUR, - ImageObject.LIGHT_GREEN - ) - ); + item.add(new ImageObject("state", ImageObject.TWENTYFOUR, ImageObject.LIGHT_GREEN)); } else if (p.getStateOfMind() == StateOfMind.NEUTRAL) { - item.add( - new ImageObject( - "state", - ImageObject.TWENTYFOUR, - ImageObject.LIGHT_YELLOW - ) - ); + item.add(new ImageObject("state", ImageObject.TWENTYFOUR, ImageObject.LIGHT_YELLOW)); } else { - item.add( - new ImageObject("state", ImageObject.TWENTYFOUR, ImageObject.LIGHT_RED) - ); + item.add(new ImageObject("state", ImageObject.TWENTYFOUR, ImageObject.LIGHT_RED)); } - item.add( - new Label( - "projectType.name", - item.getModel().map(Project::getProjectTypeName) - ) - ); + item.add(new Label("projectType.name", item.getModel().map(Project::getProjectTypeName))); PageParameters pp = new PageParameters(); pp.add(PageParameterKeys.MAP.get(Project.class), p.getId()); @@ -176,9 +148,7 @@ public class ProjectsOverviewPanel extends GenericPanel<List<Project>> { ); Label title = new Label( "title", - p.getTitle().length() < 31 - ? p.getTitle() - : p.getTitle().substring(0, 31) + "..." + p.getTitle().length() < 31 ? p.getTitle() : p.getTitle().substring(0, 31) + "..." ); title.add(new AttributeAppender("title", Model.of(p.getTitle()))); projectLink.add(title); @@ -189,26 +159,14 @@ public class ProjectsOverviewPanel extends GenericPanel<List<Project>> { for (User user : p.getProjectParticipants()) { if (first) { first = false; - authors - .append(user.getFirstName()) - .append(' ') - .append(user.getLastName()); + authors.append(user.getFirstName()).append(' ').append(user.getLastName()); } else { - authors - .append(", ") - .append(user.getFirstName()) - .append(' ') - .append(user.getLastName()); + authors.append(", ").append(user.getFirstName()).append(' ').append(user.getLastName()); } } item.add(new Label("authors", authors)); item.add(new Label("supervisor", p.getHeadSupervisor().getFullName())); - item.add( - new EnumLabel<>( - "projectStatus", - item.getModel().map(Project::getProjectStatus) - ) - ); + item.add(new EnumLabel<>("projectStatus", item.getModel().map(Project::getProjectStatus))); add(item); } } diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java index 817e0374f8..804b79b840 100644 --- a/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java @@ -63,12 +63,7 @@ public class SupervisorEditProjectPanel extends GenericPanel<Project> { } private void initComponents() { - add( - new RequiredTextField<>( - TITLE, - LambdaModel.of(getModel(), Project::getTitle, Project::setTitle) - ) - ); + add(new RequiredTextField<>(TITLE, LambdaModel.of(getModel(), Project::getTitle, Project::setTitle))); TextField<LocalDate> startDate = new TextField<>( "startDate", LambdaModel.of(getModel(), Project::getStartDate, Project::setStartDate), @@ -79,11 +74,7 @@ public class SupervisorEditProjectPanel extends GenericPanel<Project> { add(startDate); final TextField<LocalDate> expectedEndDate = new TextField<>( "expected_end_date", - LambdaModel.of( - getModel(), - Project::getExpectedEndDate, - Project::setExpectedEndDate - ), + LambdaModel.of(getModel(), Project::getExpectedEndDate, Project::setExpectedEndDate), LocalDate.class ); expectedEndDate.add(new BootstrapDatePicker()); diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerDataProvider.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerDataProvider.java index b793e1c0a7..afc21042d4 100755 --- a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerDataProvider.java +++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerDataProvider.java @@ -36,28 +36,15 @@ public class ProjectPartnerDataProvider implements IDataProvider<ProjectPartner> @Override public Iterator<? extends ProjectPartner> iterator(long first, long count) { - final PageRequest pageRequest = new PageRequest( - first, - count, - new Sort(Sort.Direction.DESC, "dateCreated") - ); + final PageRequest pageRequest = new PageRequest(first, count, new Sort(Sort.Direction.DESC, "dateCreated")); return projectPartnerService - .getProjectPartnerInSpan( - days, - applicationPeriod.getObject(), - model.getObject(), - pageRequest - ) + .getProjectPartnerInSpan(days, applicationPeriod.getObject(), model.getObject(), pageRequest) .iterator(); } @Override public long size() { - return projectPartnerService.countProjectPartnerInSpan( - days, - applicationPeriod.getObject(), - model.getObject() - ); + return projectPartnerService.countProjectPartnerInSpan(days, applicationPeriod.getObject(), model.getObject()); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java index 0cac4dbef8..a70588801a 100755 --- a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java +++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java @@ -33,16 +33,11 @@ import se.su.dsv.scipro.session.SciProSession; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.User; -public class ProjectPartnerPage - extends AbstractIdeaProjectPage - implements MenuHighlightProjectIdeas { +public class ProjectPartnerPage extends AbstractIdeaProjectPage implements MenuHighlightProjectIdeas { public static final int ITEMS_PER_PAGE = 5; - private static final AttributeAppender ACTIVE_CLASS = AttributeAppender.append( - "class", - "active" - ); + private static final AttributeAppender ACTIVE_CLASS = AttributeAppender.append("class", "active"); @Inject private ProjectPartnerService projectPartnerService; @@ -55,9 +50,7 @@ public class ProjectPartnerPage public ProjectPartnerPage(PageParameters pp) { super(pp); - final IModel<ApplicationPeriod> applicationPeriod = new DetachableServiceModel<>( - applicationPeriodService - ); + final IModel<ApplicationPeriod> applicationPeriod = new DetachableServiceModel<>(applicationPeriodService); final WebMarkupContainer panelContainer = new WebMarkupContainer("panels") { @Override protected void onConfigure() { @@ -67,8 +60,7 @@ public class ProjectPartnerPage }; panelContainer.setOutputMarkupPlaceholderTag(true); add(panelContainer); - final GeneralSystemSettings settings = - generalSystemSettingsService.getGeneralSystemSettingsInstance(); + final GeneralSystemSettings settings = generalSystemSettingsService.getGeneralSystemSettingsInstance(); panelContainer.add(new FeedbackPanel("feedback")); add( new AjaxDropDownChoice<>( @@ -78,10 +70,7 @@ public class ProjectPartnerPage new LambdaChoiceRenderer<>(ApplicationPeriod::getName, ApplicationPeriod::getId) ) { @Override - public void onNewSelection( - final AjaxRequestTarget target, - final ApplicationPeriod objectSelected - ) { + public void onNewSelection(final AjaxRequestTarget target, final ApplicationPeriod objectSelected) { target.add(panelContainer); } } @@ -100,13 +89,12 @@ public class ProjectPartnerPage @Override protected void populateItem(final ListItem<ProjectType> item) { WebMarkupContainer container = new WebMarkupContainer("listContainer"); - ProjectPartnerDataProvider projectPartnerDataProvider = - new ProjectPartnerDataProvider( - projectPartnerService, - settings.getProjectPartnerDaysToLive(), - applicationPeriod, - item.getModel() - ); + ProjectPartnerDataProvider projectPartnerDataProvider = new ProjectPartnerDataProvider( + projectPartnerService, + settings.getProjectPartnerDaysToLive(), + applicationPeriod, + item.getModel() + ); final DataView<ProjectPartner> dataView = new DataView<>( "list", projectPartnerDataProvider, @@ -115,43 +103,24 @@ public class ProjectPartnerPage @Override protected void populateItem(Item<ProjectPartner> item) { item.add( - new Label( - "exname", - item - .getModel() - .map(ProjectPartner::getUser) - .map(User::getFullName) - ) + new Label("exname", item.getModel().map(ProjectPartner::getUser).map(User::getFullName)) ); item.add( new Label( "exmail", - item - .getModel() - .map(ProjectPartner::getUser) - .map(User::getEmailAddress) + item.getModel().map(ProjectPartner::getUser).map(User::getEmailAddress) ) ); + item.add(new DateLabel("exdate", item.getModel().map(ProjectPartner::getDateCreated))); item.add( - new DateLabel( - "exdate", - item.getModel().map(ProjectPartner::getDateCreated) - ) - ); - item.add( - new MultiLineLabel( - "exinfoText", - item.getModel().map(ProjectPartner::getInfotext) - ) + new MultiLineLabel("exinfoText", item.getModel().map(ProjectPartner::getInfotext)) ); item.add( new AjaxLink<>("remove", item.getModel()) { @Override protected void onConfigure() { super.onConfigure(); - setVisible( - getModelObject().getUser().equals(loggedInUser()) - ); + setVisible(getModelObject().getUser().equals(loggedInUser())); } @Override @@ -166,17 +135,10 @@ public class ProjectPartnerPage }; container.add(dataView); container.setOutputMarkupId(true); - PagingNavigator pagingNavigator = new AjaxPagingNavigator( - "navigator", - dataView - ); + PagingNavigator pagingNavigator = new AjaxPagingNavigator("navigator", dataView); container.add(pagingNavigator); item.add(container); - final String href = item - .getModelObject() - .getName() - .toLowerCase() - .replaceAll("[^a-z]", ""); + final String href = item.getModelObject().getName().toLowerCase().replaceAll("[^a-z]", ""); item.add(AttributeModifier.replace("id", href)); if (item.getIndex() == 0) { item.add(ACTIVE_CLASS); @@ -189,10 +151,7 @@ public class ProjectPartnerPage Form<ProjectPartner> form = new Form<>( "projectPartnerForm", - new DetachableServiceModel<>( - projectPartnerService, - new ProjectPartner(SciProSession.get().getUser()) - ) + new DetachableServiceModel<>(projectPartnerService, new ProjectPartner(SciProSession.get().getUser())) ) { @Override protected void onSubmit() { @@ -203,21 +162,13 @@ public class ProjectPartnerPage }; TextArea<String> infoText = new TextArea<>( "infotext", - LambdaModel.of( - form.getModel(), - ProjectPartner::getInfotext, - ProjectPartner::setInfotext - ) + LambdaModel.of(form.getModel(), ProjectPartner::getInfotext, ProjectPartner::setInfotext) ); infoText.setRequired(true); form.add(infoText); final RadioChoice<ProjectType> projectTypeChoice = new BootstrapRadioChoice<>( "projectType", - LambdaModel.of( - form.getModel(), - ProjectPartner::getProjectType, - ProjectPartner::setProjectType - ), + LambdaModel.of(form.getModel(), ProjectPartner::getProjectType, ProjectPartner::setProjectType), matchableTypes, new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) ); @@ -229,9 +180,7 @@ public class ProjectPartnerPage new ListView<>("adChoice", matchableTypes) { @Override protected void populateItem(final ListItem<ProjectType> item) { - final String href = - "#" + - item.getModelObject().getName().toLowerCase().replaceAll("[^a-z]", ""); + final String href = "#" + item.getModelObject().getName().toLowerCase().replaceAll("[^a-z]", ""); final ExternalLink tab = new ExternalLink( "tabLink", Model.of(href), diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java index 9227e5f8ec..b63621e4ba 100755 --- a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java @@ -45,9 +45,7 @@ public class ProjectPartnerPanel extends Panel { new ListView<>("tabs", matchableTypes) { @Override protected void populateItem(final ListItem<ProjectType> item) { - final String href = - "#" + - item.getModelObject().getName().toLowerCase().replaceAll("[^a-z]", ""); + final String href = "#" + item.getModelObject().getName().toLowerCase().replaceAll("[^a-z]", ""); final ExternalLink tab = new ExternalLink( "tabLink", Model.of(href), @@ -66,16 +64,13 @@ public class ProjectPartnerPanel extends Panel { new ListView<>("types", matchableTypes) { @Override protected void populateItem(final ListItem<ProjectType> item2) { - final IModel<ApplicationPeriod> applicationPeriod = Model.of( - (ApplicationPeriod) null + final IModel<ApplicationPeriod> applicationPeriod = Model.of((ApplicationPeriod) null); + ProjectPartnerDataProvider projectPartnerDataProvider = new ProjectPartnerDataProvider( + projectPartnerService, + 0, + applicationPeriod, + item2.getModel() ); - ProjectPartnerDataProvider projectPartnerDataProvider = - new ProjectPartnerDataProvider( - projectPartnerService, - 0, - applicationPeriod, - item2.getModel() - ); final WebMarkupContainer wmc = new WebMarkupContainer("listContainer"); @@ -87,34 +82,17 @@ public class ProjectPartnerPanel extends Panel { @Override protected void populateItem(final Item<ProjectPartner> item) { item.add( - new Label( - "exname", - item - .getModel() - .map(ProjectPartner::getUser) - .map(User::getFullName) - ) + new Label("exname", item.getModel().map(ProjectPartner::getUser).map(User::getFullName)) ); item.add( new Label( "exmail", - item - .getModel() - .map(ProjectPartner::getUser) - .map(User::getEmailAddress) + item.getModel().map(ProjectPartner::getUser).map(User::getEmailAddress) ) ); + item.add(new DateLabel("exdate", item.getModel().map(ProjectPartner::getDateCreated))); item.add( - new DateLabel( - "exdate", - item.getModel().map(ProjectPartner::getDateCreated) - ) - ); - item.add( - new MultiLineLabel( - "exinfoText", - item.getModel().map(ProjectPartner::getInfotext) - ) + new MultiLineLabel("exinfoText", item.getModel().map(ProjectPartner::getInfotext)) ); item.add( new AjaxConfirmationLink<Void>( @@ -136,11 +114,7 @@ public class ProjectPartnerPanel extends Panel { wmc.add(dataView); wmc.add(new AjaxPagingNavigator("navigator", dataView)); item2.add(wmc); - final String href = item2 - .getModelObject() - .getName() - .toLowerCase() - .replaceAll("[^a-z]", ""); + final String href = item2.getModelObject().getName().toLowerCase().replaceAll("[^a-z]", ""); item2.add(AttributeModifier.replace("id", href)); if (item2.getIndex() == 0) { item2.add(AttributeAppender.append("class", "active")); diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java index c20b475272..836bcdb285 100644 --- a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java +++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java @@ -24,9 +24,7 @@ public class SinglesPage extends AbstractAdminMatchPage { public SinglesPage() { final IModel<List<ApplicationPeriod>> allPeriods = getAllApplicationPeriods(); - final IModel<ApplicationPeriod> applicationPeriod = new DetachableServiceModel<>( - applicationPeriodService - ); + final IModel<ApplicationPeriod> applicationPeriod = new DetachableServiceModel<>(applicationPeriodService); final WebMarkupContainer singles = new SinglesPanel("singles", applicationPeriod) { @Override @@ -46,10 +44,7 @@ public class SinglesPage extends AbstractAdminMatchPage { new LambdaChoiceRenderer<>(ApplicationPeriod::getName, ApplicationPeriod::getId) ) { @Override - public void onNewSelection( - AjaxRequestTarget target, - ApplicationPeriod objectSelected - ) { + public void onNewSelection(AjaxRequestTarget target, ApplicationPeriod objectSelected) { target.add(singles); } } diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java index e2d60aedd6..4b9965766c 100644 --- a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java @@ -36,10 +36,7 @@ public class SinglesPanel extends GenericPanel<ApplicationPeriod> { add( new BootstrapTabs<>("tabs", getMatchableTypes()) { @Override - protected WebMarkupContainer getContent( - final String id, - final IModel<ProjectType> model - ) { + protected WebMarkupContainer getContent(final String id, final IModel<ProjectType> model) { return new Tab(id, getSinglesForType(singles, model)); } @@ -61,15 +58,9 @@ public class SinglesPanel extends GenericPanel<ApplicationPeriod> { protected void populateItem(final ListItem<ProjectPartner> item) { final IModel<ProjectPartner> partner = item.getModel(); item.add(new UserLinkPanel("user", partner.map(ProjectPartner::getUser))); + item.add(new MultiLineLabel("infotext", partner.map(ProjectPartner::getInfotext))); item.add( - new MultiLineLabel("infotext", partner.map(ProjectPartner::getInfotext)) - ); - item.add( - new DateLabel( - "dateCreated", - partner.map(ProjectPartner::getDateCreated), - DateStyle.DATE - ) + new DateLabel("dateCreated", partner.map(ProjectPartner::getDateCreated), DateStyle.DATE) ); } } @@ -93,8 +84,9 @@ public class SinglesPanel extends GenericPanel<ApplicationPeriod> { return new LoadableDetachableModel<>() { @Override protected List<ProjectPartner> load() { - final List<ProjectPartner> partnersWithoutIdea = - projectPartnerService.getPartnersWithoutIdea(getModelObject()); + final List<ProjectPartner> partnersWithoutIdea = projectPartnerService.getPartnersWithoutIdea( + getModelObject() + ); partnersWithoutIdea.sort(comparing(ProjectPartner::getDateCreated, reverseOrder())); return partnersWithoutIdea; } diff --git a/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java b/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java index 0f0cb65b10..58870f6edc 100644 --- a/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java @@ -118,10 +118,7 @@ public abstract class ProjectStatePanel extends Panel { } private void addReasonLabel() { - reasonLabel = new MultiLineLabel( - REASON_LABEL, - Model.of(model.getObject().getStateOfMindReason()) - ) { + reasonLabel = new MultiLineLabel(REASON_LABEL, Model.of(model.getObject().getStateOfMindReason())) { @Override protected void onConfigure() { super.onConfigure(); @@ -138,11 +135,7 @@ public abstract class ProjectStatePanel extends Panel { form.setOutputMarkupPlaceholderTag(true); form.setVisibilityAllowed(false); - final CounterTextArea reasonArea = new CounterTextArea( - REASON_AREA, - Model.of(""), - MAX_CHARS - ); + final CounterTextArea reasonArea = new CounterTextArea(REASON_AREA, Model.of(""), MAX_CHARS); reasonArea.setRequired(true); form.add(reasonArea); @@ -155,11 +148,7 @@ public abstract class ProjectStatePanel extends Panel { model.getObject().setStateOfMindReason(reasonArea.getModelObject()); reasonLabel.setDefaultModel(Model.of(model.getObject().getStateOfMindReason())); model.setObject(projectService.save(model.getObject())); - date = new DateLabel( - DATE, - new Model<>(model.getObject().getStateOfMindDate()), - DATETIME - ); + date = new DateLabel(DATE, new Model<>(model.getObject().getStateOfMindDate()), DATETIME); getParent().getParent().replace(date); date.setOutputMarkupId(true); form.setVisibilityAllowed(false); @@ -198,11 +187,7 @@ public abstract class ProjectStatePanel extends Panel { model.getObject().setStateOfMindReason(""); reasonLabel.setDefaultModel(Model.of(model.getObject().getStateOfMindReason())); model.setObject(projectService.save(model.getObject())); - date = new DateLabel( - DATE, - new Model<>(model.getObject().getStateOfMindDate()), - DATETIME - ); + date = new DateLabel(DATE, new Model<>(model.getObject().getStateOfMindDate()), DATETIME); getParent().replace(date); date.setOutputMarkupId(true); } else { diff --git a/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java b/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java index 24a875ada0..e9bade3f60 100755 --- a/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java @@ -89,12 +89,7 @@ public class ProjectFilePanel extends GenericPanel<Project> { List<IColumn<ProjectFile, String>> columns = new ArrayList<>(); columns.add(nameColumn()); columns.add( - new DateColumn<>( - Model.of("Created"), - ProjectFile::getDateCreated, - "dateCreated", - DateStyle.DATETIME - ) + new DateColumn<>(Model.of("Created"), ProjectFile::getDateCreated, "dateCreated", DateStyle.DATETIME) ); columns.add( new LambdaColumn<>(Model.of("Size"), "fileReference.fileDescription.size", pf -> @@ -102,15 +97,11 @@ public class ProjectFilePanel extends GenericPanel<Project> { ) ); columns.add( - new UserColumn<>( - Model.of("Uploader"), - "fileReference.fileDescription.uploader.fullName", - pf -> pf.getFileDescription().getUploader() + new UserColumn<>(Model.of("Uploader"), "fileReference.fileDescription.uploader.fullName", pf -> + pf.getFileDescription().getUploader() ) ); - columns.add( - new EnumLambdaColumn<>(Model.of("Source"), "fileSource", ProjectFile::getFileSource) - ); + columns.add(new EnumLambdaColumn<>(Model.of("Source"), "fileSource", ProjectFile::getFileSource)); columns.add( new AbstractColumn<>(Model.of("Delete")) { @Override @@ -127,10 +118,7 @@ public class ProjectFilePanel extends GenericPanel<Project> { "Are you sure you want to delete the file?" ) { @Override - public void onClick( - AjaxRequestTarget target, - IModel<ProjectFile> model - ) { + public void onClick(AjaxRequestTarget target, IModel<ProjectFile> model) { projectFileService.delete(rowModel.getObject()); success(getString("deleted")); target.add(feedback); @@ -145,8 +133,7 @@ public class ProjectFilePanel extends GenericPanel<Project> { .getFileDescription() .getUploader() .equals(SciProSession.get().getUser()); - boolean wasUploadedToFiles = - file.getFileSource() == FileSource.FILES; + boolean wasUploadedToFiles = file.getFileSource() == FileSource.FILES; setVisibilityAllowed(isUploader && wasUploadedToFiles); } } @@ -182,9 +169,7 @@ public class ProjectFilePanel extends GenericPanel<Project> { "name", rowModel.map(ProjectFile::getFileDescription) ); - downloadLink.setBody( - rowModel.map(ProjectFile::getFileDescription).map(FileDescription::getName) - ); + downloadLink.setBody(rowModel.map(ProjectFile::getFileDescription).map(FileDescription::getName)); Fragment cell = new Fragment(componentId, "_name", ProjectFilePanel.this); cell.add(downloadLink); diff --git a/view/src/main/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanel.java b/view/src/main/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanel.java index 584b21cc43..5f321c0842 100644 --- a/view/src/main/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanel.java @@ -24,11 +24,7 @@ public class ViewAttachmentPanel extends GenericPanel<FileDescription> { @Override protected void onInitialize() { super.onInitialize(); - add( - new FileDownloadLink<>(NAME, getModel()).setBody( - getModel().map(FileDescription::getName) - ) - ); + add(new FileDownloadLink<>(NAME, getModel()).setBody(getModel().map(FileDescription::getName))); add( new DateLabel(UPLOAD_TIME, getModel().map(DomainObject::getDateCreated), dateStyle) { diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java index 54c70b2e92..37e981c569 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java @@ -37,12 +37,10 @@ public abstract class ApprovalReviewerPanel extends Panel { public ApprovalReviewerPanel(final String id) { super(id); final IModel<MyReviewService.Filter> filter = getFilter(); - UndecidedReviewerApprovalsProvider undecidedReviewerApprovalsProvider = - new UndecidedReviewerApprovalsProvider(filter); - undecidedReviewerApprovalsProvider.setSort( - MyReviewService.Sort.DEADLINE, - SortOrder.ASCENDING + UndecidedReviewerApprovalsProvider undecidedReviewerApprovalsProvider = new UndecidedReviewerApprovalsProvider( + filter ); + undecidedReviewerApprovalsProvider.setSort(MyReviewService.Sort.DEADLINE, SortOrder.ASCENDING); final DefaultDataPanel<Decision, MyReviewService.Sort> table = new DefaultDataPanel<>( "undecidedApprovals", createColumns(), @@ -53,11 +51,7 @@ public abstract class ApprovalReviewerPanel extends Panel { add( new AjaxCheckBox( "showAll", - LambdaModel.of( - filter, - MyReviewService.Filter::isShowAll, - MyReviewService.Filter::setShowAll - ) + LambdaModel.of(filter, MyReviewService.Filter::isShowAll, MyReviewService.Filter::setShowAll) ) { @Override protected void onUpdate(AjaxRequestTarget target) { @@ -76,16 +70,8 @@ public abstract class ApprovalReviewerPanel extends Panel { private List<? extends IColumn<Decision, MyReviewService.Sort>> createColumns() { return Arrays.asList( - new DateColumn<>( - Model.of("Requested"), - Decision::getRequested, - MyReviewService.Sort.REQUESTED - ), - new DateColumn<>( - Model.of("Deadline"), - Decision::getDeadline, - MyReviewService.Sort.DEADLINE - ), + new DateColumn<>(Model.of("Requested"), Decision::getRequested, MyReviewService.Sort.REQUESTED), + new DateColumn<>(Model.of("Deadline"), Decision::getDeadline, MyReviewService.Sort.DEADLINE), new AbstractColumn<>(Model.of("Title"), MyReviewService.Sort.TITLE) { @Override public void populateItem( @@ -95,10 +81,7 @@ public abstract class ApprovalReviewerPanel extends Panel { ) { cellItem.add( LinkWrapper.apply(componentId, id -> { - AbstractLink link = newDecisionLink( - id, - rowModel.map(Decision::getReviewerApproval) - ); + AbstractLink link = newDecisionLink(id, rowModel.map(Decision::getReviewerApproval)); link.setBody( rowModel .map(Decision::getReviewerApproval) diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionForumThread.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionForumThread.java index c73c6f674f..c640bc51e2 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionForumThread.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionForumThread.java @@ -13,9 +13,7 @@ public class ReviewerInteractionForumThread implements ForumThread<Project>, ICl private final ReviewerInteractionService reviewerInteractionService; - public ReviewerInteractionForumThread( - final ReviewerInteractionService reviewerInteractionService - ) { + public ReviewerInteractionForumThread(final ReviewerInteractionService reviewerInteractionService) { this.reviewerInteractionService = reviewerInteractionService; } diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java index da0d80c4f4..8071bb9c74 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java @@ -42,28 +42,15 @@ public class ReviewerInteractionPage extends ReviewerPage { public ReviewerInteractionPage(PageParameters pp) { super(pp); IModel<Project> projectModel = validatePageLoad(pp); - add( - new Label( - "projectTitle", - LambdaModel.of(projectModel, Project::getTitle, Project::setTitle) - ) - ); + add(new Label("projectTitle", LambdaModel.of(projectModel, Project::getTitle, Project::setTitle))); add(new ProjectHeaderPanel("header", projectModel)); add(new InfoPanel("info", new ResourceModel("info"))); - ReviewerThread reviewerThread = reviewerInteractionService.getReviewerThread( - projectModel.getObject() - ); - if ( - reviewerThread == null || !reviewerThread.getProject().equals(projectModel.getObject()) - ) { + ReviewerThread reviewerThread = reviewerInteractionService.getReviewerThread(projectModel.getObject()); + if (reviewerThread == null || !reviewerThread.getProject().equals(projectModel.getObject())) { throw new RestartResponseException(getApplication().getHomePage()); } - basicForumService.setThreadRead( - SciProSession.get().getUser(), - reviewerThread.getForumThread(), - true - ); + basicForumService.setThreadRead(SciProSession.get().getUser(), reviewerThread.getForumThread(), true); add( new SubmitForumReplyPanel<>( @@ -99,10 +86,7 @@ public class ReviewerInteractionPage extends ReviewerPage { return projectService.findOne(value.toLong()); } }; - if ( - projectModel.getObject() == null || - !projectModel.getObject().isReviewer(SciProSession.get().getUser()) - ) { + if (projectModel.getObject() == null || !projectModel.getObject().isReviewer(SciProSession.get().getUser())) { throw new RestartResponseException(AccessDeniedPage.class); } return projectModel; diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java index a36917852e..60044023d0 100755 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java @@ -26,9 +26,7 @@ public abstract class ReviewerPage extends MenuPage { super(pp); saveSelectedRole(); SciProSession.get() - .setSystemModules( - generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules() - ); + .setSystemModules(generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules()); } private void saveSelectedRole() { diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java index a1ae1bd751..34810dbfe4 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java @@ -78,9 +78,7 @@ public class ReviewerStartPage extends ReviewerPage { private void addRoughDraftApprovals() { add( new Label("undecidedRoughDraftApprovals", () -> { - long undecided = myReviewService.countUndecidedRoughDraft( - SciProSession.get().getUser() - ); + long undecided = myReviewService.countUndecidedRoughDraft(SciProSession.get().getUser()); return undecided == 0 ? "" : undecided; }) ); @@ -100,12 +98,7 @@ public class ReviewerStartPage extends ReviewerPage { Model.of(filter) ); - DefaultDataTable<Project, String> table = new DefaultDataTable<>( - "dataPanel", - createColumns(), - provider, - 1000 - ); + DefaultDataTable<Project, String> table = new DefaultDataTable<>("dataPanel", createColumns(), provider, 1000); add(table); addFilteringOptions(filter, table); @@ -178,18 +171,9 @@ public class ReviewerStartPage extends ReviewerPage { cellItem.add( LinkWrapper.apply(componentId, id -> { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Project.class), - rowModel.getObject().getId() - ); - AbstractLink link = new BookmarkablePageLink<>( - id, - ReviewerInteractionPage.class, - pp - ); - link.setBody( - LambdaModel.of(rowModel, Project::getTitle, Project::setTitle) - ); + pp.add(PageParameterKeys.MAP.get(Project.class), rowModel.getObject().getId()); + AbstractLink link = new BookmarkablePageLink<>(id, ReviewerInteractionPage.class, pp); + link.setBody(LambdaModel.of(rowModel, Project::getTitle, Project::setTitle)); return link; }) ); @@ -220,11 +204,7 @@ public class ReviewerStartPage extends ReviewerPage { cellItem.add( new UserLinkPanel( componentId, - LambdaModel.of( - rowModel, - Project::getHeadSupervisor, - Project::setHeadSupervisor - ) + LambdaModel.of(rowModel, Project::getHeadSupervisor, Project::setHeadSupervisor) ) ); } @@ -239,8 +219,7 @@ public class ReviewerStartPage extends ReviewerPage { new AbstractExportableColumn<>(Model.of("Unread posts")) { @Override public IModel<Integer> getDataModel(final IModel<Project> rowModel) { - return () -> - getUnreadPosts(SciProSession.get().getUser(), rowModel.getObject()); + return () -> getUnreadPosts(SciProSession.get().getUser(), rowModel.getObject()); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java index b6c1f18c6e..aee867817f 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java @@ -55,9 +55,7 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage { public static final String PAGE_PARAMETER_ID = "id"; - private static final System.Logger LOGGER = System.getLogger( - RoughDraftApprovalDecisionPage.class.getSimpleName() - ); + private static final System.Logger LOGGER = System.getLogger(RoughDraftApprovalDecisionPage.class.getSimpleName()); @Inject private ReviewerInteractionService reviewerInteractionService; @@ -85,10 +83,7 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage { approval = LoadableDetachableModel.of(() -> projectService.findOne(id)) .map(roughDraftApprovalService::findBy) .map(o -> o.orElse(null)); - if ( - approval.getObject() == null || - !approval.getObject().getProject().isReviewer(loggedInUser()) - ) { + if (approval.getObject() == null || !approval.getObject().getProject().isReviewer(loggedInUser())) { throw new RestartResponseException(getApplication().getHomePage()); } @@ -139,13 +134,9 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage { approval.getObject().getProject() ); final String returnUrl = - "/" + - getRequestCycle().mapUrlFor(RoughDraftApprovalDecisionPage.class, pp).canonical(); + "/" + getRequestCycle().mapUrlFor(RoughDraftApprovalDecisionPage.class, pp).canonical(); getSession().setMetaData(OAuth.RETURN_URL, returnUrl); - final String href = oAuthService.authorizeUrl( - null, - Set.of("grade:read", "grade:write") - ); + final String href = oAuthService.authorizeUrl(null, Set.of("grade:read", "grade:write")); throw new RedirectToUrlException(href); } } @@ -249,21 +240,9 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage { new AutoHidingListView<>("examinations", examinations) { @Override protected void populateItem(ListItem<Examination> item) { - item.add( - new Label( - "name", - item.getModel().map(Examination::name).map(Name::english) - ) - ); - item.add( - new Label("points", item.getModel().map(Examination::points)) - ); - item.add( - new Label( - "examination_date", - DecisionForm.this::getExaminationDate - ) - ); + item.add(new Label("name", item.getModel().map(Examination::name).map(Name::english))); + item.add(new Label("points", item.getModel().map(Examination::points))); + item.add(new Label("examination_date", DecisionForm.this::getExaminationDate)); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalReviewerPanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalReviewerPanel.java index 52862bac91..30f6dd78fd 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalReviewerPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalReviewerPanel.java @@ -18,10 +18,7 @@ public class RoughDraftApprovalReviewerPanel extends ApprovalReviewerPanel { } @Override - protected AbstractLink newDecisionLink( - final String id, - final IModel<ReviewerApproval> rowModel - ) { + protected AbstractLink newDecisionLink(final String id, final IModel<ReviewerApproval> rowModel) { PageParameters pageParameters = RoughDraftApprovalDecisionPage.pageParametersFor( rowModel.getObject().getProject() ); diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/ApprovedPanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/ApprovedPanel.java index 666c4df030..cc2049f513 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/ApprovedPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/ApprovedPanel.java @@ -18,20 +18,13 @@ class ApprovedPanel extends Panel { public ApprovedPanel(final String id, final IModel<Decision> decision) { super(id); - add( - new EnumLabel<>( - "topic", - decision.map(Decision::getReviewerApproval).map(ReviewerApproval::getStep) - ) - ); + add(new EnumLabel<>("topic", decision.map(Decision::getReviewerApproval).map(ReviewerApproval::getStep))); add(new DateLabel("when", decision.map(Decision::getDecisionDate), DateStyle.DATETIME)); add(new MultiLineLabel("message", decision.map(Decision::getReason))); add( new ViewAttachmentPanel( "attachment", - new OrNullModel<>(decision.map(Decision::getAttachment)).map( - FileReference::getFileDescription - ) + new OrNullModel<>(decision.map(Decision::getAttachment)).map(FileReference::getFileDescription) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/DeniedPanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/DeniedPanel.java index f10e23ba38..cbf9589d4b 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/DeniedPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/DeniedPanel.java @@ -18,20 +18,13 @@ class DeniedPanel extends Panel { public DeniedPanel(final String id, final IModel<Decision> decision) { super(id); - add( - new EnumLabel<>( - "topic", - decision.map(Decision::getReviewerApproval).map(ReviewerApproval::getStep) - ) - ); + add(new EnumLabel<>("topic", decision.map(Decision::getReviewerApproval).map(ReviewerApproval::getStep))); add(new DateLabel("when", decision.map(Decision::getDecisionDate), DateStyle.DATETIME)); add(new MultiLineLabel("message", decision.map(Decision::getReason))); add( new ViewAttachmentPanel( "attachment", - new OrNullModel<>(decision.map(Decision::getAttachment)).map( - FileReference::getFileDescription - ) + new OrNullModel<>(decision.map(Decision::getAttachment)).map(FileReference::getFileDescription) ) ); } diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/RequestedPanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/RequestedPanel.java index 499bfecb40..de013bc979 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/RequestedPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/RequestedPanel.java @@ -17,12 +17,7 @@ class RequestedPanel extends Panel { public RequestedPanel(final String id, final IModel<Decision> decision) { super(id); - add( - new EnumLabel<>( - "topic", - decision.map(Decision::getReviewerApproval).map(ReviewerApproval::getStep) - ) - ); + add(new EnumLabel<>("topic", decision.map(Decision::getReviewerApproval).map(ReviewerApproval::getStep))); add(new DateLabel("when", decision.map(Decision::getRequested), DateStyle.DATETIME)); add( new UserLinkPanel( @@ -33,16 +28,9 @@ class RequestedPanel extends Panel { .map(Project::getHeadSupervisor) ) ); + add(new MultiLineLabel("message", decision.map(Decision::getComment)).setRenderBodyOnly(true)); add( - new MultiLineLabel("message", decision.map(Decision::getComment)).setRenderBodyOnly( - true - ) - ); - add( - new ViewAttachmentPanel( - "thesis", - decision.map(Decision::getThesis).map(FileReference::getFileDescription) - ) + new ViewAttachmentPanel("thesis", decision.map(Decision::getThesis).map(FileReference::getFileDescription)) ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java index 35bd3b800e..be3bb709f9 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java @@ -28,15 +28,11 @@ public class TimelinePanel extends Panel { protected List<Event> load() { Collection<Event.Message> events = getForumEvents(model.getObject()); - Collection<Decision> finalSeminarDecisions = getFinalSeminarDecisions( - model.getObject() - ); + Collection<Decision> finalSeminarDecisions = getFinalSeminarDecisions(model.getObject()); Collection<Event> finalSeminarEvents = expandMultiple(finalSeminarDecisions); - Collection<Decision> roughDraftDecisions = getRoughDraftDecisions( - model.getObject() - ); + Collection<Decision> roughDraftDecisions = getRoughDraftDecisions(model.getObject()); Collection<Event> roughDraftEvents = expandMultiple(roughDraftDecisions); @@ -62,11 +58,7 @@ public class TimelinePanel extends Panel { } private Collection<Event.Message> getForumEvents(final Project project) { - return reviewerInteractionService - .getPosts(project) - .stream() - .map(Event.Message::new) - .toList(); + return reviewerInteractionService.getPosts(project).stream().map(Event.Message::new).toList(); } private Collection<Decision> getFinalSeminarDecisions(final Project project) { @@ -89,14 +81,8 @@ public class TimelinePanel extends Panel { private List<Event> expand(final Decision decision) { return switch (decision.getStatus()) { - case APPROVED -> Arrays.asList( - new Event.Requested(decision), - new Event.Approved(decision) - ); - case REJECTED -> Arrays.asList( - new Event.Requested(decision), - new Event.Denied(decision) - ); + case APPROVED -> Arrays.asList(new Event.Requested(decision), new Event.Approved(decision)); + case REJECTED -> Arrays.asList(new Event.Requested(decision), new Event.Denied(decision)); case UNDECIDED -> Collections.singletonList(new Event.Requested(decision)); }; } diff --git a/view/src/main/java/se/su/dsv/scipro/security/auth/ProjectModuleBasedAuthorizationStrategy.java b/view/src/main/java/se/su/dsv/scipro/security/auth/ProjectModuleBasedAuthorizationStrategy.java index 97fe36449b..9454c58f24 100644 --- a/view/src/main/java/se/su/dsv/scipro/security/auth/ProjectModuleBasedAuthorizationStrategy.java +++ b/view/src/main/java/se/su/dsv/scipro/security/auth/ProjectModuleBasedAuthorizationStrategy.java @@ -12,9 +12,7 @@ import se.su.dsv.scipro.session.SciProSession; public class ProjectModuleBasedAuthorizationStrategy implements IAuthorizationStrategy { @Override - public <T extends IRequestableComponent> boolean isInstantiationAuthorized( - Class<T> componentClass - ) { + public <T extends IRequestableComponent> boolean isInstantiationAuthorized(Class<T> componentClass) { return true; } diff --git a/view/src/main/java/se/su/dsv/scipro/security/auth/RoleBasedAuthorizationStrategy.java b/view/src/main/java/se/su/dsv/scipro/security/auth/RoleBasedAuthorizationStrategy.java index 10422b427e..2cba88061e 100755 --- a/view/src/main/java/se/su/dsv/scipro/security/auth/RoleBasedAuthorizationStrategy.java +++ b/view/src/main/java/se/su/dsv/scipro/security/auth/RoleBasedAuthorizationStrategy.java @@ -27,9 +27,7 @@ public class RoleBasedAuthorizationStrategy implements IAuthorizationStrategy { } @Override - public <T extends IRequestableComponent> boolean isInstantiationAuthorized( - Class<T> componentClass - ) { + public <T extends IRequestableComponent> boolean isInstantiationAuthorized(Class<T> componentClass) { Authorization annotation = componentClass.getAnnotation(Authorization.class); if (annotation != null) { if (!annotation.requiresLoggedInUser()) { @@ -41,10 +39,7 @@ public class RoleBasedAuthorizationStrategy implements IAuthorizationStrategy { throw new RestartResponseAtInterceptPageException(SSOPage.class); } //We only check pages for instantiation authorization, other components are handled via ActionAuthorization - return ( - !(Page.class.isAssignableFrom(componentClass)) || - instantiationAuthorized(annotation, session) - ); + return (!(Page.class.isAssignableFrom(componentClass)) || instantiationAuthorized(annotation, session)); } return true; } diff --git a/view/src/main/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategy.java b/view/src/main/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategy.java index 9a5d3eeebd..660a6a2a85 100644 --- a/view/src/main/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategy.java +++ b/view/src/main/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategy.java @@ -12,9 +12,7 @@ import se.su.dsv.scipro.session.SciProSession; public class SystemModuleBasedAuthorizationStrategy implements IAuthorizationStrategy { @Override - public <T extends IRequestableComponent> boolean isInstantiationAuthorized( - Class<T> componentClass - ) { + public <T extends IRequestableComponent> boolean isInstantiationAuthorized(Class<T> componentClass) { return true; } diff --git a/view/src/main/java/se/su/dsv/scipro/settings/pages/AbstractSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/settings/pages/AbstractSettingsPage.java index 3f4ed2851c..463bc89a04 100755 --- a/view/src/main/java/se/su/dsv/scipro/settings/pages/AbstractSettingsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/settings/pages/AbstractSettingsPage.java @@ -19,12 +19,7 @@ public abstract class AbstractSettingsPage extends MenuPage { final List<MenuItem> items = new ArrayList<>(); items.add(new MenuItem("Basic profile", BasicProfilePage.class)); items.add(new MenuItem("Supervisor profile", SupervisorProfilePage.class)); - items.add( - new MenuItem( - "Notification settings", - SupervisorNotificationSettingsPage.class - ) - ); + items.add(new MenuItem("Notification settings", SupervisorNotificationSettingsPage.class)); return items; } diff --git a/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java b/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java index d49e7a9247..6405d4e89a 100755 --- a/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java +++ b/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java @@ -60,24 +60,15 @@ public class BasicProfilePage extends AbstractSettingsPage { setMultiPart(true); add(new Label(NAME, loggedInUser().getFullName())); add(new Label(EMAIL, loggedInUser().getEmailAddress())); + add(new TextField<>(SKYPE, LambdaModel.of(model, UserProfile::getSkypeId, UserProfile::setSkypeId))); add( - new TextField<>( - SKYPE, - LambdaModel.of(model, UserProfile::getSkypeId, UserProfile::setSkypeId) - ) + new TextField<>(PHONE, LambdaModel.of(model, UserProfile::getPhoneNumber, UserProfile::setPhoneNumber)) ); add( - new TextField<>( - PHONE, - LambdaModel.of(model, UserProfile::getPhoneNumber, UserProfile::setPhoneNumber) + new TextArea<>(OTHER, LambdaModel.of(model, UserProfile::getOtherInfo, UserProfile::setOtherInfo)).add( + StringValidator.maximumLength(MAX_LENGTH) ) ); - add( - new TextArea<>( - OTHER, - LambdaModel.of(model, UserProfile::getOtherInfo, UserProfile::setOtherInfo) - ).add(StringValidator.maximumLength(MAX_LENGTH)) - ); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AbstractAdminStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AbstractAdminStatisticsPage.java index 7264f0e16a..23e2637e65 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AbstractAdminStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AbstractAdminStatisticsPage.java @@ -28,18 +28,9 @@ public abstract class AbstractAdminStatisticsPage extends AbstractAdminPage { items.add(new MenuItem("Ideas", AdminIdeaStatisticsPage.class)); items.add(new MenuItem("Idea statuses", AdminIdeaStatusStatisticsPage.class)); items.add(new MenuItem("Unmet targets", AdminUnmetTargetsStatisticsPage.class)); - items.add( - new MenuItem("Peers", AdminPeersPage.class, MenuHighlightAdminPeer.class) - ); - items.add( - new MenuItem("Supervisors commitments", SupervisorStatisticsPage.class) - ); - items.add( - new MenuItem( - "Projects connected to external org", - ProjectExternalStatisticsPage.class - ) - ); + items.add(new MenuItem("Peers", AdminPeersPage.class, MenuHighlightAdminPeer.class)); + items.add(new MenuItem("Supervisors commitments", SupervisorStatisticsPage.class)); + items.add(new MenuItem("Projects connected to external org", ProjectExternalStatisticsPage.class)); items.add(new MenuItem("Units", AdminUnitStatisticsPage.class)); items.add( new MenuItem( @@ -55,24 +46,12 @@ public abstract class AbstractAdminStatisticsPage extends AbstractAdminPage { MenuHighlightAdminMileStoneStatistics.class ) ); - items.add( - new MenuItem( - "Milestone progress", - AdminMilestoneStatisticsProgressPage.class - ) - ); + items.add(new MenuItem("Milestone progress", AdminMilestoneStatisticsProgressPage.class)); items.add(new MenuItem("Milestone median", AdminMedianMilestonePage.class)); - items.add( - new MenuItem( - "Unfinished final seminars", - AdminUnfinishedFinalSeminarsPage.class - ) - ); + items.add(new MenuItem("Unfinished final seminars", AdminUnfinishedFinalSeminarsPage.class)); items.add(new MenuItem("Reviewer deadlines", AdminReviewerDeadlinesPage.class)); items.add(new MenuItem("People", AdminPeopleStatisticsPage.class)); - items.add( - new MenuItem("Final seminars", AdminFinalSeminarStatisticsPage.class) - ); + items.add(new MenuItem("Final seminars", AdminFinalSeminarStatisticsPage.class)); items.add(new MenuItem("Survey", AdminSurveyStatisticsPage.class)); return items; } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java index 18d92e0335..633f80b250 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java @@ -16,8 +16,7 @@ import se.su.dsv.scipro.milestones.dataobjects.Milestone; import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate; import se.su.dsv.scipro.milestones.service.MileStoneService; -public abstract class AbstractMilestoneDetailsPanel - extends GenericPanel<MilestoneActivityTemplate> { +public abstract class AbstractMilestoneDetailsPanel extends GenericPanel<MilestoneActivityTemplate> { public static final String TITLE = "title"; public static final String TABLE = "table"; @@ -46,11 +45,7 @@ public abstract class AbstractMilestoneDetailsPanel @Override public Iterator<? extends Milestone> iterator(long first, long count) { return mileStoneService - .findCompletedMilestones( - getModelObject(), - filter, - new PageAdapter(first, count, getSort()) - ) + .findCompletedMilestones(getModelObject(), filter, new PageAdapter(first, count, getSort())) .iterator(); } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java index a8ae51b6b2..4e9a89764a 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java @@ -77,9 +77,7 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage @Override public long size() { - return projectFinalSeminarStatisticsService.countFinalSeminarStatisticsNoOkFromReviewer( - filter - ); + return projectFinalSeminarStatisticsService.countFinalSeminarStatisticsNoOkFromReviewer(filter); } @Override @@ -107,30 +105,18 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage return new LoadableDetachableModel<>() { @Override protected Long load() { - return projectFinalSeminarStatisticsService.countFinalSeminarStatisticsOkFromReviewer( - filter - ); + return projectFinalSeminarStatisticsService.countFinalSeminarStatisticsOkFromReviewer(filter); } }; } private List<IColumn<Project, String>> createColumns() { List<IColumn<Project, String>> columns = new ArrayList<>(); - columns.add( - new TemporalColumn<>(Model.of("Project started"), "startDate", Project::getStartDate) - ); + columns.add(new TemporalColumn<>(Model.of("Project started"), "startDate", Project::getStartDate)); columns.add(new LambdaColumn<>(Model.of("Title"), "title", Project::getTitle)); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName)); columns.add(new EnumLambdaColumn<>(Model.of("Status"), Project::getProjectStatus)); - columns.add( - new UserColumn<>( - Model.of("Supervisor"), - "headSupervisor.fullName", - Project::getHeadSupervisor - ) - ); + columns.add(new UserColumn<>(Model.of("Supervisor"), "headSupervisor.fullName", Project::getHeadSupervisor)); columns.add( new AbstractColumn<>(Model.of("Current final seminar approval request status")) { @@ -140,15 +126,8 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage String componentId, IModel<Project> rowModel ) { - FinalSeminarApproval byProject = finalSeminarApprovalService.findByProject( - rowModel.getObject() - ); - cellItem.add( - new Label( - componentId, - byProject == null ? "-" : byProject.getCurrentStatus() - ) - ); + FinalSeminarApproval byProject = finalSeminarApprovalService.findByProject(rowModel.getObject()); + cellItem.add(new Label(componentId, byProject == null ? "-" : byProject.getCurrentStatus())); } } ); @@ -160,15 +139,8 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage String componentId, IModel<Project> rowModel ) { - FinalSeminarApproval byProject = finalSeminarApprovalService.findByProject( - rowModel.getObject() - ); - cellItem.add( - new Label( - componentId, - byProject == null ? "-" : byProject.getCurrentReason() - ) - ); + FinalSeminarApproval byProject = finalSeminarApprovalService.findByProject(rowModel.getObject()); + cellItem.add(new Label(componentId, byProject == null ? "-" : byProject.getCurrentReason())); } } ); @@ -183,9 +155,7 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage cellItem.add( new Label( componentId, - finalSeminarService - .findByProject(rowModel.getObject()) - .getCreationReason() + finalSeminarService.findByProject(rowModel.getObject()).getCreationReason() ) ); } @@ -200,9 +170,7 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage super(id); filter = new ProjectFinalSeminarStatisticsService.Filter(); filter.setFinalSeminarCreatedBefore(new Date()); - filter.setFinalSeminarCreatedAfter( - Date.from(ZonedDateTime.now().minusMonths(6).toInstant()) - ); + filter.setFinalSeminarCreatedAfter(Date.from(ZonedDateTime.now().minusMonths(6).toInstant())); AjaxCheckBoxMultipleChoice<ProjectType> projectType = new AjaxCheckBoxMultipleChoice<>( "projectTypeFilter", @@ -239,14 +207,8 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage add( new DatePickerPanel( "fsCreatedBetween", - LambdaModel.of( - filter::getFinalSeminarCreatedAfter, - filter::setFinalSeminarCreatedAfter - ), - LambdaModel.of( - filter::getFinalSeminarCreatedBefore, - filter::setFinalSeminarCreatedBefore - ) + LambdaModel.of(filter::getFinalSeminarCreatedAfter, filter::setFinalSeminarCreatedAfter), + LambdaModel.of(filter::getFinalSeminarCreatedBefore, filter::setFinalSeminarCreatedBefore) ) { @Override public void updateStartDate(final AjaxRequestTarget target) { @@ -260,19 +222,18 @@ public class AdminFinalSeminarStatisticsPage extends AbstractAdminStatisticsPage } ); - AjaxCheckBoxMultipleChoice<ProjectStatus> projectStatus = - new AjaxCheckBoxMultipleChoice<>( - "statusFilter", - asList(ProjectStatus.ACTIVE, ProjectStatus.COMPLETED), - asList(ProjectStatus.values()), - new EnumChoiceRenderer<>(this) - ) { - @Override - public void onUpdate(AjaxRequestTarget target) { - filter.setStatuses(new HashSet<>(getModelObject())); - target.add(wmc); - } - }; + AjaxCheckBoxMultipleChoice<ProjectStatus> projectStatus = new AjaxCheckBoxMultipleChoice<>( + "statusFilter", + asList(ProjectStatus.ACTIVE, ProjectStatus.COMPLETED), + asList(ProjectStatus.values()), + new EnumChoiceRenderer<>(this) + ) { + @Override + public void onUpdate(AjaxRequestTarget target) { + filter.setStatuses(new HashSet<>(getModelObject())); + target.add(wmc); + } + }; add(projectStatus); filter.setStatuses(new HashSet<>(projectStatus.getModelObject())); } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java index 2c4afa4e38..cc60c58d42 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java @@ -106,13 +106,12 @@ public class AdminMedianMilestonePage extends AbstractAdminStatisticsPage { ); params.setStatuses(asList(ProjectStatus.values())); - CheckBoxMultipleChoice<ProjectStatus> projectStatus = - new BootstrapCheckBoxMultipleChoice<>( - "statusFilter", - LambdaModel.of(params::getStatuses, params::setStatuses), - asList(ProjectStatus.values()), - new EnumChoiceRenderer<>(this) - ); + CheckBoxMultipleChoice<ProjectStatus> projectStatus = new BootstrapCheckBoxMultipleChoice<>( + "statusFilter", + LambdaModel.of(params::getStatuses, params::setStatuses), + asList(ProjectStatus.values()), + new EnumChoiceRenderer<>(this) + ); projectStatus.setRequired(true); add(projectStatus); diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPage.java index 84642f1ca9..b17208f159 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPage.java @@ -24,10 +24,7 @@ public class AdminMilestoneStatisticsPage extends AbstractAdminStatisticsPage { } @Override - public Page projectPage( - IModel<MilestoneActivityTemplate> model, - MileStoneService.Filter filter - ) { + public Page projectPage(IModel<MilestoneActivityTemplate> model, MileStoneService.Filter filter) { return new AdminProjectMilestoneDetailsPage(model, filter); } } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java index 78b066cac1..7226df99dc 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java @@ -42,11 +42,7 @@ public class AdminMultipleAuthorsStatisticsPage private String getProjects(IModel<User> model) { filter.setAuthorUser(model.getObject()); - return projectService - .findAll(filter) - .stream() - .map(Project::getTitle) - .collect(Collectors.joining(", ")); + return projectService.findAll(filter).stream().map(Project::getTitle).collect(Collectors.joining(", ")); } private LoadableDetachableModel<List<User>> getMultipleAuthors() { diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java index 977c9303e2..145feabd25 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java @@ -32,9 +32,7 @@ public class AdminPeopleStatisticsPage extends AbstractAdminStatisticsPage { @Override protected void onConfigure() { super.onConfigure(); - setVisibilityAllowed( - params.getProjectTypes() != null && !params.getProjectTypes().isEmpty() - ); + setVisibilityAllowed(params.getProjectTypes() != null && !params.getProjectTypes().isEmpty()); } }; container.setOutputMarkupPlaceholderTag(true); diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java index 160a45b05a..038617a737 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java @@ -112,9 +112,7 @@ public class AdminReviewerDeadlinesPage extends AbstractAdminStatisticsPage { ) { @Override protected void populateItem(ListItem<Pair<? extends ReviewerApproval, Decision>> item) { - final IModel<ReviewerApproval> reviewerApproval = item - .getModel() - .map(Pair::getHead); + final IModel<ReviewerApproval> reviewerApproval = item.getModel().map(Pair::getHead); final IModel<Decision> decision = item.getModel().map(Pair::getTail); final IModel<Project> project = reviewerApproval.map(ReviewerApproval::getProject); @@ -127,10 +125,7 @@ public class AdminReviewerDeadlinesPage extends AbstractAdminStatisticsPage { item.add(new DateLabel("tail.requested", decision.map(Decision::getRequested))); item.add(new EnumLabel<>("tail.status", decision.map(Decision::getStatus))); item.add( - new Label( - "reviewer.unit", - project.map(Project::getReviewer).map(User::getUnit).map(Unit::getTitle) - ) + new Label("reviewer.unit", project.map(Project::getReviewer).map(User::getUnit).map(Unit::getTitle)) ); } }; @@ -142,9 +137,7 @@ public class AdminReviewerDeadlinesPage extends AbstractAdminStatisticsPage { return daysService.workDaysBetween(deadline.getObject(), endDate) + 1; } - private LoadableDetachableModel< - List<Pair<? extends ReviewerApproval, Decision>> - > getLateReviewerApprovals() { + private LoadableDetachableModel<List<Pair<? extends ReviewerApproval, Decision>>> getLateReviewerApprovals() { return new LoadableDetachableModel<>() { @Override protected List<Pair<? extends ReviewerApproval, Decision>> load() { @@ -170,9 +163,7 @@ public class AdminReviewerDeadlinesPage extends AbstractAdminStatisticsPage { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render( - JavaScriptHeaderItem.forUrl("//cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js") - ); + response.render(JavaScriptHeaderItem.forUrl("//cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js")); response.render( JavaScriptHeaderItem.forUrl( "//cdn.datatables.net/plug-ins/3cfcc339e89/integration/bootstrap/3/dataTables.bootstrap.js" diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java index 1e58372abd..794519ae87 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java @@ -47,33 +47,16 @@ public class AdminUnfinishedFinalSeminarsPage extends AbstractAdminStatisticsPag } } ); - add( - new ExportableDataPanel<>( - "table", - columns(), - new UnfinishedSeminarProvider(seminarAfter, seminarBefore) - ) - ); + add(new ExportableDataPanel<>("table", columns(), new UnfinishedSeminarProvider(seminarAfter, seminarBefore))); } private List<? extends IColumn<FinalSeminar, String>> columns() { return asList( new LambdaColumn<>(Model.of("Title"), "project.title", FinalSeminar::getProjectTitle), new SupervisorColumn(Model.of("Head supervisor"), "project.headSupervisor.firstName"), - new DateColumn<>( - Model.of("Seminar date"), - FinalSeminar::getStartDate, - "startDate", - DateStyle.DATETIME - ), - new ParticipationColumn( - Model.of("Not graded respondents"), - FinalSeminar::getNotGradedRespondents - ), - new ParticipationColumn( - Model.of("Not graded opponents"), - FinalSeminar::getNotGradedOpponents - ), + new DateColumn<>(Model.of("Seminar date"), FinalSeminar::getStartDate, "startDate", DateStyle.DATETIME), + new ParticipationColumn(Model.of("Not graded respondents"), FinalSeminar::getNotGradedRespondents), + new ParticipationColumn(Model.of("Not graded opponents"), FinalSeminar::getNotGradedOpponents), new ParticipationColumn( Model.of("Not graded active participants"), FinalSeminar::getNotGradedActiveParticipations @@ -94,17 +77,8 @@ public class AdminUnfinishedFinalSeminarsPage extends AbstractAdminStatisticsPag } @Override - public void populateItem( - Item<ICellPopulator<FinalSeminar>> item, - String id, - IModel<FinalSeminar> model - ) { - item.add( - new UserLinkPanel( - id, - model.map(FinalSeminar::getProject).map(Project::getHeadSupervisor) - ) - ); + public void populateItem(Item<ICellPopulator<FinalSeminar>> item, String id, IModel<FinalSeminar> model) { + item.add(new UserLinkPanel(id, model.map(FinalSeminar::getProject).map(Project::getHeadSupervisor))); } } @@ -126,8 +100,7 @@ public class AdminUnfinishedFinalSeminarsPage extends AbstractAdminStatisticsPag } } - private final class UnfinishedSeminarProvider - extends SortableDataProvider<FinalSeminar, String> { + private final class UnfinishedSeminarProvider extends SortableDataProvider<FinalSeminar, String> { private final IModel<Date> seminarAfter; private final IModel<Date> seminarBefore; @@ -150,10 +123,7 @@ public class AdminUnfinishedFinalSeminarsPage extends AbstractAdminStatisticsPag @Override public long size() { - return finalSeminarService.countUnfinishedSeminars( - seminarAfter.getObject(), - seminarBefore.getObject() - ); + return finalSeminarService.countUnfinishedSeminars(seminarAfter.getObject(), seminarBefore.getObject()); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java index d91da31458..db208b447c 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java @@ -80,16 +80,10 @@ public class AdminUnitStatisticsPanel extends Panel { private IColumn<Unit, String> newSupervisorCountColumn() { return new AbstractColumn<>(Model.of("Supervisors")) { @Override - public void populateItem( - Item<ICellPopulator<Unit>> cellItem, - String componentId, - IModel<Unit> model - ) { + public void populateItem(Item<ICellPopulator<Unit>> cellItem, String componentId, IModel<Unit> model) { SupervisorService.FilterParams params = new SupervisorService.FilterParams(); params.setUnit(model.getObject()); - cellItem.add( - new Label(componentId, String.valueOf(supervisorService.count(params))) - ); + cellItem.add(new Label(componentId, String.valueOf(supervisorService.count(params)))); } }; } @@ -97,15 +91,9 @@ public class AdminUnitStatisticsPanel extends Panel { private IColumn<Unit, String> newActiveProjectsColumn() { return new AbstractColumn<>(Model.of("Active projects")) { @Override - public void populateItem( - Item<ICellPopulator<Unit>> cellItem, - String componentId, - IModel<Unit> model - ) { + public void populateItem(Item<ICellPopulator<Unit>> cellItem, String componentId, IModel<Unit> model) { projectParams.setUnit(model.getObject()); - cellItem.add( - new Label(componentId, String.valueOf(projectService.count(projectParams))) - ); + cellItem.add(new Label(componentId, String.valueOf(projectService.count(projectParams)))); } }; } @@ -113,11 +101,7 @@ public class AdminUnitStatisticsPanel extends Panel { private IColumn<Unit, String> newMatchedIdeasColumn() { return new AbstractColumn<>(Model.of("Matched ideas without projects")) { @Override - public void populateItem( - Item<ICellPopulator<Unit>> cellItem, - String componentId, - IModel<Unit> model - ) { + public void populateItem(Item<ICellPopulator<Unit>> cellItem, String componentId, IModel<Unit> model) { ideaParams.setUnit(model.getObject()); cellItem.add(new Label(componentId, String.valueOf(ideaService.count(ideaParams)))); } @@ -147,24 +131,23 @@ public class AdminUnitStatisticsPanel extends Panel { } private void addProjectTypesFilter() { - AjaxCheckBoxMultipleChoice<ProjectType> projectTypeFilter = - new AjaxCheckBoxMultipleChoice<>( - "projectTypeFilter", - projectTypeService.findByDegreeTypes( - Arrays.asList(DegreeType.BACHELOR, DegreeType.MASTER, DegreeType.MAGISTER) - ), - projectTypeService.findAllActive(), - new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) - ) { - @Override - public void onUpdate(AjaxRequestTarget target) { - if (!getModelObject().isEmpty()) { - projectParams.setProjectTypes(getModelObject()); - ideaParams.setLevels(getModelObject()); - } - target.add(table); + AjaxCheckBoxMultipleChoice<ProjectType> projectTypeFilter = new AjaxCheckBoxMultipleChoice<>( + "projectTypeFilter", + projectTypeService.findByDegreeTypes( + Arrays.asList(DegreeType.BACHELOR, DegreeType.MASTER, DegreeType.MAGISTER) + ), + projectTypeService.findAllActive(), + new LambdaChoiceRenderer<>(ProjectType::getName, ProjectType::getId) + ) { + @Override + public void onUpdate(AjaxRequestTarget target) { + if (!getModelObject().isEmpty()) { + projectParams.setProjectTypes(getModelObject()); + ideaParams.setLevels(getModelObject()); } - }; + target.add(table); + } + }; projectParams.setProjectTypes(projectTypeFilter.getModelObject()); ideaParams.setLevels(projectTypeFilter.getModelObject()); add(projectTypeFilter); diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java index 3238d2c522..03f6f6d889 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java @@ -49,19 +49,14 @@ public class AdminUnmetTargetsStatisticsPage extends AbstractAdminStatisticsPage add(feedback); applicationPeriod = new DetachableServiceModel<>(applicationPeriodService); - final IModel<List<ApplicationPeriod>> applicationPeriodChoices = - new LoadableDetachableModel<>() { - @Override - protected List<ApplicationPeriod> load() { - return applicationPeriodService.findAll( - new PageRequest( - 0, - Integer.MAX_VALUE, - new Sort(Sort.Direction.DESC, "startDate") - ) - ); - } - }; + final IModel<List<ApplicationPeriod>> applicationPeriodChoices = new LoadableDetachableModel<>() { + @Override + protected List<ApplicationPeriod> load() { + return applicationPeriodService.findAll( + new PageRequest(0, Integer.MAX_VALUE, new Sort(Sort.Direction.DESC, "startDate")) + ); + } + }; if (!applicationPeriodChoices.getObject().isEmpty()) { applicationPeriod.setObject(applicationPeriodChoices.getObject().get(0)); } @@ -74,10 +69,7 @@ public class AdminUnmetTargetsStatisticsPage extends AbstractAdminStatisticsPage "applicationPeriod", applicationPeriod, applicationPeriodChoices, - new LambdaChoiceRenderer<>( - ApplicationPeriod::getName, - ApplicationPeriod::getId - ) + new LambdaChoiceRenderer<>(ApplicationPeriod::getName, ApplicationPeriod::getId) ) { { setNullValid(false); @@ -112,9 +104,7 @@ public class AdminUnmetTargetsStatisticsPage extends AbstractAdminStatisticsPage public void onClick(AjaxRequestTarget target) { setResponsePage( new AdminMailPage( - matchFollowUpService.findSupervisorsWithUnmetTargets( - applicationPeriod.getObject() - ), + matchFollowUpService.findSupervisorsWithUnmetTargets(applicationPeriod.getObject()), "Add ideas in SciPro", "You don't have enough ideas to meet your targets for application period " + applicationPeriod.getObject().getName() @@ -147,10 +137,7 @@ public class AdminUnmetTargetsStatisticsPage extends AbstractAdminStatisticsPage private List<? extends IColumn<TargetResult, String>> columns() { return Arrays.asList( - new AbstractExportableColumn<>( - new StringResourceModel("th.supervisor", this), - "user.fullName" - ) { + new AbstractExportableColumn<>(new StringResourceModel("th.supervisor", this), "user.fullName") { @Override public void populateItem( final Item<ICellPopulator<TargetResult>> cellItem, @@ -160,38 +147,26 @@ public class AdminUnmetTargetsStatisticsPage extends AbstractAdminStatisticsPage cellItem.add( new UserLinkPanel( componentId, - new DetachableServiceModel<>( - userService, - rowModel.getObject().getTarget().getUser() - ) + new DetachableServiceModel<>(userService, rowModel.getObject().getTarget().getUser()) ) ); } @Override public IModel<String> getDataModel(final IModel<TargetResult> rowModel) { - return rowModel - .map(TargetResult::getTarget) - .map(Target::getUser) - .map(User::getFullName); + return rowModel.map(TargetResult::getTarget).map(Target::getUser).map(User::getFullName); } }, - new LambdaColumn<>( - new StringResourceModel("th.projectType", this), - "projectType.name", - tr -> tr.getTarget().getProjectType().getName() - ), - new LambdaColumn<>(new StringResourceModel("th.target", this), "target", tr -> - tr.getTarget().getTarget() + new LambdaColumn<>(new StringResourceModel("th.projectType", this), "projectType.name", tr -> + tr.getTarget().getProjectType().getName() ), + new LambdaColumn<>(new StringResourceModel("th.target", this), "target", tr -> tr.getTarget().getTarget()), new LambdaColumn<>( new StringResourceModel("th.submittedAndTaken", this), TargetResult::getSubmittedAndTaken ), new LambdaColumn<>(Model.of("Left"), targetResult -> - String.valueOf( - targetResult.getTarget().getTarget() - targetResult.getSubmittedAndTaken() - ) + String.valueOf(targetResult.getTarget().getTarget() - targetResult.getSubmittedAndTaken()) ) ); } @@ -201,10 +176,7 @@ public class AdminUnmetTargetsStatisticsPage extends AbstractAdminStatisticsPage @Override public Iterator<? extends TargetResult> iterator(final long first, final long count) { return matchFollowUpService - .findUnmetTargets( - applicationPeriod.getObject(), - new PageAdapter(first, count, getSort()) - ) + .findUnmetTargets(applicationPeriod.getObject(), new PageAdapter(first, count, getSort())) .iterator(); } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanel.java index cab56e1b0c..86ac308c45 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanel.java @@ -28,43 +28,29 @@ public class IndividualMilestoneDetailsPanel extends AbstractMilestoneDetailsPan protected List<IColumn<Milestone, String>> createColumns() { List<IColumn<Milestone, String>> columns = new ArrayList<>(); columns.add( - new TemporalColumn<>( - new ResourceModel("project.creation.date"), - "project.startDate", - m -> m.getProject().getStartDate() + new TemporalColumn<>(new ResourceModel("project.creation.date"), "project.startDate", m -> + m.getProject().getStartDate() ) ); columns.add( - new LambdaColumn<>(new ResourceModel("project.title"), "project.title", m -> - m.getProject().getTitle() - ) + new LambdaColumn<>(new ResourceModel("project.title"), "project.title", m -> m.getProject().getTitle()) ); columns.add( new LambdaColumn<>(new ResourceModel("project.type"), "project.projectType.name", m -> m.getProject().getProjectTypeName() ) ); + columns.add(new UserColumn<>(new ResourceModel("author"), "user.fullName", Milestone::getUser)); columns.add( - new UserColumn<>(new ResourceModel("author"), "user.fullName", Milestone::getUser) + new EnumLambdaColumn<>(new ResourceModel("project.status"), m -> m.getProject().getProjectStatus()) ); columns.add( - new EnumLambdaColumn<>(new ResourceModel("project.status"), m -> - m.getProject().getProjectStatus() + new UserColumn<>(new ResourceModel("project.supervisor"), "project.headSupervisor.fullName", m -> + m.getProject().getHeadSupervisor() ) ); columns.add( - new UserColumn<>( - new ResourceModel("project.supervisor"), - "project.headSupervisor.fullName", - m -> m.getProject().getHeadSupervisor() - ) - ); - columns.add( - new DateColumn<>( - new ResourceModel("milestone.completion.date"), - Milestone::getLastModified, - "lastModified" - ) + new DateColumn<>(new ResourceModel("milestone.completion.date"), Milestone::getLastModified, "lastModified") ); return columns; } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneActivityTemplateChoiceRenderer.java b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneActivityTemplateChoiceRenderer.java index ab48053f0d..3c4d85673c 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneActivityTemplateChoiceRenderer.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneActivityTemplateChoiceRenderer.java @@ -3,21 +3,13 @@ package se.su.dsv.scipro.statistics; import org.apache.wicket.markup.html.form.LambdaChoiceRenderer; import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate; -class MilestoneActivityTemplateChoiceRenderer - extends LambdaChoiceRenderer<MilestoneActivityTemplate> { +class MilestoneActivityTemplateChoiceRenderer extends LambdaChoiceRenderer<MilestoneActivityTemplate> { public MilestoneActivityTemplateChoiceRenderer() { - super( - MilestoneActivityTemplateChoiceRenderer::getDisplayValue_, - MilestoneActivityTemplate::getId - ); + super(MilestoneActivityTemplateChoiceRenderer::getDisplayValue_, MilestoneActivityTemplate::getId); } public static Object getDisplayValue_(final MilestoneActivityTemplate object) { - return String.format( - "[%s] %s", - object.getMilestonePhaseTemplate().getTitle(), - object.getTitle() - ); + return String.format("[%s] %s", object.getMilestonePhaseTemplate().getTitle(), object.getTitle()); } } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java index eaec81c719..ed9e0fcc6a 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java @@ -33,33 +33,19 @@ public class MilestoneFilterDetailsPanel extends Panel { protected class FilterStringFormatter implements IClusterable { public String projectTypeNames() { - return filter - .getProjectTypes() - .stream() - .map(ProjectType::getName) - .collect(Collectors.joining(", ")); + return filter.getProjectTypes().stream().map(ProjectType::getName).collect(Collectors.joining(", ")); } public String projectStatusNames() { - return filter - .getProjectStatuses() - .stream() - .map(String::valueOf) - .collect(Collectors.joining(" ,")); + return filter.getProjectStatuses().stream().map(String::valueOf).collect(Collectors.joining(" ,")); } public String startedBetween() { if (filter.getProjectStartedAfter() == null) { return getString("notAvailable"); } - String startedAfter = dateService.format( - filter.getProjectStartedAfter(), - DateStyle.DATE - ); - String startedBefore = dateService.format( - filter.getProjectStartedBefore(), - DateStyle.DATE - ); + String startedAfter = dateService.format(filter.getProjectStartedAfter(), DateStyle.DATE); + String startedBefore = dateService.format(filter.getProjectStartedBefore(), DateStyle.DATE); return startedAfter + " and " + startedBefore; } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java index e3ebec98ea..575f79d526 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java @@ -164,26 +164,17 @@ public class MilestoneStatisticsPanel extends Panel { private void addProjectMileStoneList() { container.add(new Label(TOTAL_PROJECTS, countTotalProjects())); container.add( - new ListView<>( - PROJECT_ACTIVITY_LIST, - getActivities(MilestoneActivityTemplate.Type.PROJECT) - ) { + new ListView<>(PROJECT_ACTIVITY_LIST, getActivities(MilestoneActivityTemplate.Type.PROJECT)) { @Override protected void populateItem(ListItem<MilestoneActivityTemplate> item) { - Link<MilestoneActivityTemplate> link = new Link<>( - DETAILS_LINK, - item.getModel() - ) { + Link<MilestoneActivityTemplate> link = new Link<>(DETAILS_LINK, item.getModel()) { @Override public void onClick() { setResponsePage(pageSupplier.projectPage(getModel(), filter)); } }; link.add( - new Label( - PROJECT_ACTIVITY_NAME, - item.getModel().map(MilestoneActivityTemplate::getTitle) - ) + new Label(PROJECT_ACTIVITY_NAME, item.getModel().map(MilestoneActivityTemplate::getTitle)) ); item.add(link); item.add(new Label(COMPLETED_PROJECTS, countCompleted(item.getModel()))); @@ -194,16 +185,10 @@ public class MilestoneStatisticsPanel extends Panel { private void addIndividualMileStoneList() { container.add( - new ListView<>( - INDIVIDUAL_ACTIVITY_LIST, - getActivities(MilestoneActivityTemplate.Type.STUDENT) - ) { + new ListView<>(INDIVIDUAL_ACTIVITY_LIST, getActivities(MilestoneActivityTemplate.Type.STUDENT)) { @Override protected void populateItem(ListItem<MilestoneActivityTemplate> item) { - Link<MilestoneActivityTemplate> link = new Link<>( - INDIVIDUAL_ACTIVITY_NAME, - item.getModel() - ) { + Link<MilestoneActivityTemplate> link = new Link<>(INDIVIDUAL_ACTIVITY_NAME, item.getModel()) { @Override public void onClick() { setResponsePage(pageSupplier.individualPage(getModel(), filter)); @@ -244,25 +229,17 @@ public class MilestoneStatisticsPanel extends Panel { return filterParams; } - private IModel<List<MilestoneActivityTemplate>> getActivities( - final MilestoneActivityTemplate.Type activityType - ) { + private IModel<List<MilestoneActivityTemplate>> getActivities(final MilestoneActivityTemplate.Type activityType) { return new LoadableDetachableModel<>() { @Override protected List<MilestoneActivityTemplate> load() { - return milestoneActivityTemplateService.getAllActivities( - activityType, - filter.getProjectTypes() - ); + return milestoneActivityTemplateService.getAllActivities(activityType, filter.getProjectTypes()); } }; } public interface PageSupplier extends Serializable { - Page individualPage( - IModel<MilestoneActivityTemplate> model, - MileStoneService.Filter filter - ); + Page individualPage(IModel<MilestoneActivityTemplate> model, MileStoneService.Filter filter); Page projectPage(IModel<MilestoneActivityTemplate> model, MileStoneService.Filter filter); } } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java index 0a7991a49c..c0254656a5 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java @@ -45,8 +45,7 @@ public class MilestoneStatisticsProgressPanel extends Panel { add( new Form<Void>("selection") { { - IModel<? extends List<? extends MilestoneActivityTemplate>> templates = - getTemplates(); + IModel<? extends List<? extends MilestoneActivityTemplate>> templates = getTemplates(); add( new DropDownChoice<>( "completed", @@ -72,13 +71,9 @@ public class MilestoneStatisticsProgressPanel extends Panel { private List<? extends IColumn<Project, String>> columns() { List<IColumn<Project, String>> columns = new ArrayList<>(); - columns.add( - new TemporalColumn<>(Model.of("Project started"), "startDate", Project::getStartDate) - ); + columns.add(new TemporalColumn<>(Model.of("Project started"), "startDate", Project::getStartDate)); columns.add(new LambdaColumn<>(Model.of("Title"), "title", Project::getTitle)); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName)); columns.add( new MultipleUsersColumn<>(Model.of("Authors")) { @Override @@ -88,13 +83,7 @@ public class MilestoneStatisticsProgressPanel extends Panel { } ); columns.add(new EnumLambdaColumn<>(Model.of("Status"), Project::getProjectStatus)); - columns.add( - new UserColumn<>( - Model.of("Supervisor"), - "headSupervisor.fullName", - Project::getHeadSupervisor - ) - ); + columns.add(new UserColumn<>(Model.of("Supervisor"), "headSupervisor.fullName", Project::getHeadSupervisor)); return columns; } @@ -127,10 +116,7 @@ public class MilestoneStatisticsProgressPanel extends Panel { if (completed.getObject() == null || notCompleted.getObject() == null) { return 0; } - return milestoneStatisticsService.countProgressedProjects( - completed.getObject(), - notCompleted.getObject() - ); + return milestoneStatisticsService.countProgressedProjects(completed.getObject(), notCompleted.getObject()); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanel.java index 2591a6d169..0e93bd5bde 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanel.java @@ -32,17 +32,11 @@ public class ProjectMilestoneDetailsPanel extends AbstractMilestoneDetailsPanel protected List<IColumn<Milestone, String>> createColumns() { List<IColumn<Milestone, String>> columns = new ArrayList<>(); columns.add( - new TemporalColumn<>(Model.of("Project started"), "project.startDate", m -> - m.getProject().getStartDate() - ) + new TemporalColumn<>(Model.of("Project started"), "project.startDate", m -> m.getProject().getStartDate()) ); + columns.add(new LambdaColumn<>(Model.of("Title"), "project.title", m -> m.getProject().getTitle())); columns.add( - new LambdaColumn<>(Model.of("Title"), "project.title", m -> m.getProject().getTitle()) - ); - columns.add( - new LambdaColumn<>(Model.of("Type"), "project.projectType.name", m -> - m.getProject().getProjectTypeName() - ) + new LambdaColumn<>(Model.of("Type"), "project.projectType.name", m -> m.getProject().getProjectTypeName()) ); columns.add( new MultipleUsersColumn<>(Model.of("Authors")) { @@ -54,21 +48,13 @@ public class ProjectMilestoneDetailsPanel extends AbstractMilestoneDetailsPanel } } ); - columns.add( - new EnumLambdaColumn<>(Model.of("Status"), m -> m.getProject().getProjectStatus()) - ); + columns.add(new EnumLambdaColumn<>(Model.of("Status"), m -> m.getProject().getProjectStatus())); columns.add( new UserColumn<>(Model.of("Supervisor"), "project.headSupervisor.fullName", m -> m.getProject().getHeadSupervisor() ) ); - columns.add( - new DateColumn<>( - Model.of("Milestone completed"), - Milestone::getLastModified, - "lastModified" - ) - ); + columns.add(new DateColumn<>(Model.of("Milestone completed"), Milestone::getLastModified, "lastModified")); return columns; } } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java index ee34cea75d..e393dc55e3 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java @@ -34,11 +34,7 @@ public class SupervisorApplicationPeriodStatisticsPanel extends GenericPanel<Use .getProjectTypes() .stream() .map(projectType -> { - final Target target = targetService.findOne( - period, - getModelObject(), - projectType - ); + final Target target = targetService.findOne(period, getModelObject(), projectType); return new PeriodTypeTarget(period, projectType, target); }) ) @@ -53,26 +49,17 @@ public class SupervisorApplicationPeriodStatisticsPanel extends GenericPanel<Use item.add( new Label( "period", - item - .getModel() - .map(PeriodTypeTarget::getApplicationPeriod) - .map(ApplicationPeriod::getName) + item.getModel().map(PeriodTypeTarget::getApplicationPeriod).map(ApplicationPeriod::getName) ) ); item.add( new Label( "projectType", - item - .getModel() - .map(PeriodTypeTarget::getProjectType) - .map(ProjectType::getName) + item.getModel().map(PeriodTypeTarget::getProjectType).map(ProjectType::getName) ) ); item.add( - new Label( - "target", - item.getModel().map(PeriodTypeTarget::getTarget).map(Target::getTarget) - ) + new Label("target", item.getModel().map(PeriodTypeTarget::getTarget).map(Target::getTarget)) ); } } @@ -89,11 +76,7 @@ public class SupervisorApplicationPeriodStatisticsPanel extends GenericPanel<Use private final ProjectType projectType; private final Target target; - public PeriodTypeTarget( - ApplicationPeriod applicationPeriod, - ProjectType projectType, - Target target - ) { + public PeriodTypeTarget(ApplicationPeriod applicationPeriod, ProjectType projectType, Target target) { this.applicationPeriod = applicationPeriod; this.projectType = projectType; this.target = target; @@ -125,11 +108,7 @@ public class SupervisorApplicationPeriodStatisticsPanel extends GenericPanel<Use @Override public int hashCode() { - return Objects.hash( - this.getApplicationPeriod(), - this.getProjectType(), - this.getTarget() - ); + return Objects.hash(this.getApplicationPeriod(), this.getProjectType(), this.getTarget()); } @Override diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java index dd15134cd7..af8e5b4229 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java @@ -39,20 +39,14 @@ public class SupervisorIdeaStatisticsPanel extends Panel { private void addIdeaTable() { List<? extends IColumn<Idea, String>> columns = Arrays.asList( - new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> - idea.getProjectType().getName() - ), + new LambdaColumn<>(Model.of("Type"), "projectType.name", idea -> idea.getProjectType().getName()), new EnumLambdaColumn<>(Model.of("Idea"), "type", Idea::getType), new LambdaColumn<>(Model.of("Title"), "title", Idea::getTitle), new MultipleUsersColumn<>(Model.of("Authors")) { @Override protected IModel<? extends List<User>> getUsers(IModel<Idea> rowModel) { return rowModel.map(idea -> - idea - .getIdeaParticipations() - .stream() - .map(IdeaParticipation::getUser) - .toList() + idea.getIdeaParticipations().stream().map(IdeaParticipation::getUser).toList() ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java index 743fb09e1b..92856f256a 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java @@ -46,19 +46,14 @@ public class SupervisorProjectStatisticsPanel extends Panel { } private void addProjectsTable() { - SortableDataProvider<Project, String> provider = new FilteredDataProvider<>( - projectService, - Model.of(filter) - ); + SortableDataProvider<Project, String> provider = new FilteredDataProvider<>(projectService, Model.of(filter)); provider.setSort("title", SortOrder.DESCENDING); add(new ExportableDataPanel<>(PROJECTS, createColumns(), provider)); } private List<IColumn<Project, String>> createColumns() { List<IColumn<Project, String>> columns = new ArrayList<>(); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName)); columns.add(new LambdaColumn<>(Model.of("Title"), "title", Project::getTitle)); columns.add( new MultipleUsersColumn<>(Model.of("Authors")) { @@ -71,11 +66,7 @@ public class SupervisorProjectStatisticsPanel extends Panel { columns.add( new AbstractColumn<>(Model.of("Role")) { @Override - public void populateItem( - Item<ICellPopulator<Project>> item, - String id, - IModel<Project> model - ) { + public void populateItem(Item<ICellPopulator<Project>> item, String id, IModel<Project> model) { Project p = model.getObject(); item.add(new Label(id, getRoleString(p))); } diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java index a788781069..25c662aaa9 100644 --- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java @@ -43,10 +43,7 @@ public class SupervisorStatisticsPanel extends Panel { private void addEmployeeSelection() { add( - new EmployeeAutoComplete( - SUPERVISOR_SELECTION, - new DetachableServiceModel<>(userService) - ) { + new EmployeeAutoComplete(SUPERVISOR_SELECTION, new DetachableServiceModel<>(userService)) { @Override protected void action(AjaxRequestTarget pTarget, User newSelection) { projectPanel.updateSupervisor(newSelection); diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java index 1581afcdb1..7ce72b9779 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java @@ -39,11 +39,7 @@ public abstract class AbstractSupervisorAllProjectsPage extends AbstractSupervis private void addSubMenu() { add( - new AbstractMenuPanel( - "menuPanel", - AbstractSupervisorAllProjectsPage.class, - this.getClass() - ) { + new AbstractMenuPanel("menuPanel", AbstractSupervisorAllProjectsPage.class, this.getClass()) { @Override protected MenuType getMenuType() { return MenuType.HORIZONTAL; @@ -54,22 +50,14 @@ public abstract class AbstractSupervisorAllProjectsPage extends AbstractSupervis final List<MenuItem> items = new ArrayList<>(); items.add(new MenuItem("Start", SupervisorAllProjectsPage.class)); if (moduleIsEnabled(ProjectModule.FINAL_SEMINAR)) { - items.add( - new MenuItem("Final seminars", SupervisorFinalSeminarListingPage.class) - ); + items.add(new MenuItem("Final seminars", SupervisorFinalSeminarListingPage.class)); } if (moduleIsEnabled(ProjectModule.GRADING)) { - items.add( - new MenuItem("Final theses", SupervisorFinalThesisListingPage.class) - ); + items.add(new MenuItem("Final theses", SupervisorFinalThesisListingPage.class)); } if (moduleIsEnabled(ProjectModule.PEER)) { items.add( - new MenuItem( - "Peers", - SupervisorPeersPage.class, - MenuHighlightSupervisorAllPeers.class - ) + new MenuItem("Peers", SupervisorPeersPage.class, MenuHighlightSupervisorAllPeers.class) ); } if (moduleIsEnabled(ProjectModule.ACTIVITY_PLAN)) { diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java index 7d3d056103..5a5e424670 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java @@ -27,9 +27,7 @@ public abstract class AbstractSupervisorPage extends MenuPage { super(pp); userProfileService.setSelectedRole(SciProSession.get().getUser(), Roles.SUPERVISOR); SciProSession.get() - .setSystemModules( - generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules() - ); + .setSystemModules(generalSystemSettingsService.getGeneralSystemSettingsInstance().getSystemModules()); add(new SupervisorTabMenuPanel("tabMenu", this.getClass())); } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java index 52bda2dd68..6e5c051ff8 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java @@ -22,9 +22,7 @@ import se.su.dsv.scipro.util.PageParameterKeys; public abstract class AbstractSupervisorProjectDetailsPage extends AbstractSupervisorPage { - private static final Logger LOGGER = LoggerFactory.getLogger( - AbstractSupervisorProjectDetailsPage.class - ); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSupervisorProjectDetailsPage.class); public static final String COOKIE_KEY = "supervisorLastVisitedPID"; public static final int MAX_AGE = 2592000; @@ -83,12 +81,7 @@ public abstract class AbstractSupervisorProjectDetailsPage extends AbstractSuper setDefaultModel(projectModel); add( - new SupervisorSubTabMenuPanel( - "supervisorSub", - this.getClass(), - getPageParameters(project), - projectModel - ) { + new SupervisorSubTabMenuPanel("supervisorSub", this.getClass(), getPageParameters(project), projectModel) { @Override protected MenuType getMenuType() { return MenuType.HORIZONTAL; diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java index b8aa70afd6..556377c818 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java @@ -16,9 +16,7 @@ import se.su.dsv.scipro.system.SystemModule; import se.su.dsv.scipro.util.PageParameterKeys; @SystemModuleComponent(SystemModule.GROUP) -public class SupervisorEditGroupPage - extends AbstractSupervisorPage - implements MenuHighlightSupervisorMyGroups { +public class SupervisorEditGroupPage extends AbstractSupervisorPage implements MenuHighlightSupervisorMyGroups { @Inject private GroupService groupService; @@ -32,9 +30,7 @@ public class SupervisorEditGroupPage model.setObject(group); add(new Label("context", Model.of("Create new group"))); } else { - model.setObject( - groupService.findOne(pp.get(PageParameterKeys.MAP.get(Group.class)).toLong()) - ); + model.setObject(groupService.findOne(pp.get(PageParameterKeys.MAP.get(Group.class)).toLong())); add(new Label("context", Model.of("Edit group"))); } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFilePage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFilePage.java index 8f6db8e408..417c08a6a8 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFilePage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFilePage.java @@ -31,15 +31,11 @@ public class SupervisorFilePage if (!projectService.isPartOfProject(project, SciProSession.get().getUser())) { failAndRedirect(); } - add( - new ProjectFilePanel("filePanel", new DetachableServiceModel<>(projectService, project)) - ); + add(new ProjectFilePanel("filePanel", new DetachableServiceModel<>(projectService, project))); } private void failAndRedirect() { LOGGER.warn("User not part of project tried to access the file panel"); - throw new RestartResponseException( - getApplication().getApplicationSettings().getAccessDeniedPage() - ); + throw new RestartResponseException(getApplication().getApplicationSettings().getAccessDeniedPage()); } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java index f87674109e..5e57849514 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java @@ -67,11 +67,7 @@ public class SupervisorFirstMeetingPage extends AbstractSupervisorProjectDetails String room = firstMeeting.getRoom(); source.setMessage(date + "\nRoom: " + room); source.setAdditionalMessage(firstMeeting.getDescription()); - notificationController.notifyProject( - getModelObject(), - ProjectEvent.Event.FIRST_MEETING, - source - ); + notificationController.notifyProject(getModelObject(), ProjectEvent.Event.FIRST_MEETING, source); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java index e118462d06..70da4fce6d 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java @@ -22,17 +22,10 @@ public class SupervisorGroupCreateThreadPage public SupervisorGroupCreateThreadPage(PageParameters pp) { super(pp); add( - new BookmarkablePageLink<Void>( - "back", - SupervisorGroupPage.class, - getPageParameters(groupModel.getObject()) - ) + new BookmarkablePageLink<Void>("back", SupervisorGroupPage.class, getPageParameters(groupModel.getObject())) ); add( - new SubmitForumThreadPanel<>( - "createThread", - new GroupForum(groupForumService, groupModel) - ) { + new SubmitForumThreadPanel<>("createThread", new GroupForum(groupForumService, groupModel)) { @Override public void onThreadCreated(final GroupThread thread) { PageParameters pp = new PageParameters(); diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java index 1c1d582ad4..4307836a19 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java @@ -17,9 +17,7 @@ import se.su.dsv.scipro.forum.panels.threaded.ThreadsOverviewPanel; import se.su.dsv.scipro.group.GroupThreadDiscussable; import se.su.dsv.scipro.util.PageParameterKeys; -public class SupervisorGroupPage - extends AbstractSupervisorGroupPage - implements MenuHighlightSupervisorMyGroups { +public class SupervisorGroupPage extends AbstractSupervisorGroupPage implements MenuHighlightSupervisorMyGroups { @Inject private GroupForumService groupForumService; @@ -27,30 +25,15 @@ public class SupervisorGroupPage public SupervisorGroupPage(final PageParameters pp) { super(pp); add(new FeedbackPanel("feedback")); + add(new BookmarkablePageLink<Void>("createThread", SupervisorGroupCreateThreadPage.class, pp)); add( - new BookmarkablePageLink<Void>( - "createThread", - SupervisorGroupCreateThreadPage.class, - pp - ) - ); - add( - new ThreadsOverviewPanel<>( - "threads", - getThreads(), - new GroupThreadDiscussable(), - (id, thread) -> { - PageParameters parameters = new PageParameters(pp).set( - PageParameterKeys.MAP.get(ForumThread.class), - thread.getObject().getId() - ); - return new BookmarkablePageLink<>( - id, - SupervisorViewGroupThreadPage.class, - parameters - ); - } - ) + new ThreadsOverviewPanel<>("threads", getThreads(), new GroupThreadDiscussable(), (id, thread) -> { + PageParameters parameters = new PageParameters(pp).set( + PageParameterKeys.MAP.get(ForumThread.class), + thread.getObject().getId() + ); + return new BookmarkablePageLink<>(id, SupervisorViewGroupThreadPage.class, parameters); + }) ); } @@ -59,11 +42,7 @@ public class SupervisorGroupPage @Override protected List<GroupThread> load() { List<GroupThread> threads = groupForumService.getThreads(groupModel.getObject()); - threads.sort( - Collections.reverseOrder( - Comparator.comparing(o -> o.getForumThread().getLastModified()) - ) - ); + threads.sort(Collections.reverseOrder(Comparator.comparing(o -> o.getForumThread().getLastModified()))); return threads; } }; diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java index 0b2716fae2..3200ef4db0 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java @@ -44,10 +44,7 @@ public class SupervisorInteractWithReviewerPage protected void onConfigure() { super.onConfigure(); final Project project = projectModel.getObject(); - setVisible( - project.getReviewer() == null && - roughDraftApprovalService.findBy(project).isPresent() - ); + setVisible(project.getReviewer() == null && roughDraftApprovalService.findBy(project).isPresent()); } } ); @@ -65,9 +62,7 @@ public class SupervisorInteractWithReviewerPage } } ); - ForumThread<Project> reviewerThread = new ReviewerInteractionForumThread( - reviewerInteractionService - ); + ForumThread<Project> reviewerThread = new ReviewerInteractionForumThread(reviewerInteractionService); add(new RoughDraftApprovalPanel("roughDraftApproval", projectModel)); add(new SubmitForumReplyPanel<>("communication", projectModel, reviewerThread)); add(new TimelinePanel("timeline", projectModel)); @@ -83,8 +78,6 @@ public class SupervisorInteractWithReviewerPage "$(this).hide(); $('#communication').show();" ) ); - response.render( - OnEventHeaderItem.forMarkupId("pgr_help_toggle", "click", "$('#pgr_help').toggle();") - ); + response.render(OnEventHeaderItem.forMarkupId("pgr_help_toggle", "click", "$('#pgr_help').toggle();")); } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPage.java index eca45cd52a..f72681f868 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPage.java @@ -24,10 +24,7 @@ public class SupervisorMilestoneStatisticsPage extends AbstractSupervisorAllProj } @Override - public Page projectPage( - IModel<MilestoneActivityTemplate> model, - MileStoneService.Filter filter - ) { + public Page projectPage(IModel<MilestoneActivityTemplate> model, MileStoneService.Filter filter) { return new SupervisorProjectMilestoneDetailsPage(model, filter); } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java index 65cea69a05..c1a6563e27 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java @@ -30,9 +30,7 @@ import se.su.dsv.scipro.system.SystemModule; import se.su.dsv.scipro.util.PageParameterKeys; @SystemModuleComponent(SystemModule.GROUP) -public class SupervisorMyGroupsPage - extends AbstractSupervisorPage - implements MenuHighlightSupervisorMyGroups { +public class SupervisorMyGroupsPage extends AbstractSupervisorPage implements MenuHighlightSupervisorMyGroups { @Inject private GroupService groupService; @@ -45,10 +43,7 @@ public class SupervisorMyGroupsPage GroupService.Filter filter = new GroupService.Filter(); filter.setNonAuthorInvolvee(SciProSession.get().getUser()); - SortableDataProvider<Group, String> provider = new FilteredDataProvider<>( - groupService, - Model.of(filter) - ); + SortableDataProvider<Group, String> provider = new FilteredDataProvider<>(groupService, Model.of(filter)); provider.setSort("dateCreated", SortOrder.DESCENDING); add(new DefaultDataPanel<>("myGroups", createColumns(), provider)); @@ -57,14 +52,7 @@ public class SupervisorMyGroupsPage private List<IColumn<Group, String>> createColumns() { List<IColumn<Group, String>> columns = new ArrayList<>(); - columns.add( - new DateColumn<>( - Model.of("Date created"), - Group::getDateCreated, - "dateCreated", - DateStyle.DATE - ) - ); + columns.add(new DateColumn<>(Model.of("Date created"), Group::getDateCreated, "dateCreated", DateStyle.DATE)); columns.add( new AbstractColumn<>(Model.of("Title"), "title") { @@ -83,10 +71,7 @@ public class SupervisorMyGroupsPage @Override public void onClick(AjaxRequestTarget target, IModel<Group> model) { PageParameters pp = new PageParameters(); - pp.add( - PageParameterKeys.MAP.get(Group.class), - model.getObject().getId() - ); + pp.add(PageParameterKeys.MAP.get(Group.class), model.getObject().getId()); setResponsePage(SupervisorGroupPage.class, pp); } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java index 06e523dc7f..9b73219331 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java @@ -60,9 +60,7 @@ public class SupervisorProfilePage extends AbstractSettingsPage { new ListView<>("researchAreas", new ListAdapterModel<>(getActiveResearchAreas())) { @Override protected void populateItem(ListItem<ResearchArea> item) { - item.add( - new Label("areaName", item.getModel().map(ResearchArea::getTitle)) - ); + item.add(new Label("areaName", item.getModel().map(ResearchArea::getTitle))); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.java index 0765e84de0..12949ce3a8 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.java @@ -79,12 +79,6 @@ public class SupervisorProjectDetailsPage @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render( - OnEventHeaderItem.forMarkupId( - "help_groups_toggle", - "click", - "$('#help_groups').toggle()" - ) - ); + response.render(OnEventHeaderItem.forMarkupId("help_groups_toggle", "click", "$('#help_groups').toggle()")); } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java index 4b736018cd..5b77ea926f 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java @@ -25,9 +25,7 @@ public class SupervisorViewGroupThreadPage public SupervisorViewGroupThreadPage(final PageParameters parameters) { super(parameters); - final long threadId = parameters - .get(PageParameterKeys.MAP.get(ForumThread.class)) - .toLong(0L); + final long threadId = parameters.get(PageParameterKeys.MAP.get(ForumThread.class)).toLong(0L); final IModel<GroupThread> groupThreadModel = new LoadableDetachableModel<>() { @Override protected GroupThread load() { @@ -43,21 +41,13 @@ public class SupervisorViewGroupThreadPage add(new FeedbackPanel("feedback")); add( - new ViewForumThreadPanel<>( - "thread", - groupThreadModel, - new GroupForumThread(groupForumService) - ) { + new ViewForumThreadPanel<>("thread", groupThreadModel, new GroupForumThread(groupForumService)) { @Override protected Component newBackLink(final String id) { PageParameters pageParameters = new PageParameters(parameters).remove( PageParameterKeys.MAP.get(ForumThread.class) ); - return new BookmarkablePageLink<Void>( - id, - SupervisorGroupPage.class, - pageParameters - ); + return new BookmarkablePageLink<Void>(id, SupervisorGroupPage.class, pageParameters); } } ); diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java index 24365b428c..00ba26aa74 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java @@ -18,17 +18,12 @@ import se.su.dsv.scipro.reviewing.ReviewerApproval; public class FinalSeminarApprovalProcessPanel extends GenericPanel<ReviewerApproval> { - public FinalSeminarApprovalProcessPanel( - final String id, - final IModel<ReviewerApproval> process - ) { + public FinalSeminarApprovalProcessPanel(final String id, final IModel<ReviewerApproval> process) { super(id, process); add( new ViewAttachmentPanel( "currentThesis", - process - .map(ReviewerApproval::getCurrentThesis) - .map(FileReference::getFileDescription), + process.map(ReviewerApproval::getCurrentThesis).map(FileReference::getFileDescription), DateStyle.DATE ) ); @@ -88,9 +83,7 @@ public class FinalSeminarApprovalProcessPanel extends GenericPanel<ReviewerAppro item.add( new ViewAttachmentPanel( "thesis", - decision - .map(Decision::getThesis) - .map(FileReference::getFileDescription), + decision.map(Decision::getThesis).map(FileReference::getFileDescription), DateStyle.DATE ) ); @@ -109,13 +102,7 @@ public class FinalSeminarApprovalProcessPanel extends GenericPanel<ReviewerAppro } } ); - item.add( - new DateLabel( - "decisionDate", - decision.map(Decision::getDecisionDate), - DateStyle.DATE - ) - ); + item.add(new DateLabel("decisionDate", decision.map(Decision::getDecisionDate), DateStyle.DATE)); item.add( new ViewAttachmentPanel( "attachment", diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/ProjectNoteColumn.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/ProjectNoteColumn.java index 08ca23d9bb..abb9418c73 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/ProjectNoteColumn.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/ProjectNoteColumn.java @@ -48,17 +48,11 @@ public class ProjectNoteColumn extends AbstractExportableColumn<Project, String> @Override public IModel<String> getDataModel(IModel<Project> rowModel) { - return LoadableDetachableModel.of(() -> - projectNoteService.getUserNote(rowModel.getObject(), user.getObject()) - ); + return LoadableDetachableModel.of(() -> projectNoteService.getUserNote(rowModel.getObject(), user.getObject())); } @Override - public void populateItem( - Item<ICellPopulator<Project>> cellItem, - String componentId, - IModel<Project> rowModel - ) { + public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId, IModel<Project> rowModel) { cellItem.add(new ViewAndEditNoteCellPanel(componentId, rowModel)); } @@ -80,8 +74,7 @@ public class ProjectNoteColumn extends AbstractExportableColumn<Project, String> protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - supervisorProjectNoteDisplayModel.getObject() == - SupervisorProjectNoteDisplay.COMPACT + supervisorProjectNoteDisplayModel.getObject() == SupervisorProjectNoteDisplay.COMPACT ); } } @@ -92,8 +85,7 @@ public class ProjectNoteColumn extends AbstractExportableColumn<Project, String> protected void onConfigure() { super.onConfigure(); setVisibilityAllowed( - supervisorProjectNoteDisplayModel.getObject() == - SupervisorProjectNoteDisplay.FULL + supervisorProjectNoteDisplayModel.getObject() == SupervisorProjectNoteDisplay.FULL ); } } @@ -118,11 +110,7 @@ public class ProjectNoteColumn extends AbstractExportableColumn<Project, String> Form<Project> form = new Form<>("form", project) { @Override protected void onSubmit() { - projectNoteService.setUserNote( - project.getObject(), - user.getObject(), - note.getObject() - ); + projectNoteService.setUserNote(project.getObject(), user.getObject(), note.getObject()); success("Note saved at " + LocalTime.now().truncatedTo(ChronoUnit.SECONDS)); } }; diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorApprovalPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorApprovalPanel.java index d22abba8f1..49ef4b564c 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorApprovalPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorApprovalPanel.java @@ -21,8 +21,7 @@ import se.su.dsv.scipro.system.Language; import se.su.dsv.scipro.system.ResearchArea; import se.su.dsv.scipro.system.ResearchAreaService; -public abstract class SupervisorApprovalPanel<T extends ReviewerApproval> - extends GenericPanel<Project> { +public abstract class SupervisorApprovalPanel<T extends ReviewerApproval> extends GenericPanel<Project> { @Inject private ResearchAreaService researchAreaService; diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java index 7ac3dc2c70..6cdb2582c5 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java @@ -69,10 +69,7 @@ public class SupervisorExternalProjectPanel extends GenericPanel<Project> { new AjaxCheckBox(EXTERNAL_CHECKBOX, Model.of(getProject().hasExternalOrganization())) { @Override protected void onUpdate(AjaxRequestTarget target) { - getProject() - .setExternalOrganization( - getModelObject() ? new ExternalOrganization() : null - ); + getProject().setExternalOrganization(getModelObject() ? new ExternalOrganization() : null); projectService.save(getProject()); target.add(form); diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java index 2716cfece7..2b3c9dce94 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java @@ -91,9 +91,7 @@ public class SupervisorMyProjectsPanel extends Panel { columns.add(new ProjectStateColumn(Model.of("State"), "stateOfMind")); columns.add(new ProjectForumStateColumn(Model.of("Forum"))); columns.add(new TemporalColumn<>(Model.of("Started"), "startDate", Project::getStartDate)); - columns.add( - new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName) - ); + columns.add(new LambdaColumn<>(Model.of("Type"), "projectType.name", Project::getProjectTypeName)); columns.add(new ProjectTitleColumn(Model.of("Title"), "title")); columns.add( new MultipleUsersColumn<>(Model.of("Authors")) { @@ -111,11 +109,7 @@ public class SupervisorMyProjectsPanel extends Panel { ) ); columns.add( - new UserColumn<>( - Model.of("Head supervisor"), - "headSupervisor.fullName", - Project::getHeadSupervisor - ) + new UserColumn<>(Model.of("Head supervisor"), "headSupervisor.fullName", Project::getHeadSupervisor) ); return columns; } @@ -172,11 +166,7 @@ public class SupervisorMyProjectsPanel extends Panel { add( new AjaxCheckBoxMultipleChoice<>( ROLE_FILTER, - LambdaModel.of( - filterParams, - ProjectService.Filter::getRoles, - ProjectService.Filter::setRoles - ), + LambdaModel.of(filterParams, ProjectService.Filter::getRoles, ProjectService.Filter::setRoles), List.of(ProjectTeamMemberRoles.CO_SUPERVISOR), new EnumChoiceRenderer<>(this) ) { @@ -223,13 +213,12 @@ public class SupervisorMyProjectsPanel extends Panel { } } ); - BootstrapRadioChoice<SupervisorProjectNoteDisplay> noteDisplay = - new BootstrapRadioChoice<>( - "note_display", - supervisorProjectNoteDisplayModel, - List.of(SupervisorProjectNoteDisplay.values()), - new EnumChoiceRenderer<>(this) - ); + BootstrapRadioChoice<SupervisorProjectNoteDisplay> noteDisplay = new BootstrapRadioChoice<>( + "note_display", + supervisorProjectNoteDisplayModel, + List.of(SupervisorProjectNoteDisplay.values()), + new EnumChoiceRenderer<>(this) + ); noteDisplay.add( new AjaxFormChoiceComponentUpdatingBehavior() { @Override @@ -248,9 +237,7 @@ public class SupervisorMyProjectsPanel extends Panel { userProfile.setDefaultProjectTeamMemberRolesFilter(filter.getRoles()); userProfile.setDefaultSupervisorFilter(filter.isFilterSupervisor()); userProfile.setDefaultProjectTypeFilter(filter.getProjectTypes()); - userProfile.setSupervisorProjectNoteDisplay( - supervisorProjectNoteDisplayModel.getObject() - ); + userProfile.setSupervisorProjectNoteDisplay(supervisorProjectNoteDisplayModel.getObject()); profileService.save(userProfile); } } @@ -262,11 +249,7 @@ public class SupervisorMyProjectsPanel extends Panel { } @Override - public void populateItem( - Item<ICellPopulator<Project>> item, - String id, - IModel<Project> projectModel - ) { + public void populateItem(Item<ICellPopulator<Project>> item, String id, IModel<Project> projectModel) { item.add( new AbstractReadStatePanel(id) { @Override diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java index 2fd95d368e..a59683e880 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java @@ -77,22 +77,9 @@ public class SupervisorSubTabMenuPanel extends AbstractMenuPanel { ); items.add(new MenuItem(FIRST_MEETING, SupervisorFirstMeetingPage.class, projectParams)); items.add(new MenuItem(FILES, SupervisorFilePage.class, projectParams)); - items.add( - new MenuItem( - FORUM, - SupervisorForumBasePage.class, - MenuHighlightForum.class, - projectParams - ) - ); + items.add(new MenuItem(FORUM, SupervisorForumBasePage.class, MenuHighlightForum.class, projectParams)); if (isSupervisor() && isReviewed()) { - items.add( - new MenuItem( - INTERACT_WITH_REVIEWER, - SupervisorInteractWithReviewerPage.class, - projectParams - ) - ); + items.add(new MenuItem(INTERACT_WITH_REVIEWER, SupervisorInteractWithReviewerPage.class, projectParams)); } items.add( new MenuItem( @@ -139,11 +126,7 @@ public class SupervisorSubTabMenuPanel extends AbstractMenuPanel { private boolean mileStonesAreAvailable() { Project project = projectModel.getObject(); return ( - milestoneActivityTemplateService.countActivities( - project.getProjectType(), - project.getStartDate() - ) != - 0 + milestoneActivityTemplateService.countActivities(project.getProjectType(), project.getStartDate()) != 0 ); } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java index f428c77bf0..96d936ab89 100755 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java @@ -29,35 +29,13 @@ public class SupervisorTabMenuPanel extends AbstractMenuPanel { @Override protected List<MenuItem> getItemList() { List<MenuItem> items = new ArrayList<>(); - items.add( - new MenuItem( - "My projects", - SupervisorStartPage.class, - MenuHighlightSupervisorMyProjects.class - ) - ); - items.add( - new MenuItem( - "My groups", - SupervisorMyGroupsPage.class, - MenuHighlightSupervisorMyGroups.class - ) - ); + items.add(new MenuItem("My projects", SupervisorStartPage.class, MenuHighlightSupervisorMyProjects.class)); + items.add(new MenuItem("My groups", SupervisorMyGroupsPage.class, MenuHighlightSupervisorMyGroups.class)); if (matchIsEnabled()) { - items.add( - new MenuItem( - "Ideas", - SupervisorIdeaStartPage.class, - MenuHighlightSupervisorProjectIdea.class - ) - ); + items.add(new MenuItem("Ideas", SupervisorIdeaStartPage.class, MenuHighlightSupervisorProjectIdea.class)); } items.add( - new MenuItem( - "All projects", - SupervisorAllProjectsPage.class, - MenuHighlightSupervisorAllProjects.class - ) + new MenuItem("All projects", SupervisorAllProjectsPage.class, MenuHighlightSupervisorAllProjects.class) ); return items; } diff --git a/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java b/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java index da64242b61..48b8eecec4 100644 --- a/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java @@ -59,22 +59,14 @@ public class ExternalLinkPanel extends GenericPanel<Project> { item.add( new UserLinkPanel( USER, - LambdaModel.of( - item.getModel(), - ExternalLink::getUser, - ExternalLink::setUser - ) + LambdaModel.of(item.getModel(), ExternalLink::getUser, ExternalLink::setUser) ) ); item.add( new org.apache.wicket.markup.html.link.ExternalLink( LINK, LambdaModel.of(item.getModel(), ExternalLink::getUrl, ExternalLink::setUrl), - LambdaModel.of( - item.getModel(), - ExternalLink::getDescription, - ExternalLink::setDescription - ) + LambdaModel.of(item.getModel(), ExternalLink::getDescription, ExternalLink::setDescription) ) ); item.add(new DeleteLink(DELETE, item.getModel())); @@ -86,9 +78,7 @@ public class ExternalLinkPanel extends GenericPanel<Project> { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render( - OnEventHeaderItem.forMarkupId("el_form_toggle", "click", "$('#el_form').slideToggle()") - ); + response.render(OnEventHeaderItem.forMarkupId("el_form_toggle", "click", "$('#el_form').slideToggle()")); } private ExternalLink newLink() { @@ -144,11 +134,7 @@ public class ExternalLinkPanel extends GenericPanel<Project> { TextField<String> description = new RequiredTextField<>( DESCRIPTION, - LambdaModel.of( - externalLinkModel, - ExternalLink::getDescription, - ExternalLink::setDescription - ) + LambdaModel.of(externalLinkModel, ExternalLink::getDescription, ExternalLink::setDescription) ); description.add(StringValidator.lengthBetween(0, ExternalLink.MAX_CHARS)); add(description); diff --git a/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java b/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java index 176fa278cf..12d00f0081 100644 --- a/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java +++ b/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java @@ -27,9 +27,7 @@ public class AdminImportUserPage extends AbstractAdminUsersPage { private UserService userService; private final IModel<String> searchTermModel = Model.of(""); - private final IModel<List<ImportableUser>> importablePeopleModel = Model.ofList( - Collections.emptyList() - ); + private final IModel<List<ImportableUser>> importablePeopleModel = Model.ofList(Collections.emptyList()); public AdminImportUserPage() { add(new FeedbackPanel("feedback")); @@ -57,12 +55,8 @@ public class AdminImportUserPage extends AbstractAdminUsersPage { @Override protected void populateItem(final ListItem<ImportableUser> item) { final IModel<ImportableUser> importableUser = item.getModel(); - item.add( - new Label("firstName", importableUser.map(ImportableUser::getFirstName)) - ); - item.add( - new Label("lastName", importableUser.map(ImportableUser::getLastName)) - ); + item.add(new Label("firstName", importableUser.map(ImportableUser::getFirstName))); + item.add(new Label("lastName", importableUser.map(ImportableUser::getLastName))); item.add(new Label("email", importableUser.map(ImportableUser::getEmail))); item.add( @@ -72,16 +66,10 @@ public class AdminImportUserPage extends AbstractAdminUsersPage { super.onConfigure(); final ImportableUser importableUser1 = getModelObject(); final boolean alreadyImported = - userService.findByExternalIdentifier(importableUser1.getId()) != - null; + userService.findByExternalIdentifier(importableUser1.getId()) != null; if (alreadyImported) { setEnabled(false); - setBody( - new ResourceModel( - "person.already.imported", - "Already imported" - ) - ); + setBody(new ResourceModel("person.already.imported", "Already imported")); } else if (importableUser1.getEmail() == null) { setEnabled(false); setBody( diff --git a/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java b/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java index d709b0c1dc..ecef958adf 100755 --- a/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java +++ b/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java @@ -63,10 +63,7 @@ public class AdminRolePage extends AbstractAdminUsersPage { } private void addNameFilter() { - TextField<String> searchField = new TextField<>( - NAME_FILTER, - LambdaModel.of(filter::getName, filter::setName) - ); + TextField<String> searchField = new TextField<>(NAME_FILTER, LambdaModel.of(filter::getName, filter::setName)); OnChangeAjaxBehavior userSearchTextBehaviour = new OnChangeAjaxBehavior() { @Override @@ -77,9 +74,7 @@ public class AdminRolePage extends AbstractAdminUsersPage { @Override protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); - attributes.setThrottlingSettings( - new ThrottlingSettings(getId(), Duration.ofMillis(DURATION), true) - ); + attributes.setThrottlingSettings(new ThrottlingSettings(getId(), Duration.ofMillis(DURATION), true)); } }; @@ -109,10 +104,7 @@ public class AdminRolePage extends AbstractAdminUsersPage { } private void addDataPanel() { - SortableDataProvider<User, String> provider = new FilteredDataProvider<>( - userService, - Model.of(filter) - ); + SortableDataProvider<User, String> provider = new FilteredDataProvider<>(userService, Model.of(filter)); provider.setSort("lastName", SortOrder.ASCENDING); dataPanel = new ExportableDataPanel<>(USER_DATA_PANEL, createColumns(), provider); add(dataPanel); @@ -132,13 +124,7 @@ public class AdminRolePage extends AbstractAdminUsersPage { if (user.hasRole(Roles.SYSADMIN)) { return Arrays.asList(Roles.values()); } else if (user.hasRole(Roles.ADMIN)) { - return Arrays.asList( - Roles.AUTHOR, - Roles.SUPERVISOR, - Roles.REVIEWER, - Roles.EXAMINER, - Roles.BETA - ); + return Arrays.asList(Roles.AUTHOR, Roles.SUPERVISOR, Roles.REVIEWER, Roles.EXAMINER, Roles.BETA); } else { return Collections.emptyList(); } @@ -166,14 +152,9 @@ public class AdminRolePage extends AbstractAdminUsersPage { @Override public void onClick(AjaxRequestTarget target, IModel<User> clickedModel) { editUserModalWindowPlus.setContent( - new DisplayUserProfilePanel( - editUserModalWindowPlus.getContentId(), - clickedModel - ) - ); - editUserModalWindowPlus.setTitle( - clickedModel.getObject().getFullName() + new DisplayUserProfilePanel(editUserModalWindowPlus.getContentId(), clickedModel) ); + editUserModalWindowPlus.setTitle(clickedModel.getObject().getFullName()); editUserModalWindowPlus.show(target); } } @@ -198,12 +179,7 @@ public class AdminRolePage extends AbstractAdminUsersPage { protected void onUpdate(AjaxRequestTarget target) { User user = rowModel.getObject(); if (getModelObject()) { - LOGGER.info( - "{} gave {} the role {}", - SciProSession.get().getUser(), - user, - role - ); + LOGGER.info("{} gave {} the role {}", SciProSession.get().getUser(), user, role); user.addRole(role); } else { LOGGER.info( @@ -218,9 +194,7 @@ public class AdminRolePage extends AbstractAdminUsersPage { } @Override - protected void updateAjaxAttributes( - final AjaxRequestAttributes attributes - ) { + protected void updateAjaxAttributes(final AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); String message = getModelObject() ? "Are you sure you want to remove " + @@ -236,9 +210,7 @@ public class AdminRolePage extends AbstractAdminUsersPage { String escapedMessage = message.replaceAll("'", "\\\\'"); AjaxCallListener ajaxCallListener = new AjaxCallListener(); ajaxCallListener.onPrecondition( - "if (!confirm('" + - escapedMessage + - "')) {window.location.reload(); return false;}" + "if (!confirm('" + escapedMessage + "')) {window.location.reload(); return false;}" ); attributes.getAjaxCallListeners().add(ajaxCallListener); } diff --git a/view/src/main/java/se/su/dsv/scipro/util/Ajax.java b/view/src/main/java/se/su/dsv/scipro/util/Ajax.java index 6286e16755..797e8f1583 100644 --- a/view/src/main/java/se/su/dsv/scipro/util/Ajax.java +++ b/view/src/main/java/se/su/dsv/scipro/util/Ajax.java @@ -14,9 +14,7 @@ public class Ajax { // only do it if it wasn't already visible, so it doesn't flicker when trying to show something already shown if (!component.isVisible()) { // make it slide down nicely when shown - target.appendJavaScript( - "$('#%s').hide().slideDown()".formatted(component.getMarkupId()) - ); + target.appendJavaScript("$('#%s').hide().slideDown()".formatted(component.getMarkupId())); } component.setVisible(true); target.add(component); diff --git a/view/src/main/java/se/su/dsv/scipro/util/AjaxConfirmationLink.java b/view/src/main/java/se/su/dsv/scipro/util/AjaxConfirmationLink.java index 7c006d4834..4c8eff0c01 100755 --- a/view/src/main/java/se/su/dsv/scipro/util/AjaxConfirmationLink.java +++ b/view/src/main/java/se/su/dsv/scipro/util/AjaxConfirmationLink.java @@ -28,9 +28,7 @@ public abstract class AjaxConfirmationLink<T> extends AjaxLink<T> { protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { super.updateAjaxAttributes(attributes); AjaxCallListener ajaxCallListener = new AjaxCallListener(); - ajaxCallListener.onPrecondition( - "return confirm('" + confirmationMessage.getObject() + "');" - ); + ajaxCallListener.onPrecondition("return confirm('" + confirmationMessage.getObject() + "');"); attributes.getAjaxCallListeners().add(ajaxCallListener); } } diff --git a/view/src/test/java/se/su/dsv/scipro/SciProSessionTest.java b/view/src/test/java/se/su/dsv/scipro/SciProSessionTest.java index 8c4261e972..ef5e074443 100755 --- a/view/src/test/java/se/su/dsv/scipro/SciProSessionTest.java +++ b/view/src/test/java/se/su/dsv/scipro/SciProSessionTest.java @@ -20,13 +20,7 @@ public class SciProSessionTest extends SciProSession { public SciProSessionTest(Request request) { super(request); - setUser( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + setUser(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/SciProTest.java b/view/src/test/java/se/su/dsv/scipro/SciProTest.java index d4df57c877..ceec7ebadb 100755 --- a/view/src/test/java/se/su/dsv/scipro/SciProTest.java +++ b/view/src/test/java/se/su/dsv/scipro/SciProTest.java @@ -481,9 +481,7 @@ public abstract class SciProTest { setModules(ProjectModule.values()); setSystemModules(SystemModule.values()); - lenient() - .when(daisyAPI.getPhoto(anyInt(), anyInt(), anyBoolean())) - .thenReturn(new PhotoResult.Missing()); + lenient().when(daisyAPI.getPhoto(anyInt(), anyInt(), anyBoolean())).thenReturn(new PhotoResult.Missing()); lenient().when(oAuthService.authorizeUrl(anyString(), anySet())).thenReturn(""); lenient() .when(gradingReportService.getSupervisorGradingReport(any(), any())) @@ -516,9 +514,7 @@ public abstract class SciProTest { @BeforeEach public void createUserProfile() { - lenient() - .when(userProfileService.findByUser(any(User.class))) - .thenReturn(new UserProfile()); + lenient().when(userProfileService.findByUser(any(User.class))).thenReturn(new UserProfile()); } public Class<? extends Page> getHomePage() { diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanPanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanPanelTest.java index b408cb0154..441859f4c4 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanPanelTest.java @@ -101,11 +101,7 @@ public class ActivityPlanPanelTest extends SciProTest { startPanel(); PageParameters pageParameters = new PageParameters(); pageParameters.set(PageParameterKeys.MAP.get(Checklist.class), checklist.getId()); - tester.assertBookmarkablePageLink( - checklistLink(), - ProjectViewChecklistPage.class, - pageParameters - ); + tester.assertBookmarkablePageLink(checklistLink(), ProjectViewChecklistPage.class, pageParameters); } private String checklistLink() { @@ -122,10 +118,7 @@ public class ActivityPlanPanelTest extends SciProTest { private void mockExistingEvents(Activity... events) { Mockito.when( - activityPlanFacade.findEventsByProject( - ArgumentMatchers.eq(project), - ArgumentMatchers.any(Pageable.class) - ) + activityPlanFacade.findEventsByProject(ArgumentMatchers.eq(project), ArgumentMatchers.any(Pageable.class)) ).thenReturn(Arrays.asList(events)); Mockito.when( activityPlanFacade.countEventsByProject( diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanelTest.java index 00878c3161..e0f2843553 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanelTest.java @@ -19,10 +19,7 @@ public class ActivityPlanTemplateDataPanelTest extends SciProTest { public void onNewClick() {} @Override - public void onTitleClick( - IModel<ActivityPlanTemplate> clicked, - AjaxRequestTarget target - ) {} + public void onTitleClick(IModel<ActivityPlanTemplate> clicked, AjaxRequestTarget target) {} @Override public void onEditClick(IModel<ActivityPlanTemplate> clicked) {} diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanelTest.java index db8423b12c..66d8bf074b 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanelTest.java @@ -34,9 +34,7 @@ public class AddActivitiesFromTemplatePanelTest extends SciProTest { templates = Arrays.asList(template1, template2); project = new Project(); - when( - activityPlanTemplateService.findAll(isA(ActivityPlanTemplateService.Filter.class)) - ).thenReturn(templates); + when(activityPlanTemplateService.findAll(isA(ActivityPlanTemplateService.Filter.class))).thenReturn(templates); tester.startComponentInPage(new AddActivitiesFromTemplatePanel("id", Model.of(project))); } @@ -51,22 +49,11 @@ public class AddActivitiesFromTemplatePanelTest extends SciProTest { @Test public void add_activities_from_template() { tester.clickLink( - path( - "id", - "content", - "stupidContainerSinceWicketCantRefreshListViews", - "templates", - 0, - "title" - ), + path("id", "content", "stupidContainerSinceWicketCantRefreshListViews", "templates", 0, "title"), true ); FormTester formTester = tester.newFormTester(path("id", "content", "form")); formTester.submit(); - verify(activityPlanFacade).addActivitiesFromTemplate( - eq(project), - eq(templates.get(0)), - any(Date.class) - ); + verify(activityPlanFacade).addActivitiesFromTemplate(eq(project), eq(templates.get(0)), any(Date.class)); } } diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanelTest.java index d148466401..a61258a92d 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanelTest.java @@ -22,9 +22,7 @@ public class AdminEditActivityPanelTest extends SciProTest { ChecklistTemplate checklistTemplate = new ChecklistTemplate(); checklistTemplate.setId(1L); checklistTemplate.setName("template"); - Mockito.when(checklistTemplateService.findAll()).thenReturn( - Collections.singletonList(checklistTemplate) - ); + Mockito.when(checklistTemplateService.findAll()).thenReturn(Collections.singletonList(checklistTemplate)); startPanel(); } @@ -58,10 +56,7 @@ public class AdminEditActivityPanelTest extends SciProTest { panel = tester.startComponentInPage( new AdminEditActivityPanel("panel", new Model<>(new ActivityTemplate())) { @Override - protected void onSubmit( - final AjaxRequestTarget target, - final IModel<ActivityTemplate> activity - ) {} + protected void onSubmit(final AjaxRequestTarget target, final IModel<ActivityTemplate> activity) {} } ); } diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePageTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePageTest.java index 6124686501..c50ffe37d0 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePageTest.java @@ -14,18 +14,13 @@ public class AdminEditActivityTemplatePageTest extends SciProTest { ActivityPlanTemplate activityPlanTemplate = new ActivityPlanTemplate(); activityPlanTemplate.setId(1L); activityPlanTemplate.setCreator( - new UserBuilder() - .setId(1L) - .setEmail("e@mail.com") - .setFirstName("Nisse") - .setLastName("Karlsson") - .create() + new UserBuilder().setId(1L).setEmail("e@mail.com").setFirstName("Nisse").setLastName("Karlsson").create() ); activityPlanTemplate.setSysAdminTemplate(true); activityPlanTemplate.setDescription("naizz"); - Mockito.when( - activityPlanTemplateService.findOne(ArgumentMatchers.isA(Long.class)) - ).thenReturn(activityPlanTemplate); + Mockito.when(activityPlanTemplateService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn( + activityPlanTemplate + ); } @Test @@ -43,10 +38,7 @@ public class AdminEditActivityTemplatePageTest extends SciProTest { @Test public void contents() { startPageWithPageParameters(); - tester.assertComponent( - path(AdminEditActivityTemplatePage.PANEL), - EditActivityTemplatePanel.class - ); + tester.assertComponent(path(AdminEditActivityTemplatePage.PANEL), EditActivityTemplatePanel.class); } private void startPageWithPageParameters() { diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityPanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityPanelTest.java index 2e740badaa..73fe8330c1 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityPanelTest.java @@ -38,10 +38,7 @@ public class EditActivityPanelTest extends SciProTest { user.setRoles(new HashSet<>(Collections.singletonList(Roles.AUTHOR))); setLoggedInAs(user); - final User supervisor = new UserBuilder() - .setFirstName("Super") - .setLastName("Supersson") - .create(); + final User supervisor = new UserBuilder().setFirstName("Super").setLastName("Supersson").create(); project = Project.builder() .title("some title") @@ -61,12 +58,8 @@ public class EditActivityPanelTest extends SciProTest { checklistTemplate.setCategories(new ArrayList<ChecklistCategory>()); checklistTemplate.setCreator(user); checklistTemplate.setDescription("nice description"); - checklistTemplate.setProjectTypes( - new ArrayList<>(Collections.singletonList(project.getProjectType())) - ); - checklistTemplate.setQuestions( - new ArrayList<>(Arrays.asList("who is your daddy", "and what does he do")) - ); + checklistTemplate.setProjectTypes(new ArrayList<>(Collections.singletonList(project.getProjectType()))); + checklistTemplate.setQuestions(new ArrayList<>(Arrays.asList("who is your daddy", "and what does he do"))); checklistTemplate.setTemplateNumber(0); Mockito.when(checklistTemplateService.findByProject(isA(Project.class))).thenReturn( @@ -80,18 +73,12 @@ public class EditActivityPanelTest extends SciProTest { public void requires() { FormTester formTester = tester.newFormTester(path("panel", "form")); formTester.submit(); - tester.assertErrorMessages( - "'title' is required.", - "'date' is required.", - "'time' is required." - ); + tester.assertErrorMessages("'title' is required.", "'date' is required.", "'time' is required."); } @Test public void saves() { - Mockito.when(activityPlanFacade.saveActivity(isA(Activity.class))).thenReturn( - new Activity() - ); + Mockito.when(activityPlanFacade.saveActivity(isA(Activity.class))).thenReturn(new Activity()); FormTester formTester = tester.newFormTester(path("panel", "form")); formTester.setValue("title", "nice title"); @@ -114,8 +101,6 @@ public class EditActivityPanelTest extends SciProTest { } private void startPanel() { - tester.startComponentInPage( - new EditActivityPanel("panel", Model.of(project), Model.of(new Activity())) - ); + tester.startComponentInPage(new EditActivityPanel("panel", Model.of(project), Model.of(new Activity()))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanelTest.java index a7eadf9396..ab225ba3ca 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanelTest.java @@ -33,12 +33,7 @@ public class EditActivityTemplatePanelTest extends SciProTest { activityPlanTemplate = new ActivityPlanTemplate(); activityPlanTemplate.setId(1L); activityPlanTemplate.setCreator( - new UserBuilder() - .setId(1L) - .setEmail("e@mail.com") - .setFirstName("Nisse") - .setLastName("Karlsson") - .create() + new UserBuilder().setId(1L).setEmail("e@mail.com").setFirstName("Nisse").setLastName("Karlsson").create() ); activityPlanTemplate.setSysAdminTemplate(true); activityPlanTemplate.setDescription("naizz"); @@ -72,85 +67,43 @@ public class EditActivityTemplatePanelTest extends SciProTest { tester.assertComponent(path(panel.getId(), FORM, ADD_LINK), AjaxLink.class); tester.assertComponent(path(panel.getId(), FORM), WebMarkupContainer.class); tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), ListView.class); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, ACTIVITY_LINK), - AjaxLink.class - ); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, ACTIVITY_LINK), AjaxLink.class); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, UP), - AjaxLink.class - ); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, DOWN), - AjaxLink.class - ); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, REMOVE), - AjaxLink.class - ); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, UP), AjaxLink.class); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, DOWN), AjaxLink.class); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, REMOVE), AjaxLink.class); tester.assertInvisible(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 0, UP)); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 0, DOWN), - AjaxLink.class - ); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 0, REMOVE), - AjaxLink.class - ); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 0, DOWN), AjaxLink.class); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 0, REMOVE), AjaxLink.class); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 2, UP), - AjaxLink.class - ); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 2, UP), AjaxLink.class); tester.assertInvisible(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 2, DOWN)); - tester.assertComponent( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 2, REMOVE), - AjaxLink.class - ); + tester.assertComponent(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 2, REMOVE), AjaxLink.class); } @Test public void up() { startPanel(); - tester.assertModelValue( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), - Arrays.asList(pet1, pet2, pet3) - ); + tester.assertModelValue(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), Arrays.asList(pet1, pet2, pet3)); tester.clickLink(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, UP)); - tester.assertModelValue( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), - Arrays.asList(pet2, pet1, pet3) - ); + tester.assertModelValue(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), Arrays.asList(pet2, pet1, pet3)); } @Test public void down() { startPanel(); - tester.assertModelValue( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), - Arrays.asList(pet1, pet2, pet3) - ); + tester.assertModelValue(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), Arrays.asList(pet1, pet2, pet3)); tester.clickLink(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, DOWN)); - tester.assertModelValue( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), - Arrays.asList(pet1, pet3, pet2) - ); + tester.assertModelValue(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), Arrays.asList(pet1, pet3, pet2)); } @Test public void remove() { startPanel(); - tester.assertModelValue( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), - Arrays.asList(pet1, pet2, pet3) - ); + tester.assertModelValue(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), Arrays.asList(pet1, pet2, pet3)); tester.clickLink(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST, 1, REMOVE)); - tester.assertModelValue( - path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), - Arrays.asList(pet1, pet3) - ); + tester.assertModelValue(path(panel.getId(), FORM, CONTAINER, ACTIVITY_LIST), Arrays.asList(pet1, pet3)); } @Test @@ -163,9 +116,9 @@ public class EditActivityTemplatePanelTest extends SciProTest { @Test public void saves() { - Mockito.when( - activityPlanTemplateService.save(ArgumentMatchers.isA(ActivityPlanTemplate.class)) - ).thenReturn(activityPlanTemplate); + Mockito.when(activityPlanTemplateService.save(ArgumentMatchers.isA(ActivityPlanTemplate.class))).thenReturn( + activityPlanTemplate + ); startPanel(); FormTester formTester = tester.newFormTester(path(panel.getId(), FORM)); formTester.setValue(TITLE_FIELD, "a nice title"); @@ -175,8 +128,6 @@ public class EditActivityTemplatePanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new EditActivityTemplatePanel("panel", Model.of(activityPlanTemplate)) - ); + panel = tester.startComponentInPage(new EditActivityTemplatePanel("panel", Model.of(activityPlanTemplate))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanelTest.java index 6eee5601e1..5c20a1539c 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanelTest.java @@ -18,16 +18,10 @@ public class SaveAsTemplatePanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { activityPlan = new ActivityPlan(); - user = User.builder() - .firstName("Kalle") - .lastName("Tester") - .emailAddress("kalle@example.com") - .build(); + user = User.builder().firstName("Kalle").lastName("Tester").emailAddress("kalle@example.com").build(); setLoggedInAs(user); - panel = tester.startComponentInPage( - new SaveAsTemplatePanel("panel", Model.of(activityPlan)) - ); + panel = tester.startComponentInPage(new SaveAsTemplatePanel("panel", Model.of(activityPlan))); } @Test @@ -40,12 +34,7 @@ public class SaveAsTemplatePanelTest extends SciProTest { formTester.setValue("description", description); tester.clickLink(path(panel, "form", "save")); - verify(activityPlanFacade).createTemplateFromSchedule( - activityPlan, - user, - name, - description - ); + verify(activityPlanFacade).createTemplateFromSchedule(activityPlan, user, name, description); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePageTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePageTest.java index d23ce3c034..22955c23c1 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePageTest.java @@ -14,18 +14,13 @@ public class SupervisorEditActivityTemplatePageTest extends SciProTest { ActivityPlanTemplate activityPlanTemplate = new ActivityPlanTemplate(); activityPlanTemplate.setId(1L); activityPlanTemplate.setCreator( - new UserBuilder() - .setId(1L) - .setEmail("e@mail.com") - .setFirstName("Nisse") - .setLastName("Karlsson") - .create() + new UserBuilder().setId(1L).setEmail("e@mail.com").setFirstName("Nisse").setLastName("Karlsson").create() ); activityPlanTemplate.setSysAdminTemplate(false); activityPlanTemplate.setDescription("naizz"); - Mockito.when( - activityPlanTemplateService.findOne(ArgumentMatchers.isA(Long.class)) - ).thenReturn(activityPlanTemplate); + Mockito.when(activityPlanTemplateService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn( + activityPlanTemplate + ); } @Test @@ -43,10 +38,7 @@ public class SupervisorEditActivityTemplatePageTest extends SciProTest { @Test public void contents() { startPageWithPageParameters(); - tester.assertComponent( - path(SupervisorEditActivityTemplatePage.PANEL), - EditActivityTemplatePanel.class - ); + tester.assertComponent(path(SupervisorEditActivityTemplatePage.PANEL), EditActivityTemplatePanel.class); } private void startPageWithPageParameters() { diff --git a/view/src/test/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanelTest.java b/view/src/test/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanelTest.java index 57d9baec52..d04957f30d 100644 --- a/view/src/test/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanelTest.java @@ -35,10 +35,7 @@ public class UpcomingActivitiesPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - User user = new UserBuilder() - .setFirstName("Some first name") - .setLastName("Some last name") - .create(); + User user = new UserBuilder().setFirstName("Some first name").setLastName("Some last name").create(); user.setId(1L); project = Project.builder() @@ -83,9 +80,7 @@ public class UpcomingActivitiesPanelTest extends SciProTest { new IVisitor<Component, Object>() { @Override public void component(Component component, IVisit<Object> visit) { - boolean isVisible = component - .get(path(UpcomingActivitiesPanel.DATE)) - .isVisibleInHierarchy(); + boolean isVisible = component.get(path(UpcomingActivitiesPanel.DATE)).isVisibleInHierarchy(); Assertions.assertTrue(isVisible); visit.stop(); } @@ -120,12 +115,7 @@ public class UpcomingActivitiesPanelTest extends SciProTest { @Override public void component(Component component, IVisit<Object> visit) { boolean isVisible = component - .get( - path( - UpcomingActivitiesPanel.EMPLOYEE_LINK, - UpcomingActivitiesPanel.EMPLOYEE_LABEL - ) - ) + .get(path(UpcomingActivitiesPanel.EMPLOYEE_LINK, UpcomingActivitiesPanel.EMPLOYEE_LABEL)) .isVisibleInHierarchy(); Assertions.assertTrue(isVisible); visit.stop(); @@ -142,9 +132,7 @@ public class UpcomingActivitiesPanelTest extends SciProTest { new IVisitor<Component, Object>() { @Override public void component(Component component, IVisit<Object> visit) { - boolean isVisible = component - .get(path(UpcomingActivitiesPanel.AUTHOR_LINK)) - .isVisibleInHierarchy(); + boolean isVisible = component.get(path(UpcomingActivitiesPanel.AUTHOR_LINK)).isVisibleInHierarchy(); Assertions.assertTrue(isVisible); visit.stop(); } @@ -161,12 +149,7 @@ public class UpcomingActivitiesPanelTest extends SciProTest { @Override public void component(Component component, IVisit<Object> visit) { boolean isVisible = component - .get( - path( - UpcomingActivitiesPanel.AUTHOR_LINK, - UpcomingActivitiesPanel.AUTHOR_LABEL - ) - ) + .get(path(UpcomingActivitiesPanel.AUTHOR_LINK, UpcomingActivitiesPanel.AUTHOR_LABEL)) .isVisibleInHierarchy(); Assertions.assertTrue(isVisible); visit.stop(); diff --git a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPageTest.java b/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPageTest.java index d151fc3268..b906d0c324 100644 --- a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPageTest.java @@ -53,11 +53,7 @@ public class AdminCreateProjectPageTest extends PageTest { } private User mockUser(String Stina, String Student, String emailAddress, long id) { - User user = User.builder() - .firstName(Stina) - .lastName(Student) - .emailAddress(emailAddress) - .build(); + User user = User.builder().firstName(Stina).lastName(Student).emailAddress(emailAddress).build(); user.setId(id); lenient().when(userSearchService.findOne(user.getId())).thenReturn(user); // UserRepo is used by the autocomplete component return user; @@ -175,19 +171,13 @@ public class AdminCreateProjectPageTest extends PageTest { final ArgumentCaptor<Project> captor = ArgumentCaptor.forClass(Project.class); verify(projectService).save(captor.capture()); - verify(notificationController).notifyProject( - eq(captor.getValue()), - eq(ProjectEvent.Event.CREATED), - any() - ); + verify(notificationController).notifyProject(eq(captor.getValue()), eq(ProjectEvent.Event.CREATED), any()); } @Test public void shows_confirmation_page_if_any_author_already_has_an_active_project() { Project otherActiveProject = new Project(); - when(projectService.findByUserAndStatus(author, ProjectStatus.ACTIVE)).thenReturn( - List.of(otherActiveProject) - ); + when(projectService.findByUserAndStatus(author, ProjectStatus.ACTIVE)).thenReturn(List.of(otherActiveProject)); startPage(); diff --git a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java b/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java index 4a25583b8c..fca1614838 100644 --- a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPageTest.java @@ -59,29 +59,14 @@ public class AdminEditProjectPageTest extends SciProTest { supervisor.addRole(Roles.SUPERVISOR); supervisor.addRole(Roles.REVIEWER); - existingCoSupervisor = createUser( - "pelle", - "svensson", - "pelle@example.com", - EXISTING_CO_SUPERVISOR_ID - ); + existingCoSupervisor = createUser("pelle", "svensson", "pelle@example.com", EXISTING_CO_SUPERVISOR_ID); existingCoSupervisor.addRole(Roles.SUPERVISOR); - existingReviewer = createUser( - "stina", - "svensson", - "stina@example.com", - EXISTING_REVIEWER_ID - ); + existingReviewer = createUser("stina", "svensson", "stina@example.com", EXISTING_REVIEWER_ID); existingReviewer.addRole(Roles.REVIEWER); existingReviewer.addRole(Roles.SUPERVISOR); - existingParticipant = createUser( - "kalle", - "svensson", - "kalle@example.com", - EXISTING_PARTICIPANT_ID - ); + existingParticipant = createUser("kalle", "svensson", "kalle@example.com", EXISTING_PARTICIPANT_ID); existingParticipant.addRole(Roles.AUTHOR); project = new Project(); @@ -92,12 +77,7 @@ public class AdminEditProjectPageTest extends SciProTest { } private void mockAnotherAuthor() { - User anotherAuthor = createUser( - "another", - "author", - "another@example.com", - ANOTHER_AUTHOR_ID - ); + User anotherAuthor = createUser("another", "author", "another@example.com", ANOTHER_AUTHOR_ID); anotherAuthor.addRole(Roles.AUTHOR); } @@ -121,9 +101,7 @@ public class AdminEditProjectPageTest extends SciProTest { @Test public void head_supervisor_required() { submitForm("title", null, AUTHOR_ID, null, null); - tester.assertErrorMessages( - tester.getLastRenderedPage().getString("headSupervisorSelect.Required") - ); + tester.assertErrorMessages(tester.getLastRenderedPage().getString("headSupervisorSelect.Required")); } @Test @@ -131,13 +109,7 @@ public class AdminEditProjectPageTest extends SciProTest { final Project project1 = mockExistingProject(); project1.setProjectParticipants(List.of()); startPage(project1); - submitForm( - "title", - SUPERVISOR_ID, - null, - existingReviewer.getId(), - existingCoSupervisor.getId() - ); + submitForm("title", SUPERVISOR_ID, null, existingReviewer.getId(), existingCoSupervisor.getId()); tester.isRequired(path(FORM, AUTHORS)); } @@ -260,13 +232,7 @@ public class AdminEditProjectPageTest extends SciProTest { return project; } - private void submitForm( - String title, - Long supervisorId, - Long authorId, - Long reviewerId, - Long coSupervisorId - ) { + private void submitForm(String title, Long supervisorId, Long authorId, Long reviewerId, Long coSupervisorId) { FormTester formTester = tester.newFormTester(path(FORM)); if (authorId != null) { addAuthor(formTester, authorId); @@ -294,11 +260,7 @@ public class AdminEditProjectPageTest extends SciProTest { } private User createUser(String firstName, String lastName, String emailAddress, long id) { - User user = User.builder() - .firstName(firstName) - .lastName(lastName) - .emailAddress(emailAddress) - .build(); + User user = User.builder().firstName(firstName).lastName(lastName).emailAddress(emailAddress).build(); user.setId(id); lenient().when(userSearchService.findOne(id)).thenReturn(user); lenient().when(userService.findOne(id)).thenReturn(user); @@ -306,9 +268,7 @@ public class AdminEditProjectPageTest extends SciProTest { } private void startPage(Project project) { - if (project.getId() != null) when(projectService.findOne(project.getId())).thenReturn( - project - ); + if (project.getId() != null) when(projectService.findOne(project.getId())).thenReturn(project); PageParameters pp = new PageParameters(); pp.set(PageParameterKeys.MAP.get(Project.class), project.getId()); tester.startPage(AdminEditProjectPage.class, pp); diff --git a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminMailLogPageTest.java b/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminMailLogPageTest.java index 8b51156117..9619434cf4 100644 --- a/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminMailLogPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/admin/pages/AdminMailLogPageTest.java @@ -25,9 +25,7 @@ public class AdminMailLogPageTest extends PageTest { @Test public void has_data_table_of_mail_events() { tester.assertComponent(MAIL_EVENTS, DataTable.class); - DataTable<?, ?> table = (DataTable<?, ?>) tester.getComponentFromLastRenderedPage( - "mailEvents" - ); + DataTable<?, ?> table = (DataTable<?, ?>) tester.getComponentFromLastRenderedPage("mailEvents"); assertTrue(table.getDataProvider() instanceof FilteredDataProvider); } diff --git a/view/src/test/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPageTest.java b/view/src/test/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPageTest.java index c1c154777d..7cf7275643 100644 --- a/view/src/test/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPageTest.java @@ -45,10 +45,7 @@ public class AdminProjectModuleSettingsPageTest extends SciProTest { @Test public void module_lists_all_project_types() { - tester.assertModelValue( - path(FORM, MODULE_LIST, 0, PROJECT_TYPE_LIST), - projectTypeService.findAllActive() - ); + tester.assertModelValue(path(FORM, MODULE_LIST, 0, PROJECT_TYPE_LIST), projectTypeService.findAllActive()); } @Test @@ -78,17 +75,11 @@ public class AdminProjectModuleSettingsPageTest extends SciProTest { public void submit_form_saves_modules_to_project_type() { FormTester formTester = tester.newFormTester(FORM); int selectedModule = 0; - formTester.setValue( - path(MODULE_LIST, 0, PROJECT_TYPE_LIST, selectedModule, CHECKBOX), - true - ); + formTester.setValue(path(MODULE_LIST, 0, PROJECT_TYPE_LIST, selectedModule, CHECKBOX), true); formTester.submit(); ArgumentCaptor<ProjectType> captor = ArgumentCaptor.forClass(ProjectType.class); verify(projectTypeService).save(captor.capture()); - assertThat( - captor.getValue().getProjectModules(), - hasItem(ProjectModule.values()[selectedModule]) - ); + assertThat(captor.getValue().getProjectModules(), hasItem(ProjectModule.values()[selectedModule])); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanelTest.java b/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanelTest.java index 611e3d78ec..4936eccb71 100644 --- a/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanelTest.java @@ -22,12 +22,8 @@ public class AdminEditFooterColumnPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { footerLink = newFooterLink(); - when(footerLinkService.getLinks(FooterColumn.FIRST)).thenReturn( - Collections.singletonList(footerLink) - ); - panel = tester.startComponentInPage( - new AdminEditFooterColumnPanel("id", FooterColumn.FIRST) - ); + when(footerLinkService.getLinks(FooterColumn.FIRST)).thenReturn(Collections.singletonList(footerLink)); + panel = tester.startComponentInPage(new AdminEditFooterColumnPanel("id", FooterColumn.FIRST)); } @Test @@ -58,10 +54,7 @@ public class AdminEditFooterColumnPanelTest extends SciProTest { @Test public void lists_all_current_links() { - tester.assertModelValue( - path(panel, "current"), - footerLinkService.getLinks(FooterColumn.FIRST) - ); + tester.assertModelValue(path(panel, "current"), footerLinkService.getLinks(FooterColumn.FIRST)); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminViewMailPanelTest.java b/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminViewMailPanelTest.java index 89feaa8b01..9d0c9cb002 100644 --- a/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminViewMailPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/admin/panels/AdminViewMailPanelTest.java @@ -13,10 +13,7 @@ public class AdminViewMailPanelTest extends SciProTest { private void startPanel() { panel = tester.startComponentInPage( - new AdminViewMailPanel( - "any", - new Model<>(new MailEvent("subject", "body", ObjectMother.SOME_USER, "", "")) - ) + new AdminViewMailPanel("any", new Model<>(new MailEvent("subject", "body", ObjectMother.SOME_USER, "", ""))) ); } diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanelTest.java index 4a100f0c00..44eaef7552 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanelTest.java @@ -19,9 +19,7 @@ public class AdminApplicationPeriodsPanelTest extends SciProTest { applicationPeriod.setStartDate(LocalDate.MIN); applicationPeriod.setEndDate(LocalDate.MIN.plusDays(1)); applicationPeriod.setCourseStartDate(LocalDate.MIN.plusDays(2)); - List<ApplicationPeriod> applicationPeriods = new ArrayList<>( - Collections.singletonList(applicationPeriod) - ); + List<ApplicationPeriod> applicationPeriods = new ArrayList<>(Collections.singletonList(applicationPeriod)); when(applicationPeriodService.count()).thenReturn((long) applicationPeriods.size()); when(applicationPeriodService.findAll(any(Pageable.class))).thenReturn(applicationPeriods); } diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPageTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPageTest.java index 3c2b47a5c5..b70d13b7e3 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPageTest.java @@ -54,19 +54,12 @@ public class AdminEditApplicationPeriodExemptionsPageTest extends SciProTest { startPage(); FormTester formTester = tester.newFormTester(ADD_FORM); formTester.submit(); - tester.assertErrorMessages( - "Field 'Exemption for' is required", - "Field 'Type to exempt' is required" - ); + tester.assertErrorMessages("Field 'Exemption for' is required", "Field 'Type to exempt' is required"); } @Test public void saves() { - User user2 = new UserBuilder() - .setFirstName("Steve") - .setLastName("Jobs") - .setEmail("jobs@example.com") - .create(); + User user2 = new UserBuilder().setFirstName("Steve").setLastName("Jobs").setEmail("jobs@example.com").create(); user2.setId(1L); when(userSearchService.findOne(anyLong())).thenReturn(user2); @@ -75,9 +68,7 @@ public class AdminEditApplicationPeriodExemptionsPageTest extends SciProTest { formTester.setValue("author", String.valueOf(1L)); formTester.setValue("type", ApplicationPeriodExemption.Type.PROJECT_TYPE.name()); - String dateString = new SimpleDateFormat(dateService.getFormat(DateStyle.DATE)).format( - new Date() - ); + String dateString = new SimpleDateFormat(dateService.getFormat(DateStyle.DATE)).format(new Date()); formTester.setValue(path("dateContainer", "endDate"), dateString); formTester.setValue(COMMENT, "bla bla bla bla bla"); @@ -94,10 +85,7 @@ public class AdminEditApplicationPeriodExemptionsPageTest extends SciProTest { } private AdminEditApplicationPeriodExemptionsPage startPage() { - return tester.startPage( - AdminEditApplicationPeriodExemptionsPage.class, - getPageParameters() - ); + return tester.startPage(AdminEditApplicationPeriodExemptionsPage.class, getPageParameters()); } private PageParameters getPageParameters() { diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPageTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPageTest.java index 26b77d68bd..7b68730909 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPageTest.java @@ -37,9 +37,7 @@ public class AdminEditApplicationPeriodPageTest extends SciProTest { public void setUp() throws Exception { bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); bachelor.addModule(ProjectModule.MATCH); - when(projectTypeService.findWithModule(ProjectModule.MATCH)).thenReturn( - Collections.singletonList(bachelor) - ); + when(projectTypeService.findWithModule(ProjectModule.MATCH)).thenReturn(Collections.singletonList(bachelor)); startPage(); } @@ -50,10 +48,7 @@ public class AdminEditApplicationPeriodPageTest extends SciProTest { @Test public void contains_project_type_selection() { - tester.assertModelValue( - path(FORM, PROJECT_TYPES), - projectTypeService.findWithModule(ProjectModule.MATCH) - ); + tester.assertModelValue(path(FORM, PROJECT_TYPES), projectTypeService.findWithModule(ProjectModule.MATCH)); } @Test @@ -63,11 +58,9 @@ public class AdminEditApplicationPeriodPageTest extends SciProTest { @Test public void submit_saves_application_period() { - when( - applicationPeriodService.doesPeriodOverlap( - ArgumentMatchers.any(ApplicationPeriod.class) - ) - ).thenReturn(NOT_OVERLAPPING); + when(applicationPeriodService.doesPeriodOverlap(ArgumentMatchers.any(ApplicationPeriod.class))).thenReturn( + NOT_OVERLAPPING + ); String title = "title"; submitForm(title, 3, 4, 5); @@ -81,18 +74,14 @@ public class AdminEditApplicationPeriodPageTest extends SciProTest { @Test public void submit_fails_if_dates_are_not_validated() { submitForm("title", 3, 2, 5); - tester.assertErrorMessages( - tester.getLastRenderedPage().getString("startDate.DatesValidator") - ); + tester.assertErrorMessages(tester.getLastRenderedPage().getString("startDate.DatesValidator")); } @Test public void feedback_when_submitting_application_period() { - when( - applicationPeriodService.doesPeriodOverlap( - ArgumentMatchers.any(ApplicationPeriod.class) - ) - ).thenReturn(NOT_OVERLAPPING); + when(applicationPeriodService.doesPeriodOverlap(ArgumentMatchers.any(ApplicationPeriod.class))).thenReturn( + NOT_OVERLAPPING + ); Page page = tester.getLastRenderedPage(); submitForm("title", 1, 2, 3); List<Serializable> messages = tester.getMessages(FeedbackMessage.SUCCESS); @@ -101,11 +90,9 @@ public class AdminEditApplicationPeriodPageTest extends SciProTest { @Test public void submission_fails_if_period_exists() { - when( - applicationPeriodService.doesPeriodOverlap( - ArgumentMatchers.any(ApplicationPeriod.class) - ) - ).thenReturn(OVERLAPPING); + when(applicationPeriodService.doesPeriodOverlap(ArgumentMatchers.any(ApplicationPeriod.class))).thenReturn( + OVERLAPPING + ); startPage(); submitForm("title", 1, 2, 3); tester.assertErrorMessages(tester.getLastRenderedPage().getString("overlapping")); @@ -113,11 +100,9 @@ public class AdminEditApplicationPeriodPageTest extends SciProTest { @Test public void saves_correct_project_types() { - when( - applicationPeriodService.doesPeriodOverlap( - ArgumentMatchers.any(ApplicationPeriod.class) - ) - ).thenReturn(NOT_OVERLAPPING); + when(applicationPeriodService.doesPeriodOverlap(ArgumentMatchers.any(ApplicationPeriod.class))).thenReturn( + NOT_OVERLAPPING + ); FormTester formTester = tester.newFormTester(FORM); fillInForm("Title", 0, 1, 2, formTester); formTester.setValue(path(PROJECT_TYPES, 0, CHECKBOX), true); @@ -134,13 +119,7 @@ public class AdminEditApplicationPeriodPageTest extends SciProTest { formTester.submit(); } - private void fillInForm( - String title, - int startDate, - int endDate, - int courseStartDate, - FormTester formTester - ) { + private void fillInForm(String title, int startDate, int endDate, int courseStartDate, FormTester formTester) { formTester.setValue(TITLE, title); final LocalDate now = LocalDate.now(); formTester.setValue(START_DATE, now.plusDays(startDate).toString()); diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPageTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPageTest.java index 4243bfa0df..4b4de6a725 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPageTest.java @@ -22,8 +22,7 @@ import se.su.dsv.scipro.test.UserBuilder; public class AdminEditTargetsPageTest extends SciProTest { - public static final String TARGET_PATH = - "table:supervisors:0:applicationPeriods:0:projectTypes:0:target:input"; + public static final String TARGET_PATH = "table:supervisors:0:applicationPeriods:0:projectTypes:0:target:input"; private User someEmployee; private ApplicationPeriod applicationPeriod; private Target target; @@ -32,12 +31,9 @@ public class AdminEditTargetsPageTest extends SciProTest { public void setUp() throws Exception { someEmployee = new UserBuilder().create(); someEmployee.setId(1L); - when( - supervisorService.findAll( - any(SupervisorService.FilterParams.class), - any(Pageable.class) - ) - ).thenReturn(supervisorPage()); + when(supervisorService.findAll(any(SupervisorService.FilterParams.class), any(Pageable.class))).thenReturn( + supervisorPage() + ); ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); applicationPeriod = createApplicationPeriod(projectType); when(applicationPeriodService.getPreviousPeriods(applicationPeriod, 2)).thenReturn( @@ -45,13 +41,9 @@ public class AdminEditTargetsPageTest extends SciProTest { ); target = new Target(someEmployee, applicationPeriod, projectType); target.setTarget(3); - when( - targetService.findOne( - any(ApplicationPeriod.class), - any(User.class), - any(ProjectType.class) - ) - ).thenReturn(target); + when(targetService.findOne(any(ApplicationPeriod.class), any(User.class), any(ProjectType.class))).thenReturn( + target + ); tester.startPage(new AdminEditTargetsPage(Model.of(applicationPeriod))); } @@ -75,10 +67,7 @@ public class AdminEditTargetsPageTest extends SciProTest { @Test public void updating_feedback_when_submitting_target() { - tester - .getRequest() - .getPostParameters() - .setParameterValue(getInputName(TARGET_PATH), String.valueOf(3)); + tester.getRequest().getPostParameters().setParameterValue(getInputName(TARGET_PATH), String.valueOf(3)); tester.executeAjaxEvent(TARGET_PATH, "change"); tester.assertComponentOnAjaxResponse(path("table", "feedback")); } diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanelTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanelTest.java index b87097788c..f21fc885ae 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanelTest.java @@ -17,11 +17,7 @@ import se.su.dsv.scipro.system.ProjectType; public class ApplicationPeriodActivityPlanTemplateColumnPanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); private ApplicationPeriodActivityPlanTemplateColumnPanel panel; private ApplicationPeriod applicationPeriod; @@ -41,10 +37,7 @@ public class ApplicationPeriodActivityPlanTemplateColumnPanelTest extends SciPro @Test public void list() { startPanel(); - tester.assertComponent( - path(ApplicationPeriodActivityPlanTemplateColumnPanel.LIST), - ListView.class - ); + tester.assertComponent(path(ApplicationPeriodActivityPlanTemplateColumnPanel.LIST), ListView.class); } @Test @@ -86,10 +79,7 @@ public class ApplicationPeriodActivityPlanTemplateColumnPanelTest extends SciPro @Test public void link() { startPanel(); - tester.assertComponent( - path(ApplicationPeriodActivityPlanTemplateColumnPanel.LINK), - AjaxLink.class - ); + tester.assertComponent(path(ApplicationPeriodActivityPlanTemplateColumnPanel.LINK), AjaxLink.class); } private void startPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanelTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanelTest.java index 49f33f723c..81abec4491 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodInfoPanelTest.java @@ -32,9 +32,7 @@ public class ApplicationPeriodInfoPanelTest extends SciProTest { bachelor.setId(1L); ProjectType pc = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); bachelor.setProjectTypes(Collections.singleton(pc)); - panel = tester.startComponentInPage( - new ApplicationPeriodInfoPanel("panel", Model.of(bachelor)) - ); + panel = tester.startComponentInPage(new ApplicationPeriodInfoPanel("panel", Model.of(bachelor))); } @Test @@ -45,10 +43,7 @@ public class ApplicationPeriodInfoPanelTest extends SciProTest { @Test public void testContainsListOfProjectTypes() { tester.assertComponent(path(panel, PROJECT_TYPES), ListView.class); - tester.assertModelValue( - path(panel, PROJECT_TYPES), - new ArrayList<>(bachelor.getProjectTypes()) - ); + tester.assertModelValue(path(panel, PROJECT_TYPES), new ArrayList<>(bachelor.getProjectTypes())); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanelTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanelTest.java index a931da614b..f63ffd6efa 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanelTest.java @@ -134,9 +134,7 @@ public class ApplicationPeriodSupervisorPanelTest extends SciProTest { ) ).thenReturn(MATCHED_IDEAS); - panel = tester.startComponentInPage( - new ApplicationPeriodSupervisorPanel("panel", Model.of(ap)) - ); + panel = tester.startComponentInPage(new ApplicationPeriodSupervisorPanel("panel", Model.of(ap))); } private ProjectType createProjectType(DegreeType degreeType, String name, Long id) { diff --git a/view/src/test/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanelTest.java b/view/src/test/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanelTest.java index cd280c0cda..7f46024839 100644 --- a/view/src/test/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanelTest.java @@ -20,11 +20,7 @@ import se.su.dsv.scipro.system.ProjectType; public class EditApplicationPeriodActivityPlanTemplatePanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); private EditApplicationPeriodActivityPlanTemplatePanel panel; private ApplicationPeriod applicationPeriod; @@ -34,10 +30,7 @@ public class EditApplicationPeriodActivityPlanTemplatePanelTest extends SciProTe applicationPeriod = new ApplicationPeriod(); applicationPeriod.setId(1L); - ApplicationPeriodProjectType appt = new ApplicationPeriodProjectType( - applicationPeriod, - BACHELOR - ); + ApplicationPeriodProjectType appt = new ApplicationPeriodProjectType(applicationPeriod, BACHELOR); applicationPeriod.getApplicationPeriodProjectTypes().add(appt); diff --git a/view/src/test/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePageTest.java b/view/src/test/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePageTest.java index cec98a11ea..8013403bff 100644 --- a/view/src/test/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePageTest.java @@ -67,10 +67,7 @@ public class AdminEditChecklistTemplatePageTest extends SciProTest { public void doesnt_save_no_title() { startPage(); tester.newFormTester(path(FORM)).submit(); - tester.assertErrorMessages( - "Could not save checklist template", - "Field 'Title:' is required" - ); + tester.assertErrorMessages("Could not save checklist template", "Field 'Title:' is required"); } @Test @@ -89,9 +86,7 @@ public class AdminEditChecklistTemplatePageTest extends SciProTest { public void saves() { ChecklistTemplate template = new ChecklistTemplate(); template.setId(1L); - Mockito.when( - checklistTemplateService.save(ArgumentMatchers.isA(ChecklistTemplate.class)) - ).thenReturn(template); + Mockito.when(checklistTemplateService.save(ArgumentMatchers.isA(ChecklistTemplate.class))).thenReturn(template); startPage(); FormTester formTester = tester.newFormTester(path(FORM)); @@ -116,9 +111,6 @@ public class AdminEditChecklistTemplatePageTest extends SciProTest { @Test public void description_field() { startPage(); - tester.assertComponent( - path(FORM, AdminEditChecklistTemplatePage.DESCRIPTION), - TextArea.class - ); + tester.assertComponent(path(FORM, AdminEditChecklistTemplatePage.DESCRIPTION), TextArea.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistAnswerCommentPanelTest.java b/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistAnswerCommentPanelTest.java index 8dc709af08..00bbc53b5a 100644 --- a/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistAnswerCommentPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistAnswerCommentPanelTest.java @@ -26,9 +26,7 @@ public class ChecklistAnswerCommentPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new ChecklistAnswerCommentPanel("panel", Model.of(question)) - ); + panel = tester.startComponentInPage(new ChecklistAnswerCommentPanel("panel", Model.of(question))); } @Test @@ -52,17 +50,12 @@ public class ChecklistAnswerCommentPanelTest extends SciProTest { @Test public void testCorrectNumberOfAnswers() { - List<ChecklistAnswer> answers = Arrays.asList( - new ChecklistAnswer(null), - new ChecklistAnswer(null) - ); + List<ChecklistAnswer> answers = Arrays.asList(new ChecklistAnswer(null), new ChecklistAnswer(null)); question.setAnswers(answers); startPanel(); - MarkupContainer component = (MarkupContainer) panel.get( - path(TABLE, ChecklistAnswerCommentPanel.ANSWERS) - ); + MarkupContainer component = (MarkupContainer) panel.get(path(TABLE, ChecklistAnswerCommentPanel.ANSWERS)); Assertions.assertEquals(2, component.size()); } diff --git a/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanelTest.java index 2f8e8521a7..55a0eda575 100644 --- a/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanelTest.java @@ -22,14 +22,8 @@ public class ChecklistOverviewPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - project = Project.builder() - .title("My project") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); - when( - checklistService.countAnswers(any(Project.class), any(ChecklistAnswerEnum.class)) - ).thenReturn(8L); + project = Project.builder().title("My project").projectType(projectType).startDate(LocalDate.now()).build(); + when(checklistService.countAnswers(any(Project.class), any(ChecklistAnswerEnum.class))).thenReturn(8L); startPanel(); } diff --git a/view/src/test/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPageTest.java b/view/src/test/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPageTest.java index d0e0f56a03..57e4f575e6 100644 --- a/view/src/test/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPageTest.java @@ -27,11 +27,7 @@ public class ProjectViewChecklistPageTest extends PageTest { User user = new UserBuilder().setFirstName("Rolf").setLastName("Rolfsson").create(); setLoggedInAs(user); - ProjectType projectType = new ProjectType( - DegreeType.BACHELOR, - "Some project type", - "Some description" - ); + ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description"); User supervisor = new UserBuilder().setFirstName("head").setLastName("supervisor").create(); Project project = Project.builder() .title("some title") @@ -43,11 +39,7 @@ public class ProjectViewChecklistPageTest extends PageTest { Mockito.when(projectService.findOne(ArgumentMatchers.anyLong())).thenReturn(project); Mockito.when(projectService.isPartOfProject(project, user)).thenReturn(true); - checklist = Checklist.builder() - .name("name") - .project(project) - .description("description") - .build(); + checklist = Checklist.builder().name("name").project(project).description("description").build(); mockChecklist(checklist); } @@ -84,8 +76,6 @@ public class ProjectViewChecklistPageTest extends PageTest { } private void mockChecklist(Checklist value) { - Mockito.lenient() - .when(checklistService.findOne(ArgumentMatchers.anyLong())) - .thenReturn(value); + Mockito.lenient().when(checklistService.findOne(ArgumentMatchers.anyLong())).thenReturn(value); } } diff --git a/view/src/test/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPageTest.java b/view/src/test/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPageTest.java index 4647c93265..db8e726e0d 100755 --- a/view/src/test/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPageTest.java @@ -42,17 +42,10 @@ public class SupervisorViewChecklistPageTest extends PageTest { .description("description!") .build(); checklist.setId(2L); - Mockito.when(checklistService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn( - checklist - ); - Mockito.when(projectService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn( - checklist.getProject() - ); + Mockito.when(checklistService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn(checklist); + Mockito.when(projectService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn(checklist.getProject()); Mockito.when( - projectService.hasSupervisingRole( - ArgumentMatchers.isA(Project.class), - ArgumentMatchers.isA(User.class) - ) + projectService.hasSupervisingRole(ArgumentMatchers.isA(Project.class), ArgumentMatchers.isA(User.class)) ).thenReturn(true); ChecklistQuestion question = new ChecklistQuestion("", 1); diff --git a/view/src/test/java/se/su/dsv/scipro/components/AddUsersPanelTest.java b/view/src/test/java/se/su/dsv/scipro/components/AddUsersPanelTest.java index 79d5462f32..6d42fb85b2 100644 --- a/view/src/test/java/se/su/dsv/scipro/components/AddUsersPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/components/AddUsersPanelTest.java @@ -18,11 +18,7 @@ public class AddUsersPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - user = User.builder() - .firstName("John") - .lastName("Rambo") - .emailAddress("rambo@gov.us") - .build(); + user = User.builder().firstName("John").lastName("Rambo").emailAddress("rambo@gov.us").build(); users = new HashSet<>(); users.add(user); startPanel(); diff --git a/view/src/test/java/se/su/dsv/scipro/components/AjaxLinkPanelTest.java b/view/src/test/java/se/su/dsv/scipro/components/AjaxLinkPanelTest.java index 8747cee565..35b3ddc06d 100644 --- a/view/src/test/java/se/su/dsv/scipro/components/AjaxLinkPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/components/AjaxLinkPanelTest.java @@ -39,20 +39,13 @@ public class AjaxLinkPanelTest extends SciProTest { @Test public void testLabelVisible() { - tester.assertComponent( - path(panel.getId(), AjaxLinkPanel.LINK, AjaxLinkPanel.LABEL), - Label.class - ); + tester.assertComponent(path(panel.getId(), AjaxLinkPanel.LINK, AjaxLinkPanel.LABEL), Label.class); tester.assertVisible(path(panel.getId(), AjaxLinkPanel.LINK, AjaxLinkPanel.LABEL)); } private void startPanel() { panel = tester.startComponentInPage( - new AjaxLinkPanel<Project>( - "panel", - Model.of(project), - Model.of(project).map(Project::getTitle) - ) { + new AjaxLinkPanel<Project>("panel", Model.of(project), Model.of(project).map(Project::getTitle)) { @Override public void onClick(AjaxRequestTarget target, IModel<Project> model) { //do nothing diff --git a/view/src/test/java/se/su/dsv/scipro/components/ListAdapterModelTest.java b/view/src/test/java/se/su/dsv/scipro/components/ListAdapterModelTest.java index 64ad9cae9e..7d28fd001d 100644 --- a/view/src/test/java/se/su/dsv/scipro/components/ListAdapterModelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/components/ListAdapterModelTest.java @@ -35,14 +35,9 @@ public class ListAdapterModelTest { Assertions.assertTrue(iteratorEquals(expectedIterator, actualIterator)); } - private static boolean iteratorEquals( - Iterator<String> expectedIterator, - Iterator<String> actualIterator - ) { + private static boolean iteratorEquals(Iterator<String> expectedIterator, Iterator<String> actualIterator) { while (expectedIterator.hasNext()) { - if ( - !actualIterator.hasNext() || !actualIterator.next().equals(expectedIterator.next()) - ) { + if (!actualIterator.hasNext() || !actualIterator.next().equals(expectedIterator.next())) { return false; } } diff --git a/view/src/test/java/se/su/dsv/scipro/components/SortOrderPanelTest.java b/view/src/test/java/se/su/dsv/scipro/components/SortOrderPanelTest.java index 2cdbb17ca5..c95bbe965c 100644 --- a/view/src/test/java/se/su/dsv/scipro/components/SortOrderPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/components/SortOrderPanelTest.java @@ -24,11 +24,7 @@ public class SortOrderPanelTest extends SciProTest { Mockito.withSettings().serializable() ); panel = tester.startComponentInPage( - new SortOrderPanel<>( - "panel", - Model.of(milestonePhaseTemplate), - mileStonePhaseTemplateService - ) + new SortOrderPanel<>("panel", Model.of(milestonePhaseTemplate), mileStonePhaseTemplateService) ); } diff --git a/view/src/test/java/se/su/dsv/scipro/crosscutting/ForwardPhase2FeedbackTest.java b/view/src/test/java/se/su/dsv/scipro/crosscutting/ForwardPhase2FeedbackTest.java index cd94334e9f..a4a9e4e24e 100644 --- a/view/src/test/java/se/su/dsv/scipro/crosscutting/ForwardPhase2FeedbackTest.java +++ b/view/src/test/java/se/su/dsv/scipro/crosscutting/ForwardPhase2FeedbackTest.java @@ -28,55 +28,27 @@ class ForwardPhase2FeedbackTest extends SciProTest { @BeforeEach void setUp() { - forwardPhase2Feedback = new ForwardPhase2Feedback( - tester.getApplication(), - projectForumService - ); + forwardPhase2Feedback = new ForwardPhase2Feedback(tester.getApplication(), projectForumService); ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - project = Project.builder() - .title("Title") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + project = Project.builder().title("Title").projectType(bachelor).startDate(LocalDate.now()).build(); FileReference thesis = new FileReference(); String comment = "My comment"; - roughDraftApproval = new RoughDraftApproval( - project, - thesis, - comment, - Date.from(Instant.now()) - ); + roughDraftApproval = new RoughDraftApproval(project, thesis, comment, Date.from(Instant.now())); } @Test void posts_in_forum_when_phase_2_review_failed() { - forwardPhase2Feedback.phase2Rejected( - new RoughDraftApprovalRejectedEvent(roughDraftApproval) - ); + forwardPhase2Feedback.phase2Rejected(new RoughDraftApprovalRejectedEvent(roughDraftApproval)); - verify(projectForumService).createThread( - eq(project), - isNull(), - any(String.class), - any(String.class), - anySet() - ); + verify(projectForumService).createThread(eq(project), isNull(), any(String.class), any(String.class), anySet()); } @Test void posts_in_forum_when_phase_2_review_was_approved() { - forwardPhase2Feedback.phase2Approved( - new RoughDraftApprovalApprovedEvent(roughDraftApproval) - ); + forwardPhase2Feedback.phase2Approved(new RoughDraftApprovalApprovedEvent(roughDraftApproval)); - verify(projectForumService).createThread( - eq(project), - isNull(), - any(String.class), - any(String.class), - anySet() - ); + verify(projectForumService).createThread(eq(project), isNull(), any(String.class), any(String.class), anySet()); } } diff --git a/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotificationsTest.java b/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotificationsTest.java index 4ddf27199e..592fd368f9 100644 --- a/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotificationsTest.java +++ b/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotificationsTest.java @@ -53,11 +53,7 @@ public class ReviewerAssignedNotificationsTest { ); final ProjectType master = new ProjectType(DegreeType.MASTER, "Master", "Master"); - reviewer = User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build(); + reviewer = User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build(); reviewer.setId(1L); TreeSet<User> reviewers = new TreeSet<>(new User.ByNameComparator()); reviewers.addAll(Collections.singleton(reviewer)); @@ -76,9 +72,7 @@ public class ReviewerAssignedNotificationsTest { public void does_not_notify_if_there_is_no_approval() { when(finalSeminarApprovalService.findBy(project)).thenReturn(Optional.empty()); - reviewerAssignedNotifications.reviewerAssigned( - new ReviewerAssignedEvent(project, reviewer) - ); + reviewerAssignedNotifications.reviewerAssigned(new ReviewerAssignedEvent(project, reviewer)); verify(notificationController, never()).notifyProject( eq(project), @@ -95,13 +89,9 @@ public class ReviewerAssignedNotificationsTest { "comment", new Date() ); - when(finalSeminarApprovalService.findBy(project)).thenReturn( - Optional.of(finalSeminarApproval) - ); + when(finalSeminarApprovalService.findBy(project)).thenReturn(Optional.of(finalSeminarApproval)); - reviewerAssignedNotifications.reviewerAssigned( - new ReviewerAssignedEvent(project, reviewer) - ); + reviewerAssignedNotifications.reviewerAssigned(new ReviewerAssignedEvent(project, reviewer)); verify(notificationController).notifyProject( eq(project), @@ -119,13 +109,9 @@ public class ReviewerAssignedNotificationsTest { new Date() ); finalSeminarApproval.approve("Good", Optional.empty()); - when(finalSeminarApprovalService.findBy(project)).thenReturn( - Optional.of(finalSeminarApproval) - ); + when(finalSeminarApprovalService.findBy(project)).thenReturn(Optional.of(finalSeminarApproval)); - reviewerAssignedNotifications.reviewerAssigned( - new ReviewerAssignedEvent(project, reviewer) - ); + reviewerAssignedNotifications.reviewerAssigned(new ReviewerAssignedEvent(project, reviewer)); verify(notificationController, never()).notifyProject( eq(project), @@ -144,9 +130,7 @@ public class ReviewerAssignedNotificationsTest { ); when(roughDraftApprovalService.findBy(project)).thenReturn(Optional.of(roughDraftApproval)); - reviewerAssignedNotifications.reviewerAssigned( - new ReviewerAssignedEvent(project, reviewer) - ); + reviewerAssignedNotifications.reviewerAssigned(new ReviewerAssignedEvent(project, reviewer)); verify(notificationController).notifyProject( eq(project), diff --git a/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailerTest.java b/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailerTest.java index 32a8e561d1..58512d12df 100644 --- a/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailerTest.java +++ b/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailerTest.java @@ -79,26 +79,20 @@ public class ReviewerSupportMailerTest { @Test public void testOnFinalSeminarApprovalRequest() { mockSystemSettings(); - reviewerSupportMailer.onFinalSeminarApprovalRequest( - new FinalSeminarApprovalRequestEvent(finalSeminarApproval) - ); + reviewerSupportMailer.onFinalSeminarApprovalRequest(new FinalSeminarApprovalRequestEvent(finalSeminarApproval)); verify(mailEventService).save(new MailEvent()); } @Test public void testOnRoughDraftApprovalRequest() { mockSystemSettings(); - reviewerSupportMailer.onRoughDraftApprovalRequest( - new RoughDraftApprovalRequestedEvent(roughDraftApproval) - ); + reviewerSupportMailer.onRoughDraftApprovalRequest(new RoughDraftApprovalRequestedEvent(roughDraftApproval)); verify(mailEventService).save(new MailEvent()); } private void mockSystemSettings() { GeneralSystemSettings generalSystemSettings = new GeneralSystemSettings(); generalSystemSettings.setReviewerSupportMail("support@test.se"); - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - generalSystemSettings - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(generalSystemSettings); } } diff --git a/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewingNotificationsTest.java b/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewingNotificationsTest.java index f5aa53a724..340f3e2529 100644 --- a/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewingNotificationsTest.java +++ b/view/src/test/java/se/su/dsv/scipro/crosscutting/ReviewingNotificationsTest.java @@ -45,24 +45,10 @@ public class ReviewingNotificationsTest { @BeforeEach public void setUp() throws Exception { ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - project = Project.builder() - .title("Title") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + project = Project.builder().title("Title").projectType(bachelor).startDate(LocalDate.now()).build(); final FileDescription fileDescription = new FileDescription(); - finalSeminarApproval = new FinalSeminarApproval( - project, - referenceTo(fileDescription), - "hello", - new Date() - ); - roughDraftApproval = new RoughDraftApproval( - project, - referenceTo(fileDescription), - "hello", - new Date() - ); + finalSeminarApproval = new FinalSeminarApproval(project, referenceTo(fileDescription), "hello", new Date()); + roughDraftApproval = new RoughDraftApproval(project, referenceTo(fileDescription), "hello", new Date()); } private static FileReference referenceTo(final FileDescription fileDescription) { @@ -91,9 +77,7 @@ public class ReviewingNotificationsTest { @Test public void sends_out_notification_when_a_rough_draft_approval_request_is_sent() { - reviewingNotifications.onRoughDraftApprovalRequest( - new RoughDraftApprovalRequestedEvent(roughDraftApproval) - ); + reviewingNotifications.onRoughDraftApprovalRequest(new RoughDraftApprovalRequestedEvent(roughDraftApproval)); verify(notificationController).notifyProject( eq(project), diff --git a/view/src/test/java/se/su/dsv/scipro/dataproviders/GenericDataProviderTest.java b/view/src/test/java/se/su/dsv/scipro/dataproviders/GenericDataProviderTest.java index c2621f65ca..e20b73ec83 100644 --- a/view/src/test/java/se/su/dsv/scipro/dataproviders/GenericDataProviderTest.java +++ b/view/src/test/java/se/su/dsv/scipro/dataproviders/GenericDataProviderTest.java @@ -42,9 +42,7 @@ public class GenericDataProviderTest { @Test public void iterator() { DomainObject domainObject = mock(DomainObject.class); - when(genericService.findAll(isA(Pageable.class))).thenReturn( - Collections.singletonList(domainObject) - ); + when(genericService.findAll(isA(Pageable.class))).thenReturn(Collections.singletonList(domainObject)); Iterator<? extends DomainObject> iterator = provider.iterator(0, Integer.MAX_VALUE); assertEquals(domainObject, iterator.next()); diff --git a/view/src/test/java/se/su/dsv/scipro/datatables/AjaxCheckboxWrapperTest.java b/view/src/test/java/se/su/dsv/scipro/datatables/AjaxCheckboxWrapperTest.java index 2489dbe9bc..74f3ab81fb 100644 --- a/view/src/test/java/se/su/dsv/scipro/datatables/AjaxCheckboxWrapperTest.java +++ b/view/src/test/java/se/su/dsv/scipro/datatables/AjaxCheckboxWrapperTest.java @@ -26,10 +26,7 @@ public class AjaxCheckboxWrapperTest extends SciProTest { @Test public void testPanelContainsCheckbox() { - tester.assertComponent( - path(panel.getId(), AjaxCheckboxWrapper.CHECKBOX), - WebMarkupContainer.class - ); + tester.assertComponent(path(panel.getId(), AjaxCheckboxWrapper.CHECKBOX), WebMarkupContainer.class); } private void startPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/datatables/project/ProjectDataPanelTest.java b/view/src/test/java/se/su/dsv/scipro/datatables/project/ProjectDataPanelTest.java index 958be58ee7..f11fded33a 100644 --- a/view/src/test/java/se/su/dsv/scipro/datatables/project/ProjectDataPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/datatables/project/ProjectDataPanelTest.java @@ -41,10 +41,7 @@ public class ProjectDataPanelTest extends SciProTest { private void inactivateProject() { panel.visitChildren(AjaxCheckboxWrapper.class, (object, visit) -> { - tester.executeAjaxEvent( - path(object.getPageRelativePath(), AjaxCheckboxWrapper.CHECKBOX), - "click" - ); + tester.executeAjaxEvent(path(object.getPageRelativePath(), AjaxCheckboxWrapper.CHECKBOX), "click"); verify(projectService).toggleActiveStatus(any(Project.class), eq(false)); visit.stop(); }); @@ -58,9 +55,9 @@ public class ProjectDataPanelTest extends SciProTest { .projectStatus(ProjectStatus.ACTIVE) .build(); project.setHeadSupervisor(ObjectMother.SOME_USER); - when( - projectService.findAll(any(ProjectService.Filter.class), any(Pageable.class)) - ).thenReturn(Collections.singletonList(project)); + when(projectService.findAll(any(ProjectService.Filter.class), any(Pageable.class))).thenReturn( + Collections.singletonList(project) + ); when(projectService.count(any(ProjectService.Filter.class))).thenReturn(1L); } diff --git a/view/src/test/java/se/su/dsv/scipro/datatables/target/EditTargetPanelTest.java b/view/src/test/java/se/su/dsv/scipro/datatables/target/EditTargetPanelTest.java index fce53cdbb0..43f2182259 100644 --- a/view/src/test/java/se/su/dsv/scipro/datatables/target/EditTargetPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/datatables/target/EditTargetPanelTest.java @@ -29,11 +29,7 @@ public class EditTargetPanelTest extends SciProTest { bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); applicationPeriod = new ApplicationPeriod(); applicationPeriod.addProjectType(bachelor); - employee = User.builder() - .firstName("Kalle") - .lastName("Testare") - .emailAddress("kalle@test.com") - .build(); + employee = User.builder().firstName("Kalle").lastName("Testare").emailAddress("kalle@test.com").build(); when(targetService.findOne(applicationPeriod, employee, bachelor)).thenReturn( new Target(employee, applicationPeriod, bachelor) @@ -60,10 +56,7 @@ public class EditTargetPanelTest extends SciProTest { private void setNewTarget(int newTarget) { String path = path(panel, "input"); - tester - .getRequest() - .getPostParameters() - .setParameterValue(getInputName(path), String.valueOf(newTarget)); + tester.getRequest().getPostParameters().setParameterValue(getInputName(path), String.valueOf(newTarget)); tester.executeAjaxEvent(path, "change"); } @@ -73,13 +66,7 @@ public class EditTargetPanelTest extends SciProTest { private void startPanel() { panel = tester.startComponentInPage( - new EditTargetPanel( - "id", - Model.of(applicationPeriod), - Model.of(employee), - Model.of(bachelor), - true - ) { + new EditTargetPanel("id", Model.of(applicationPeriod), Model.of(employee), Model.of(bachelor), true) { @Override public void update(AjaxRequestTarget ajaxTarget, User e) {} } diff --git a/view/src/test/java/se/su/dsv/scipro/files/FileDescriptionPanelTest.java b/view/src/test/java/se/su/dsv/scipro/files/FileDescriptionPanelTest.java index 071b646dcd..61f47ef197 100644 --- a/view/src/test/java/se/su/dsv/scipro/files/FileDescriptionPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/files/FileDescriptionPanelTest.java @@ -59,8 +59,6 @@ public class FileDescriptionPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new FileDescriptionPanel("panel", Model.of(fileDescription)) - ); + panel = tester.startComponentInPage(new FileDescriptionPanel("panel", Model.of(fileDescription))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanelTest.java index a4caa48812..cde85c9bfa 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanelTest.java @@ -21,9 +21,6 @@ public class AdminFinalSeminarDataPanelTest extends SciProTest { @Test public void testContainsDataTablePanel() { - tester.assertComponent( - path(panel.getId(), AdminFinalSeminarDataPanel.DATA_TABEL), - ExportableDataPanel.class - ); + tester.assertComponent(path(panel.getId(), AdminFinalSeminarDataPanel.DATA_TABEL), ExportableDataPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPageTest.java index b8242e7515..d0bbbb4cbe 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPageTest.java @@ -28,9 +28,9 @@ public class AdminFinalSeminarExemptionPageTest extends SciProTest { ArgumentMatchers.any(Pageable.class) ) ).thenReturn(page); - Mockito.when( - projectService.count(ArgumentMatchers.any(ProjectService.Filter.class)) - ).thenReturn((long) page.size()); + Mockito.when(projectService.count(ArgumentMatchers.any(ProjectService.Filter.class))).thenReturn( + (long) page.size() + ); tester.startPage(AdminFinalSeminarExemptionPage.class); } @@ -47,10 +47,7 @@ public class AdminFinalSeminarExemptionPageTest extends SciProTest { @Test public void testContainsForm() { - tester.assertComponent( - AdminFinalSeminarExemptionPage.FORM, - AdminFinalSeminarExemptionPage.FilterForm.class - ); + tester.assertComponent(AdminFinalSeminarExemptionPage.FORM, AdminFinalSeminarExemptionPage.FilterForm.class); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPageTest.java index 65ca0e2e6f..310a1f1f09 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPageTest.java @@ -61,20 +61,14 @@ public class AdminFinalSeminarSettingsPageTest extends SciProTest { @Test public void testLabelForEachListItem() { for (int i = 0; i < levels.size(); i++) { - tester.assertComponent( - path(SETTINGS_FORM, PROJECT_TYPE_LIST, i, PROJECT_TYPE), - Label.class - ); + tester.assertComponent(path(SETTINGS_FORM, PROJECT_TYPE_LIST, i, PROJECT_TYPE), Label.class); } } @Test public void testInnerFormForEachListItem() { for (int i = 0; i < levels.size(); i++) { - tester.assertComponent( - path(SETTINGS_FORM, PROJECT_TYPE_LIST, i, PROJECT_TYPE_FORM), - Form.class - ); + tester.assertComponent(path(SETTINGS_FORM, PROJECT_TYPE_LIST, i, PROJECT_TYPE_FORM), Form.class); } } @@ -92,13 +86,7 @@ public class AdminFinalSeminarSettingsPageTest extends SciProTest { public void testInnerFormContainsMaxParticipantsField() { for (int i = 0; i < levels.size(); i++) { tester.assertComponent( - path( - SETTINGS_FORM, - PROJECT_TYPE_LIST, - i, - PROJECT_TYPE_FORM, - SEMINAR_MAX_PARTICIPANTS - ), + path(SETTINGS_FORM, PROJECT_TYPE_LIST, i, PROJECT_TYPE_FORM, SEMINAR_MAX_PARTICIPANTS), RequiredTextField.class ); } @@ -108,13 +96,7 @@ public class AdminFinalSeminarSettingsPageTest extends SciProTest { public void testInnerFormContainsMinParticipantsField() { for (int i = 0; i < levels.size(); i++) { tester.assertComponent( - path( - SETTINGS_FORM, - PROJECT_TYPE_LIST, - i, - PROJECT_TYPE_FORM, - SEMINAR_MIN_PARTICIPANTS - ), + path(SETTINGS_FORM, PROJECT_TYPE_LIST, i, PROJECT_TYPE_FORM, SEMINAR_MIN_PARTICIPANTS), RequiredTextField.class ); } @@ -150,10 +132,7 @@ public class AdminFinalSeminarSettingsPageTest extends SciProTest { assertFormComponent(SEMINAR_PDF, CheckBox.class); } - private void assertFormComponent( - String componentPath, - Class<? extends Component> expectedClass - ) { + private void assertFormComponent(String componentPath, Class<? extends Component> expectedClass) { tester.assertComponent(path(SETTINGS_FORM, componentPath), expectedClass); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/AttendingPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/AttendingPanelTest.java index b1a3e64f7f..c1dcdccaec 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/AttendingPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/AttendingPanelTest.java @@ -25,11 +25,7 @@ import se.su.dsv.scipro.test.UserBuilder; public class AttendingPanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); AttendingPanel panel; Project project; @@ -78,10 +74,7 @@ public class AttendingPanelTest extends SciProTest { startPanel(); tester.assertModelValue(path(panel.getId(), "oppositions"), oppositions); - tester.assertComponent( - path(panel.getId(), "oppositions", "0", "seminarLink"), - BookmarkablePageLink.class - ); + tester.assertComponent(path(panel.getId(), "oppositions", "0", "seminarLink"), BookmarkablePageLink.class); tester.assertInvisible(path(panel.getId(), "noOppositions")); } @@ -99,25 +92,17 @@ public class AttendingPanelTest extends SciProTest { finalSeminar.setStartDate(new Date()); User unregisteredUser = user; - FinalSeminarActiveParticipation finalSeminarActiveParticipation = - new FinalSeminarActiveParticipation(); + FinalSeminarActiveParticipation finalSeminarActiveParticipation = new FinalSeminarActiveParticipation(); finalSeminarActiveParticipation.setUser(user); finalSeminarActiveParticipation.setFinalSeminar(finalSeminar); - List<FinalSeminarActiveParticipation> participations = List.of( + List<FinalSeminarActiveParticipation> participations = List.of(finalSeminarActiveParticipation); + + when(finalSeminarService.findUserParticipating(isA(Project.class), isA(User.class))).thenReturn(participations); + when(finalSeminarActiveParticipationService.findByFinalSeminarUser(finalSeminar, unregisteredUser)).thenReturn( finalSeminarActiveParticipation ); - when( - finalSeminarService.findUserParticipating(isA(Project.class), isA(User.class)) - ).thenReturn(participations); - when( - finalSeminarActiveParticipationService.findByFinalSeminarUser( - finalSeminar, - unregisteredUser - ) - ).thenReturn(finalSeminarActiveParticipation); - startPanel(); tester.assertModelValue(path(panel.getId(), "wmc", "participations"), participations); @@ -145,12 +130,10 @@ public class AttendingPanelTest extends SciProTest { participation.setFinalSeminar(finalSeminar); finalSeminar.addActiveParticipant(participation); - when(finalSeminarService.findUserParticipating(project, user)).thenReturn( - List.of(participation) + when(finalSeminarService.findUserParticipating(project, user)).thenReturn(List.of(participation)); + when(finalSeminarActiveParticipationService.findByFinalSeminarUser(finalSeminar, user)).thenReturn( + participation ); - when( - finalSeminarActiveParticipationService.findByFinalSeminarUser(finalSeminar, user) - ).thenReturn(participation); startPanel(); tester.clickLink(path(panel, "wmc", "participations", 0, "remove")); diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanelTest.java index 217878b019..2a23a02d9b 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/DownloadPdfReportPanelTest.java @@ -24,11 +24,7 @@ import se.su.dsv.scipro.test.UserBuilder; public class DownloadPdfReportPanelTest extends SciProTest { - private static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + private static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); private FinalSeminar seminar; private User uploader; private OppositionReport gradingReport; @@ -55,10 +51,7 @@ public class DownloadPdfReportPanelTest extends SciProTest { @Test public void has_resource_link() { submitAndStartPanel(); - tester.assertComponent( - path(panel, DownloadPdfReportPanel.DOWNLOAD_PDF), - ResourceLink.class - ); + tester.assertComponent(path(panel, DownloadPdfReportPanel.DOWNLOAD_PDF), ResourceLink.class); } @Test @@ -79,11 +72,7 @@ public class DownloadPdfReportPanelTest extends SciProTest { public void shows_date_for_report_creation() { submitAndStartPanel(); tester.assertModelValue( - path( - panel, - DownloadPdfReportPanel.DOWNLOAD_PDF, - DownloadPdfReportPanel.PDF_UPLOAD_DATE - ), + path(panel, DownloadPdfReportPanel.DOWNLOAD_PDF, DownloadPdfReportPanel.PDF_UPLOAD_DATE), gradingReport.getDateCreated() ); } @@ -120,15 +109,8 @@ public class DownloadPdfReportPanelTest extends SciProTest { .descriptionEn("DescriptionEn") .build() ); - gradingReportTemplate.addProjectCriterion( - "title", - "titleEn", - 0, - gradingCriterionPointTemplates - ); - gradingReport = gradingReportTemplate.createOppositionReport( - seminar.getOppositions().iterator().next() - ); + gradingReportTemplate.addProjectCriterion("title", "titleEn", 0, gradingCriterionPointTemplates); + gradingReport = gradingReportTemplate.createOppositionReport(seminar.getOppositions().iterator().next()); gradingReport.setThesisSummary("some summary"); for (Criterion criterion : gradingReport.getCriteria()) { criterion.setFeedback("Feedback"); diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanelTest.java index 0fda1de35c..e6f8a1730f 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanelTest.java @@ -31,9 +31,9 @@ public class MoveFinalSeminarPanelTest extends SciProTest { public void setUp() throws Exception { prepareFinalSeminar(); tester.startComponentInPage(new MoveFinalSeminarPanel(panel, Model.of(seminar))); - when( - finalSeminarService.move(any(FinalSeminar.class), any(LocalDateTime.class)) - ).thenReturn(Either.right(seminar)); + when(finalSeminarService.move(any(FinalSeminar.class), any(LocalDateTime.class))).thenReturn( + Either.right(seminar) + ); } private void prepareFinalSeminar() { diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java index 4df01f6999..6e9d239fa4 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java @@ -55,25 +55,13 @@ public class OppositionReportPageTest extends SciProTest { .title("Foo") .projectType(bachelor) .startDate(LocalDate.now()) - .headSupervisor( - User.builder() - .firstName("Bob") - .lastName("Kelso") - .emailAddress("bob@example.com") - .build() - ) + .headSupervisor(User.builder().firstName("Bob").lastName("Kelso").emailAddress("bob@example.com").build()) .build(); Project projectToOppose = Project.builder() .title("Foo") .projectType(bachelor) .startDate(LocalDate.now()) - .headSupervisor( - User.builder() - .firstName("Bob") - .lastName("Kelso") - .emailAddress("bob@example.com") - .build() - ) + .headSupervisor(User.builder().firstName("Bob").lastName("Kelso").emailAddress("bob@example.com").build()) .build(); DomainObjects.injectId(opponentsProject, 666L); DomainObjects.injectId(projectToOppose, 777L); @@ -81,23 +69,17 @@ public class OppositionReportPageTest extends SciProTest { FinalSeminar finalSeminar = createFinalSeminar(projectToOppose); finalSeminarOpposition = createOpposition(opponentsProject, finalSeminar); - Mockito.when(projectService.findOne(ArgumentMatchers.anyLong())).thenReturn( - opponentsProject + Mockito.when(projectService.findOne(ArgumentMatchers.anyLong())).thenReturn(opponentsProject); + Mockito.when(projectService.isPartOfProject(eq(opponentsProject), ArgumentMatchers.any(User.class))).thenReturn( + true ); - Mockito.when( - projectService.isPartOfProject(eq(opponentsProject), ArgumentMatchers.any(User.class)) - ).thenReturn(true); Mockito.when(finalSeminarService.findByProject(opponentsProject)).thenReturn(finalSeminar); } private void mockReport(ProjectType bachelor) { GradingReportTemplate reportTemplate = createTemplate(bachelor); - OppositionReport oppositionReport = reportTemplate.createOppositionReport( - finalSeminarOpposition - ); - Mockito.when(oppositionReportService.findOrCreateReport(finalSeminarOpposition)).thenReturn( - oppositionReport - ); + OppositionReport oppositionReport = reportTemplate.createOppositionReport(finalSeminarOpposition); + Mockito.when(oppositionReportService.findOrCreateReport(finalSeminarOpposition)).thenReturn(oppositionReport); } @Test @@ -122,18 +104,14 @@ public class OppositionReportPageTest extends SciProTest { public void disable_form_if_opposition_does_not_belong_to_logged_in_user() { mockReport(bachelor); long oppositionId = 4L; - Mockito.when(finalSeminarOppositionRepo.findOne(oppositionId)).thenReturn( - finalSeminarOpposition - ); + Mockito.when(finalSeminarOppositionRepo.findOne(oppositionId)).thenReturn(finalSeminarOpposition); startPage(oppositionId); tester.assertDisabled(FILL_OUT_REPORT); } @Test public void redirect_if_no_opposition_is_found_from_id() { - Mockito.when(finalSeminarOppositionRepo.findOne(ArgumentMatchers.anyLong())).thenReturn( - null - ); + Mockito.when(finalSeminarOppositionRepo.findOne(ArgumentMatchers.anyLong())).thenReturn(null); startPage(1L); tester.assertRenderedPage(ProjectDetailsPage.class); } @@ -143,12 +121,7 @@ public class OppositionReportPageTest extends SciProTest { mockReport(bachelor); startOppositionPage(); tester.assertComponent( - path( - FILL_OUT_REPORT, - FillOutReportPanel.FORM, - FILL_OUT_REPORT + "_" + Border.BODY, - THESIS_SUMMARY - ), + path(FILL_OUT_REPORT, FillOutReportPanel.FORM, FILL_OUT_REPORT + "_" + Border.BODY, THESIS_SUMMARY), TextArea.class ); } @@ -160,9 +133,7 @@ public class OppositionReportPageTest extends SciProTest { String summary = "my summary"; - FormTester formTester = tester.newFormTester( - path(FILL_OUT_REPORT, FillOutReportPanel.FORM) - ); + FormTester formTester = tester.newFormTester(path(FILL_OUT_REPORT, FillOutReportPanel.FORM)); formTester.setValue(path(FILL_OUT_REPORT + "_" + Border.BODY, THESIS_SUMMARY), summary); formTester.submit(); @@ -185,9 +156,7 @@ public class OppositionReportPageTest extends SciProTest { private void startOppositionPage() { long oppositionId = 4L; setLoggedInAs(user); - Mockito.when(finalSeminarOppositionRepo.findOne(oppositionId)).thenReturn( - finalSeminarOpposition - ); + Mockito.when(finalSeminarOppositionRepo.findOne(oppositionId)).thenReturn(finalSeminarOpposition); startPage(oppositionId); } @@ -210,12 +179,7 @@ public class OppositionReportPageTest extends SciProTest { .descriptionEn(CRITERION_DESCRIPTION) .build() ); - reportTemplate.addProjectCriterion( - CRITERTION_TITLE, - CRITERTION_TITLE, - 1, - gradingCriterionPointTemplates - ); + reportTemplate.addProjectCriterion(CRITERTION_TITLE, CRITERTION_TITLE, 1, gradingCriterionPointTemplates); return reportTemplate; } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanelTest.java index c8775f66cc..94870ba641 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanelTest.java @@ -38,9 +38,7 @@ public class OverviewSeminarPanelTest extends SciProTest { finalSeminar.setProject(project); finalSeminar.setStartDate(new Date()); - Mockito.when( - finalSeminarService.findByProject(ArgumentMatchers.isA(Project.class)) - ).thenReturn(finalSeminar); + Mockito.when(finalSeminarService.findByProject(ArgumentMatchers.isA(Project.class))).thenReturn(finalSeminar); panel = tester.startComponentInPage(new OverviewSeminarPanel("panel", Model.of(project))); } @@ -57,9 +55,7 @@ public class OverviewSeminarPanelTest extends SciProTest { @Test public void testCreate() { - tester.assertContains( - "[" + path(OverviewSeminarPanel.NOSEMINAR, OverviewSeminarPanel.CREATE) + "]" - ); + tester.assertContains("[" + path(OverviewSeminarPanel.NOSEMINAR, OverviewSeminarPanel.CREATE) + "]"); } @Test @@ -69,23 +65,17 @@ public class OverviewSeminarPanelTest extends SciProTest { @Test public void testDate() { - tester.assertContains( - "[" + path(OverviewSeminarPanel.HASSEMINAR, OverviewSeminarPanel.DATE) + "]" - ); + tester.assertContains("[" + path(OverviewSeminarPanel.HASSEMINAR, OverviewSeminarPanel.DATE) + "]"); } @Test public void testRoom() { - tester.assertContains( - "[" + path(OverviewSeminarPanel.HASSEMINAR, OverviewSeminarPanel.ROOM) + "]" - ); + tester.assertContains("[" + path(OverviewSeminarPanel.HASSEMINAR, OverviewSeminarPanel.ROOM) + "]"); } @Test public void testView() { - tester.assertContains( - "[" + path(OverviewSeminarPanel.HASSEMINAR, OverviewSeminarPanel.VIEW) + "]" - ); + tester.assertContains("[" + path(OverviewSeminarPanel.HASSEMINAR, OverviewSeminarPanel.VIEW) + "]"); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanelTest.java index a52e25c34c..654a665932 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanelTest.java @@ -24,25 +24,15 @@ public class ProjectActiveParticipationListPanelTest extends SciProTest { ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); User bob = newUser(1L); User bill = newUser(2L); - Project bobs = Project.builder() - .title("My project") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + Project bobs = Project.builder().title("My project").projectType(bachelor).startDate(LocalDate.now()).build(); bobs.setId(8L); bobs.addProjectParticipant(bob); - bills = Project.builder() - .title("My project") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + bills = Project.builder().title("My project").projectType(bachelor).startDate(LocalDate.now()).build(); bills.addProjectParticipant(bill); FinalSeminar finalSeminar = new FinalSeminar(bobs); billsParticipation = newActiveParticipation(bill, finalSeminar, bills); finalSeminar.addActiveParticipant(billsParticipation); - when(finalSeminarService.findUserParticipating(bills, bill)).thenReturn( - List.of(billsParticipation) - ); + when(finalSeminarService.findUserParticipating(bills, bill)).thenReturn(List.of(billsParticipation)); } @Test @@ -61,8 +51,7 @@ public class ProjectActiveParticipationListPanelTest extends SciProTest { final FinalSeminar finalSeminar, final Project authors ) { - FinalSeminarActiveParticipation finalSeminarActiveParticipation = - new FinalSeminarActiveParticipation(); + FinalSeminarActiveParticipation finalSeminarActiveParticipation = new FinalSeminarActiveParticipation(); finalSeminarActiveParticipation.setFinalSeminar(finalSeminar); finalSeminarActiveParticipation.setUser(author); finalSeminarActiveParticipation.setProject(authors); diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectDetailsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectDetailsPanelTest.java index 2b6527e5a6..477939e717 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectDetailsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectDetailsPanelTest.java @@ -16,16 +16,8 @@ public class ProjectDetailsPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - ProjectType projectType = new ProjectType( - DegreeType.BACHELOR, - "Some project type", - "Some description" - ); - project = Project.builder() - .title("Nice project") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description"); + project = Project.builder().title("Nice project").projectType(projectType).startDate(LocalDate.now()).build(); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPageTest.java index d28209a890..e02a37d83e 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPageTest.java @@ -56,11 +56,7 @@ public class ProjectFinalSeminarDetailsPageTest extends SciProTest { projectTypeSettings.setMaxOpponentsOnFinalSeminar(1); projectType.setProjectTypeSettings(projectTypeSettings); - User supervisor = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User supervisor = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); Project project = Project.builder() .title("bla") .projectType(projectType) @@ -75,11 +71,7 @@ public class ProjectFinalSeminarDetailsPageTest extends SciProTest { DomainObjects.injectId(finalSeminar, 1L); Mockito.when(projectService.findOne(ArgumentMatchers.anyLong())).thenReturn(project); - Mockito.when( - finalSeminarService.findByProject(ArgumentMatchers.any(Project.class)) - ).thenReturn(finalSeminar); - Mockito.when(finalSeminarSettingsService.getInstance()).thenReturn( - new FinalSeminarSettings() - ); + Mockito.when(finalSeminarService.findByProject(ArgumentMatchers.any(Project.class))).thenReturn(finalSeminar); + Mockito.when(finalSeminarSettingsService.getInstance()).thenReturn(new FinalSeminarSettings()); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPageTest.java index 1013e295f5..de611bf6f8 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPageTest.java @@ -34,10 +34,7 @@ public class ProjectFinalSeminarPageTest extends PageTest { Mockito.when(projectService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn(project); Mockito.when( - projectService.isPartOfProject( - ArgumentMatchers.isA(Project.class), - ArgumentMatchers.isA(User.class) - ) + projectService.isPartOfProject(ArgumentMatchers.isA(Project.class), ArgumentMatchers.isA(User.class)) ).thenReturn(true); page = tester.startPage(ProjectFinalSeminarPage.class, getPageParameters()); diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPageTest.java index aff5f310f5..0f597eeb4d 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPageTest.java @@ -54,9 +54,7 @@ public class ProjectOppositionPageTest extends PageTest { Project unwantedProject = Project.builder() .title("Some unwanted title") - .projectType( - new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description") - ) + .projectType(new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description")) .startDate(LocalDate.now()) .build(); unwantedProject.setId(9L); @@ -66,10 +64,7 @@ public class ProjectOppositionPageTest extends PageTest { pageParameters.add(PageParameterKeys.MAP.get(Project.class), "1"); Mockito.when(projectService.findOne(ArgumentMatchers.any(Long.class))).thenReturn(project); Mockito.when( - projectService.isPartOfProject( - ArgumentMatchers.any(Project.class), - ArgumentMatchers.any(User.class) - ) + projectService.isPartOfProject(ArgumentMatchers.any(Project.class), ArgumentMatchers.any(User.class)) ).thenReturn(true); Mockito.when( finalSeminarService.findAll( @@ -77,23 +72,17 @@ public class ProjectOppositionPageTest extends PageTest { ArgumentMatchers.any(Pageable.class) ) ).thenReturn(Collections.singletonList(finalSeminar)); - Mockito.when( - finalSeminarService.count(ArgumentMatchers.any(FinalSeminarService.Filter.class)) - ).thenReturn(1L); - Mockito.when(finalSeminarService.canOppose(user, finalSeminar, project)).thenReturn( - Either.right(null) - ); - Mockito.when(finalSeminarService.canActiveParticipate(user, finalSeminar)).thenReturn( - Either.right(null) - ); + Mockito.when(finalSeminarService.count(ArgumentMatchers.any(FinalSeminarService.Filter.class))).thenReturn(1L); + Mockito.when(finalSeminarService.canOppose(user, finalSeminar, project)).thenReturn(Either.right(null)); + Mockito.when(finalSeminarService.canActiveParticipate(user, finalSeminar)).thenReturn(Either.right(null)); tester.startPage(ProjectOppositionPage.class, pageParameters); } @Test public void clickingOpposeUpdatesCorrectProject() { - Mockito.when( - finalSeminarService.attemptAddOpposition(user, finalSeminar, project) - ).thenReturn(Either.right(null)); + Mockito.when(finalSeminarService.attemptAddOpposition(user, finalSeminar, project)).thenReturn( + Either.right(null) + ); final Page page = tester.getLastRenderedPage(); page.visitChildren( OpposeColumnPanel.class, @@ -101,11 +90,7 @@ public class ProjectOppositionPageTest extends PageTest { @Override public void component(Component component, IVisit<Object> visit) { tester.clickLink(path(component.getPageRelativePath(), OpposeColumnPanel.LINK)); - Mockito.verify(finalSeminarService).attemptAddOpposition( - user, - finalSeminar, - project - ); + Mockito.verify(finalSeminarService).attemptAddOpposition(user, finalSeminar, project); visit.stop(); } } @@ -114,9 +99,9 @@ public class ProjectOppositionPageTest extends PageTest { @Test public void clicking_oppose_generates_feedback() { - Mockito.when( - finalSeminarService.attemptAddOpposition(user, finalSeminar, project) - ).thenReturn(Either.right(null)); + Mockito.when(finalSeminarService.attemptAddOpposition(user, finalSeminar, project)).thenReturn( + Either.right(null) + ); final Page page = tester.getLastRenderedPage(); page.visitChildren( OpposeColumnPanel.class, @@ -129,9 +114,7 @@ public class ProjectOppositionPageTest extends PageTest { MatcherAssert.assertThat( messages, hasItem( - StringContains.containsString( - page.getString("oppositionAdded", Model.of(finalSeminar)) - ) + StringContains.containsString(page.getString("oppositionAdded", Model.of(finalSeminar))) ) ); visit.stop(); @@ -142,23 +125,17 @@ public class ProjectOppositionPageTest extends PageTest { @Test public void clickingParticipateUpdatesCorrectProject() { - Mockito.when( - finalSeminarService.attemptAddActiveParticipation(user, finalSeminar, project) - ).thenReturn(Either.right(new FinalSeminarActiveParticipation())); + Mockito.when(finalSeminarService.attemptAddActiveParticipation(user, finalSeminar, project)).thenReturn( + Either.right(new FinalSeminarActiveParticipation()) + ); final Page page = tester.getLastRenderedPage(); page.visitChildren( ParticipateColumnPanel.class, new IVisitor<Component, Object>() { @Override public void component(Component component, IVisit<Object> visit) { - tester.clickLink( - path(component.getPageRelativePath(), ParticipateColumnPanel.LINK) - ); - Mockito.verify(finalSeminarService).attemptAddActiveParticipation( - user, - finalSeminar, - project - ); + tester.clickLink(path(component.getPageRelativePath(), ParticipateColumnPanel.LINK)); + Mockito.verify(finalSeminarService).attemptAddActiveParticipation(user, finalSeminar, project); visit.stop(); } } @@ -167,25 +144,21 @@ public class ProjectOppositionPageTest extends PageTest { @Test public void clicking_participate_generates_feedback() { - Mockito.when( - finalSeminarService.attemptAddActiveParticipation(user, finalSeminar, project) - ).thenReturn(Either.right(new FinalSeminarActiveParticipation())); + Mockito.when(finalSeminarService.attemptAddActiveParticipation(user, finalSeminar, project)).thenReturn( + Either.right(new FinalSeminarActiveParticipation()) + ); final Page page = tester.getLastRenderedPage(); page.visitChildren( ParticipateColumnPanel.class, new IVisitor<Component, Object>() { @Override public void component(Component component, IVisit<Object> visit) { - tester.clickLink( - path(component.getPageRelativePath(), ParticipateColumnPanel.LINK) - ); + tester.clickLink(path(component.getPageRelativePath(), ParticipateColumnPanel.LINK)); List<Serializable> messages = tester.getMessages(FeedbackMessage.SUCCESS); MatcherAssert.assertThat( messages, hasItem( - StringContains.containsString( - page.getString("participationAdded", Model.of(finalSeminar)) - ) + StringContains.containsString(page.getString("participationAdded", Model.of(finalSeminar))) ) ); visit.stop(); diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanelTest.java index 4c302e6578..e522a9e068 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanelTest.java @@ -24,26 +24,16 @@ public class ProjectOppositionsListPanelTest extends SciProTest { ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); User bob = newUser(1L); User bill = newUser(2L); - Project bobs = Project.builder() - .title("My project") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + Project bobs = Project.builder().title("My project").projectType(bachelor).startDate(LocalDate.now()).build(); bobs.setId(8L); bobs.addProjectParticipant(bob); - bills = Project.builder() - .title("My project") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + bills = Project.builder().title("My project").projectType(bachelor).startDate(LocalDate.now()).build(); bills.addProjectParticipant(bill); FinalSeminar finalSeminar = new FinalSeminar(bobs); billsOpposition = newOpposition(bill, finalSeminar, bills); finalSeminar.addOpposition(billsOpposition); finalSeminar.addOpposition(newOpposition(bob, finalSeminar, bobs)); - when(finalSeminarService.getOppositionsByProjectAuthors(eq(bills))).thenReturn( - List.of(billsOpposition) - ); + when(finalSeminarService.getOppositionsByProjectAuthors(eq(bills))).thenReturn(List.of(billsOpposition)); } @Test @@ -51,10 +41,7 @@ public class ProjectOppositionsListPanelTest extends SciProTest { ProjectOppositionsListPanel panel = tester.startComponentInPage( new ProjectOppositionsListPanel("id", Model.of(bills)) ); - tester.assertModelValue( - path(panel, "oppositions"), - Collections.singletonList(billsOpposition) - ); + tester.assertModelValue(path(panel, "oppositions"), Collections.singletonList(billsOpposition)); } private FinalSeminarOpposition newOpposition( diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanelTest.java index 1699ef35b3..2d8ceecb6f 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanelTest.java @@ -137,9 +137,7 @@ public class SeminarActiveParticipantsPanelTest extends SciProTest { public void displays_feedback() { startPanel(); tester.executeAjaxEvent(path(panel, PARTICIPANTS, 0, RADIOS), "change"); - assertSuccessFeedback( - panel.getString("feedback.active.participant", Model.of(participation)) - ); + assertSuccessFeedback(panel.getString("feedback.active.participant", Model.of(participation))); } private void assertSuccessFeedback(String feedbackMessage) { @@ -148,8 +146,6 @@ public class SeminarActiveParticipantsPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new SeminarActiveParticipantsPanel("id", Model.of(finalSeminar)) - ); + panel = tester.startComponentInPage(new SeminarActiveParticipantsPanel("id", Model.of(finalSeminar))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanelTest.java index 5327c5f374..29acf0e527 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanelTest.java @@ -42,9 +42,7 @@ public class SeminarCRUDPanelTest extends SciProTest { public void setup_context() { english = Language.ENGLISH; prepareSeminar(); - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); when(finalSeminarSettingsService.getInstance()).thenReturn(new FinalSeminarSettings()); setLoggedInAs(supervisor); startPanel(); @@ -79,10 +77,7 @@ public class SeminarCRUDPanelTest extends SciProTest { when(finalSeminarService.updateDetails(eq(seminar), any())).thenReturn(seminar); FormTester formTester = newFormTester(); formTester.submit(); - assertThat( - tester.getMessages(FeedbackMessage.SUCCESS), - hasItem(panel.getString("final.seminar.updated")) - ); + assertThat(tester.getMessages(FeedbackMessage.SUCCESS), hasItem(panel.getString("final.seminar.updated"))); } @Test @@ -93,13 +88,7 @@ public class SeminarCRUDPanelTest extends SciProTest { @Test public void panel_not_visible_when_student() { setRoles(Roles.AUTHOR); - setLoggedInAs( - User.builder() - .firstName("Sture") - .lastName("Student") - .emailAddress("sture@example.com") - .build() - ); + setLoggedInAs(User.builder().firstName("Sture").lastName("Student").emailAddress("sture@example.com").build()); startPanel(); tester.assertInvisible(path()); } @@ -124,23 +113,16 @@ public class SeminarCRUDPanelTest extends SciProTest { DomainObjects.injectId(seminar, 32525L); startPanel(); tester.clickLink(path(FORM, DELETE)); - assertThat( - tester.getMessages(FeedbackMessage.SUCCESS), - hasItem(panel.getString("deleted")) - ); + assertThat(tester.getMessages(FeedbackMessage.SUCCESS), hasItem(panel.getString("deleted"))); } @Test public void testInvalidMaxOpponentsSubmission() { FormTester formTester = newFormTester(); - formTester.setValue( - "details:maxOpponents", - Integer.toString(seminar.getMinOpponents() - 1) - ); + formTester.setValue("details:maxOpponents", Integer.toString(seminar.getMinOpponents() - 1)); formTester.submit(); tester.assertErrorMessages( - "The selected number of max oppositions may not be lower than " + - seminar.getMinOpponents() + "The selected number of max oppositions may not be lower than " + seminar.getMinOpponents() ); } @@ -157,14 +139,11 @@ public class SeminarCRUDPanelTest extends SciProTest { String room = "secret room"; formTester.setValue("details:room", room); formTester.setValue("details:reportLanguage", Language.SWEDISH.name()); - final String extraInfo = - "First authors defend, then opposition attacks, and then we all go home."; + final String extraInfo = "First authors defend, then opposition attacks, and then we all go home."; formTester.setValue("details:extraInfo", extraInfo); formTester.submit(); tester.assertNoErrorMessage(); - final ArgumentCaptor<FinalSeminarDetails> captor = ArgumentCaptor.forClass( - FinalSeminarDetails.class - ); + final ArgumentCaptor<FinalSeminarDetails> captor = ArgumentCaptor.forClass(FinalSeminarDetails.class); verify(finalSeminarService).updateDetails(eq(seminar), captor.capture()); FinalSeminarDetails persistedSeminar = captor.getValue(); assertEquals(opponents, persistedSeminar.maxOpponents()); @@ -208,11 +187,7 @@ public class SeminarCRUDPanelTest extends SciProTest { private void prepareSeminar() { ProjectType bachelor = new ProjectType(ProjectType.BACHELOR, "Bachelor", "Bachelor"); bachelor.getProjectTypeSettings().setMinOpponentsOnFinalSeminar(2); - supervisor = User.builder() - .firstName("Hasse") - .lastName("Handledare") - .emailAddress("hasse@example.com") - .build(); + supervisor = User.builder().firstName("Hasse").lastName("Handledare").emailAddress("hasse@example.com").build(); DomainObjects.injectId(supervisor, 234L); Project project = new Project(); project.setId(1L); diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanelTest.java index 292fafb947..957d576e8e 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarCancelledInfoPanelTest.java @@ -30,10 +30,7 @@ public class SeminarCancelledInfoPanelTest extends SciProTest { public void testPanelContainsWMC() { seminar.setDeleted(true); startPanel(); - tester.assertComponent( - path(panel.getId(), SeminarCancelledInfoPanel.CANCELLED), - WebMarkupContainer.class - ); + tester.assertComponent(path(panel.getId(), SeminarCancelledInfoPanel.CANCELLED), WebMarkupContainer.class); } @Test @@ -41,11 +38,7 @@ public class SeminarCancelledInfoPanelTest extends SciProTest { seminar.setDeleted(true); startPanel(); tester.assertComponent( - path( - panel.getId(), - SeminarCancelledInfoPanel.CANCELLED, - SeminarCancelledInfoPanel.CANCELLED_INFO - ), + path(panel.getId(), SeminarCancelledInfoPanel.CANCELLED, SeminarCancelledInfoPanel.CANCELLED_INFO), MultiLineLabel.class ); } @@ -62,11 +55,7 @@ public class SeminarCancelledInfoPanelTest extends SciProTest { seminar.setDeleted(true); startPanel(); tester.assertVisible( - path( - panel.getId(), - SeminarCancelledInfoPanel.CANCELLED, - SeminarCancelledInfoPanel.CANCELLED_INFO - ) + path(panel.getId(), SeminarCancelledInfoPanel.CANCELLED, SeminarCancelledInfoPanel.CANCELLED_INFO) ); } @@ -82,17 +71,11 @@ public class SeminarCancelledInfoPanelTest extends SciProTest { seminar.setDeleted(false); startPanel(); tester.assertInvisible( - path( - panel.getId(), - SeminarCancelledInfoPanel.CANCELLED, - SeminarCancelledInfoPanel.CANCELLED_INFO - ) + path(panel.getId(), SeminarCancelledInfoPanel.CANCELLED, SeminarCancelledInfoPanel.CANCELLED_INFO) ); } private void startPanel() { - panel = tester.startComponentInPage( - new SeminarCancelledInfoPanel("panel", Model.of(seminar)) - ); + panel = tester.startComponentInPage(new SeminarCancelledInfoPanel("panel", Model.of(seminar))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanelTest.java index fbcd5dda6c..66e5c2224d 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanelTest.java @@ -146,9 +146,7 @@ public class SeminarOppositionPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new SeminarOppositionPanel("id", Model.of(finalSeminar)) - ); + panel = tester.startComponentInPage(new SeminarOppositionPanel("id", Model.of(finalSeminar))); } private void addReviewerToProject(Project project) { diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanelTest.java index e1419722a0..32c67e26ec 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanelTest.java @@ -68,9 +68,7 @@ public class SeminarOppositionReportPanelTest extends SciProTest { setLoggedInAs(supervisorUser); OppositionReport oppositionReport = Mockito.mock(OppositionReport.class); - Mockito.when(oppositionReportService.findOrCreateReport(opposition)).thenReturn( - oppositionReport - ); + Mockito.when(oppositionReportService.findOrCreateReport(opposition)).thenReturn(oppositionReport); } @Test @@ -134,10 +132,7 @@ public class SeminarOppositionReportPanelTest extends SciProTest { @Test public void has_download_pdf_panel() { startPanel(); - tester.assertComponent( - path(panel, "wmc", "downloadPdfPanel"), - DownloadPdfReportPanel.class - ); + tester.assertComponent(path(panel, "wmc", "downloadPdfPanel"), DownloadPdfReportPanel.class); } @Test @@ -154,10 +149,7 @@ public class SeminarOppositionReportPanelTest extends SciProTest { setLoggedInAs(opponentUser); finalSeminar.setDocument(new FileReference()); startPanel(); - tester.assertComponent( - path(panel, "wmc", "oppositionReportLink"), - BookmarkablePageLink.class - ); + tester.assertComponent(path(panel, "wmc", "oppositionReportLink"), BookmarkablePageLink.class); } @Test @@ -181,9 +173,7 @@ public class SeminarOppositionReportPanelTest extends SciProTest { setLoggedInAs(opponentUser); OppositionReport oppositionReport = Mockito.mock(OppositionReport.class); Mockito.when(oppositionReport.isSubmitted()).thenReturn(true); - Mockito.when(oppositionReportService.findOrCreateReport(opposition)).thenReturn( - oppositionReport - ); + Mockito.when(oppositionReportService.findOrCreateReport(opposition)).thenReturn(oppositionReport); startPanel(); tester.assertInvisible(path(panel, "wmc", "oppositionReportLink")); } @@ -246,11 +236,7 @@ public class SeminarOppositionReportPanelTest extends SciProTest { tester.assertInvisible(path(panel, "wmc", "downloadAttachment")); } - private void mockPanelWithOppositionReport( - User user, - boolean hasAttachment, - boolean submitted - ) { + private void mockPanelWithOppositionReport(User user, boolean hasAttachment, boolean submitted) { finalSeminar.setDocument(new FileReference()); setLoggedInAs(user); OppositionReport oppositionReport = Mockito.mock(OppositionReport.class); @@ -258,9 +244,7 @@ public class SeminarOppositionReportPanelTest extends SciProTest { createFile(oppositionReport); } Mockito.lenient().when(oppositionReport.isSubmitted()).thenReturn(submitted); - Mockito.when(oppositionReportService.findOrCreateReport(opposition)).thenReturn( - oppositionReport - ); + Mockito.when(oppositionReportService.findOrCreateReport(opposition)).thenReturn(oppositionReport); startPanel(); } @@ -273,9 +257,7 @@ public class SeminarOppositionReportPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new SeminarOppositionReportPanel("id", Model.of(opposition)) - ); + panel = tester.startComponentInPage(new SeminarOppositionReportPanel("id", Model.of(opposition))); } private void addReviewerToProject(Project project) { diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarPanelTest.java index 61a8194282..2edb1a7727 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarPanelTest.java @@ -24,11 +24,7 @@ import se.su.dsv.scipro.test.UserBuilder; public class SeminarPanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); @Mock FinalSeminarSettings finalSeminarSettings = new FinalSeminarSettings(); @@ -63,16 +59,9 @@ public class SeminarPanelTest extends SciProTest { Mockito.when(finalSeminarSettingsService.getInstance()).thenReturn(finalSeminarSettings); Mockito.when(finalSeminarSettings.getDaysAheadToCreate()).thenReturn(1); OppositionReport oppositionReport = Mockito.mock(OppositionReport.class); - FinalSeminarRespondent finalSeminarRespondent = new FinalSeminarRespondent( - authorUser, - SOME_FINAL_SEMINAR - ); - List<FinalSeminarRespondent> respondents = Collections.singletonList( - finalSeminarRespondent - ); - Mockito.when(finalSeminarRespondentService.findOrCreate(SOME_FINAL_SEMINAR)).thenReturn( - respondents - ); + FinalSeminarRespondent finalSeminarRespondent = new FinalSeminarRespondent(authorUser, SOME_FINAL_SEMINAR); + List<FinalSeminarRespondent> respondents = Collections.singletonList(finalSeminarRespondent); + Mockito.when(finalSeminarRespondentService.findOrCreate(SOME_FINAL_SEMINAR)).thenReturn(respondents); Mockito.when(projectService.findOne(someProject.getId())).thenReturn(someProject); Mockito.when(plagiarismControl.getStatus(any(FileDescription.class))).thenReturn( new PlagiarismControl.Status.NotSubmitted() diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanelTest.java index 6cedd24c9e..38a87a018c 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanelTest.java @@ -42,15 +42,11 @@ public class SeminarRespondentsPanelTest extends SciProTest { .headSupervisor(supervisorUser) .build() ); - respondents = Collections.singletonList( - new FinalSeminarRespondent(new UserBuilder().create(), finalSeminar) - ); + respondents = Collections.singletonList(new FinalSeminarRespondent(new UserBuilder().create(), finalSeminar)); setLoggedInAs(supervisorUser); - Mockito.when(finalSeminarRespondentService.findOrCreate(finalSeminar)).thenReturn( - respondents - ); + Mockito.when(finalSeminarRespondentService.findOrCreate(finalSeminar)).thenReturn(respondents); } @Test @@ -73,9 +69,7 @@ public class SeminarRespondentsPanelTest extends SciProTest { tester.executeAjaxEvent(path(panel, RESPONDENTS, 0, RADIOS), "change"); - Mockito.verify(finalSeminarRespondentService).save( - ArgumentMatchers.any(FinalSeminarRespondent.class) - ); + Mockito.verify(finalSeminarRespondentService).save(ArgumentMatchers.any(FinalSeminarRespondent.class)); } @Test @@ -107,8 +101,6 @@ public class SeminarRespondentsPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new SeminarRespondentsPanel("id", Model.of(finalSeminar)) - ); + panel = tester.startComponentInPage(new SeminarRespondentsPanel("id", Model.of(finalSeminar))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanelTest.java index bfd1ef5f1b..2b82bdf4cb 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanelTest.java @@ -99,16 +99,12 @@ public class SeminarThesisPanelTest extends SciProTest { // when Date deadline = Date.from(seminarDate.minusDays(daysAhead).toInstant()); - when(finalSeminarService.thesisUploadDeadline(isA(FinalSeminar.class))).thenReturn( - deadline - ); + when(finalSeminarService.thesisUploadDeadline(isA(FinalSeminar.class))).thenReturn(deadline); startPanel(seminar); // then - Component dateComponent = panel.get( - path(SeminarThesisPanel.DEADLINE_INFORMATION, SeminarThesisPanel.DATE) - ); + Component dateComponent = panel.get(path(SeminarThesisPanel.DEADLINE_INFORMATION, SeminarThesisPanel.DATE)); Assertions.assertNotNull(dateComponent, "No date component"); Object modelObject = dateComponent.getDefaultModelObject(); @@ -217,10 +213,7 @@ public class SeminarThesisPanelTest extends SciProTest { startPanel(seminar); // then - tester.assertComponent( - path(panel.getId(), SeminarThesisPanel.DOWNLOAD_THESIS), - ViewAttachmentPanel.class - ); + tester.assertComponent(path(panel.getId(), SeminarThesisPanel.DOWNLOAD_THESIS), ViewAttachmentPanel.class); } @Test @@ -382,11 +375,7 @@ public class SeminarThesisPanelTest extends SciProTest { private void startPanel(final FinalSeminar seminar) { if (seminar.getProject() == null) { - ProjectType projectType = new ProjectType( - DegreeType.BACHELOR, - "Some project type", - "Some description" - ); + ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Some project type", "Some description"); Project project = Project.builder() .title("Some title") .projectType(projectType) diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPageTest.java index 83e508e3dc..42fbbcf387 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPageTest.java @@ -27,11 +27,7 @@ public class SupervisorFinalSeminarDetailsPageTest extends SciProTest { projectTypeSettings.setMaxOpponentsOnFinalSeminar(1); projectType.setProjectTypeSettings(projectTypeSettings); - User supervisor = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User supervisor = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); Project project = Project.builder() .title("bla") .projectType(projectType) @@ -46,9 +42,7 @@ public class SupervisorFinalSeminarDetailsPageTest extends SciProTest { DomainObjects.injectId(finalSeminar, 1L); Mockito.when(projectService.findOne(ArgumentMatchers.anyLong())).thenReturn(project); - Mockito.when(finalSeminarSettingsService.getInstance()).thenReturn( - new FinalSeminarSettings() - ); + Mockito.when(finalSeminarSettingsService.getInstance()).thenReturn(new FinalSeminarSettings()); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarListingPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarListingPageTest.java index 1898ccb368..0b413bc1c6 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarListingPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarListingPageTest.java @@ -18,41 +18,31 @@ public class SupervisorFinalSeminarListingPageTest extends SciProTest { @Test public void final_versions_is_visible() { - lenient() - .when(projectTypeService.projectTypeWithModuleExists(ProjectModule.GRADING)) - .thenReturn(true); + lenient().when(projectTypeService.projectTypeWithModuleExists(ProjectModule.GRADING)).thenReturn(true); assertVisible("Final theses"); } @Test public void activity_plan_is_visible_if_module_is_on() { - lenient() - .when(projectTypeService.projectTypeWithModuleExists(ProjectModule.ACTIVITY_PLAN)) - .thenReturn(true); + lenient().when(projectTypeService.projectTypeWithModuleExists(ProjectModule.ACTIVITY_PLAN)).thenReturn(true); assertVisible("Activity plan templates"); } @Test public void peer_is_visible_if_module_is_on() { - lenient() - .when(projectTypeService.projectTypeWithModuleExists(ProjectModule.PEER)) - .thenReturn(true); + lenient().when(projectTypeService.projectTypeWithModuleExists(ProjectModule.PEER)).thenReturn(true); assertVisible("Peers"); } @Test public void milestone_statistics_is_visible_if_module_is_on() { - lenient() - .when(projectTypeService.projectTypeWithModuleExists(ProjectModule.MILESTONES)) - .thenReturn(true); + lenient().when(projectTypeService.projectTypeWithModuleExists(ProjectModule.MILESTONES)).thenReturn(true); assertVisible("Milestone statistics"); } @Test public void final_seminar_is_visible_if_module_is_on() { - lenient() - .when(projectTypeService.projectTypeWithModuleExists(ProjectModule.FINAL_SEMINAR)) - .thenReturn(true); + lenient().when(projectTypeService.projectTypeWithModuleExists(ProjectModule.FINAL_SEMINAR)).thenReturn(true); assertVisible("Final seminars"); } diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPageTest.java index 35603c33a6..2f828d12a3 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPageTest.java @@ -35,10 +35,7 @@ public class SupervisorFinalSeminarPageTest extends PageTest { DomainObjects.injectId(project, 1L); when(projectService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn(project); when( - projectService.hasSupervisingRole( - ArgumentMatchers.isA(Project.class), - ArgumentMatchers.isA(User.class) - ) + projectService.hasSupervisingRole(ArgumentMatchers.isA(Project.class), ArgumentMatchers.isA(User.class)) ).thenReturn(true); } diff --git a/view/src/test/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanelTest.java index e44b5a0905..8dfe28d836 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanelTest.java @@ -57,9 +57,7 @@ public class ApproveFinalThesisPanelTest extends SciProTest { final String englishTitle = "English title"; final String swedishTitle = "Swedish title"; - final FormTester formTester = tester.newFormTester( - path(panel, THESIS_CONTAINER, THESIS_DECISION_CONTAINER) - ); + final FormTester formTester = tester.newFormTester(path(panel, THESIS_CONTAINER, THESIS_DECISION_CONTAINER)); formTester.setValue("englishTitle", englishTitle); formTester.setValue("swedishTitle", swedishTitle); formTester.submit(); @@ -128,13 +126,7 @@ public class ApproveFinalThesisPanelTest extends SciProTest { tester.clickLink(path(panel, THESIS_CONTAINER, THESIS_DECISION_CONTAINER, REJECT)); FormTester formTester = tester.newFormTester( - path( - panel, - THESIS_CONTAINER, - REJECT_CONTAINER, - REJECT_PANEL, - RejectFinalThesisPanel.FORM - ) + path(panel, THESIS_CONTAINER, REJECT_CONTAINER, REJECT_PANEL, RejectFinalThesisPanel.FORM) ); formTester.setValue(path(RejectFinalThesisPanel.CONTENT), SOME_CONTENT); formTester.submit(); @@ -208,22 +200,12 @@ public class ApproveFinalThesisPanelTest extends SciProTest { path(panel, WAITING_FOR_AUTHOR_CONTAINER, UPLOAD_FORM_PANEL), FinalThesisUploadFormPanel.class ); - tester.assertVisible( - path( - panel, - WAITING_FOR_AUTHOR_CONTAINER, - ApproveFinalThesisPanel.STATUS_NO_THESIS_LABEL - ) - ); - tester.assertInvisible( - path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_DATE_LABEL) - ); + tester.assertVisible(path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.STATUS_NO_THESIS_LABEL)); + tester.assertInvisible(path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_DATE_LABEL)); tester.assertInvisible( path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.STATUS_REJECTED_LABEL) ); - tester.assertInvisible( - path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_INFO_LABEL) - ); + tester.assertInvisible(path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_INFO_LABEL)); } @Test @@ -238,21 +220,11 @@ public class ApproveFinalThesisPanelTest extends SciProTest { FinalThesisUploadFormPanel.class ); tester.assertInvisible( - path( - panel, - WAITING_FOR_AUTHOR_CONTAINER, - ApproveFinalThesisPanel.STATUS_NO_THESIS_LABEL - ) - ); - tester.assertVisible( - path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_DATE_LABEL) - ); - tester.assertVisible( - path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.STATUS_REJECTED_LABEL) - ); - tester.assertVisible( - path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_INFO_LABEL) + path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.STATUS_NO_THESIS_LABEL) ); + tester.assertVisible(path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_DATE_LABEL)); + tester.assertVisible(path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.STATUS_REJECTED_LABEL)); + tester.assertVisible(path(panel, WAITING_FOR_AUTHOR_CONTAINER, ApproveFinalThesisPanel.REJECTED_INFO_LABEL)); } @Test @@ -293,9 +265,7 @@ public class ApproveFinalThesisPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new ApproveFinalThesisPanel("id", Model.of(SOME_PROJECT)) - ); + panel = tester.startComponentInPage(new ApproveFinalThesisPanel("id", Model.of(SOME_PROJECT))); } private FinalThesis mockHasFinalThesisAndStartPanel(FinalThesis.Status status) { diff --git a/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisPanelTest.java index 894f9161fd..fc49104e7c 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisPanelTest.java @@ -21,11 +21,7 @@ import se.su.dsv.scipro.test.ObjectMother; public class FinalThesisPanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); private Project project = new Project(); private FinalThesisPanel panel; @@ -34,17 +30,10 @@ public class FinalThesisPanelTest extends SciProTest { @BeforeEach public void setUp() { Mockito.when(finalThesisService.findByProject(project)).thenReturn(SOME_FINAL_THESIS); + Mockito.when(finalSeminarService.hasHadFinalSeminar(ArgumentMatchers.any(Project.class))).thenReturn(true); + Mockito.when(finalThesisService.isUploadAllowed(ArgumentMatchers.any(Project.class))).thenReturn(true); Mockito.when( - finalSeminarService.hasHadFinalSeminar(ArgumentMatchers.any(Project.class)) - ).thenReturn(true); - Mockito.when( - finalThesisService.isUploadAllowed(ArgumentMatchers.any(Project.class)) - ).thenReturn(true); - Mockito.when( - reflectionService.hasToFillInReflection( - ArgumentMatchers.eq(project), - ArgumentMatchers.any(User.class) - ) + reflectionService.hasToFillInReflection(ArgumentMatchers.eq(project), ArgumentMatchers.any(User.class)) ).thenReturn(false); } @@ -187,9 +176,7 @@ public class FinalThesisPanelTest extends SciProTest { fileDescription.setIdentifier("identifier"); fileDescription.setUploader(ObjectMother.SOME_USER); fileDescription.setId(1L); - Mockito.when(finalThesisService.getFinalThesisFileDescription(project)).thenReturn( - fileDescription - ); + Mockito.when(finalThesisService.getFinalThesisFileDescription(project)).thenReturn(fileDescription); return fileDescription; } @@ -199,11 +186,7 @@ public class FinalThesisPanelTest extends SciProTest { } private void startPanel(ProjectType projectType) { - project = Project.builder() - .title("title") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + project = Project.builder().title("title").projectType(projectType).startDate(LocalDate.now()).build(); panel = tester.startComponentInPage(new FinalThesisPanel("id", Model.of(project))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanelTest.java index 1695dc2f04..be2b4196fe 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanelTest.java @@ -48,10 +48,7 @@ public class FinalThesisUploadFormPanelTest extends SciProTest { @Test public void has_final_thesis_upload_component() { startPanel(); - tester.assertComponent( - path(panel, FORM, "finalThesisUpload"), - FinalThesisUploadComponent.class - ); + tester.assertComponent(path(panel, FORM, "finalThesisUpload"), FinalThesisUploadComponent.class); } @Test @@ -85,9 +82,7 @@ public class FinalThesisUploadFormPanelTest extends SciProTest { @Test public void hides_upload_when_no_final_seminar() { - Mockito.when( - finalSeminarService.hasHadFinalSeminar(ArgumentMatchers.any(Project.class)) - ).thenReturn(false); + Mockito.when(finalSeminarService.hasHadFinalSeminar(ArgumentMatchers.any(Project.class))).thenReturn(false); startPanel(); @@ -123,16 +118,11 @@ public class FinalThesisUploadFormPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new FinalThesisUploadFormPanel("id", Model.of(SOME_PROJECT)) - ); + panel = tester.startComponentInPage(new FinalThesisUploadFormPanel("id", Model.of(SOME_PROJECT))); } private File getTestFile() throws URISyntaxException { - URI resource = Thread.currentThread() - .getContextClassLoader() - .getResource("final_thesis.txt") - .toURI(); + URI resource = Thread.currentThread().getContextClassLoader().getResource("final_thesis.txt").toURI(); return new File(resource); } } diff --git a/view/src/test/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanelTest.java b/view/src/test/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanelTest.java index 9f4f04ec3f..3283d46bd9 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanelTest.java @@ -64,11 +64,7 @@ public class RejectFinalThesisPanelTest extends SciProTest { @Test public void testContainsCancelLink() { tester.assertComponent( - path( - panel.getId(), - RejectFinalThesisPanel.FORM, - RejectFinalThesisPanel.CANCEL_REJECTION - ), + path(panel.getId(), RejectFinalThesisPanel.FORM, RejectFinalThesisPanel.CANCEL_REJECTION), AbstractLink.class ); } @@ -96,21 +92,13 @@ public class RejectFinalThesisPanelTest extends SciProTest { setLoggedInAs(user); // when - FormTester formTester = tester.newFormTester( - path(panel.getId(), RejectFinalThesisPanel.FORM) - ); + FormTester formTester = tester.newFormTester(path(panel.getId(), RejectFinalThesisPanel.FORM)); formTester.setFile(RejectFinalThesisPanel.ATTACHMENT, file, contentType); formTester.setValue(RejectFinalThesisPanel.CONTENT, content); formTester.submit(); // then - verify(projectForumService, times(1)).createThread( - eq(project), - eq(user), - anyString(), - eq(content), - anySet() - ); + verify(projectForumService, times(1)).createThread(eq(project), eq(user), anyString(), eq(content), anySet()); } private void startPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPageTest.java index f11b85db0f..799f75d0f6 100644 --- a/view/src/test/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPageTest.java @@ -16,9 +16,9 @@ public class SupervisorFinalThesisListingPageTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - when( - finalThesisService.findAll(any(FinalThesisService.Filter.class), any(Pageable.class)) - ).thenReturn(Collections.singletonList(createFinalThesis())); + when(finalThesisService.findAll(any(FinalThesisService.Filter.class), any(Pageable.class))).thenReturn( + Collections.singletonList(createFinalThesis()) + ); when(finalThesisService.count(any(FinalThesisService.Filter.class))).thenReturn(1L); } diff --git a/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanelTest.java b/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanelTest.java index 4fc07e1621..f3e2a48aa7 100644 --- a/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanelTest.java @@ -16,16 +16,8 @@ public class FirstMeetingColumnPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - User kalle = User.builder() - .firstName("Kalle") - .lastName("Testare") - .emailAddress("kalle@test.com") - .build(); - User fnatte = User.builder() - .firstName("Fnatte") - .lastName("Testare") - .emailAddress("fnatte@test.com") - .build(); + User kalle = User.builder().firstName("Kalle").lastName("Testare").emailAddress("kalle@test.com").build(); + User fnatte = User.builder().firstName("Fnatte").lastName("Testare").emailAddress("fnatte@test.com").build(); idea = new Idea(); idea.setType(Idea.Type.STUDENT); diff --git a/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanelTest.java b/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanelTest.java index 75b76ba192..1aab2d34ed 100644 --- a/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanelTest.java @@ -106,21 +106,14 @@ public class FirstMeetingPanelTest extends SciProTest { public void shows_feedback_that_meeting_is_scheduled_and_authors_notified() { startPanel(); Date date = createDateThreeDaysFromNow(); - String formattedDate = new SimpleDateFormat( - dateService.getFormat(DateStyle.DATETIME) - ).format(date); + String formattedDate = new SimpleDateFormat(dateService.getFormat(DateStyle.DATETIME)).format(date); Mockito.when( - dateService.format( - ArgumentMatchers.any(Date.class), - ArgumentMatchers.eq(DateStyle.DATETIME) - ) + dateService.format(ArgumentMatchers.any(Date.class), ArgumentMatchers.eq(DateStyle.DATETIME)) ).thenReturn(formattedDate); scheduleMeeting(date); - tester.assertInfoMessages( - format(panel.getString("meeting.scheduled", panel.getModel()), formattedDate) - ); + tester.assertInfoMessages(format(panel.getString("meeting.scheduled", panel.getModel()), formattedDate)); } @Test @@ -151,12 +144,8 @@ public class FirstMeetingPanelTest extends SciProTest { private void submitForm(Date meetingDate) { FormTester formTester = tester.newFormTester(path(SUPERVISOR_WMC, MEETING_FORM)); - String dateString = new SimpleDateFormat(dateService.getFormat(DateStyle.DATE)).format( - meetingDate - ); - String timeString = new SimpleDateFormat(dateService.getFormat(DateStyle.TIME)).format( - meetingDate - ); + String dateString = new SimpleDateFormat(dateService.getFormat(DateStyle.DATE)).format(meetingDate); + String timeString = new SimpleDateFormat(dateService.getFormat(DateStyle.TIME)).format(meetingDate); formTester.setValue(ROOM_FIELD, "a room"); formTester.setValue(super.path(FIRST_MEETING_DATE, "date"), dateString); formTester.setValue(super.path(FIRST_MEETING_DATE, "time"), timeString); diff --git a/view/src/test/java/se/su/dsv/scipro/forum/pages/SupervisorForumBasePageTest.java b/view/src/test/java/se/su/dsv/scipro/forum/pages/SupervisorForumBasePageTest.java index 78fb193e19..01328c98c8 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/pages/SupervisorForumBasePageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/pages/SupervisorForumBasePageTest.java @@ -28,10 +28,7 @@ public class SupervisorForumBasePageTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - User headSupervisor = new UserBuilder() - .setFirstName("head") - .setLastName("supervisor") - .create(); + User headSupervisor = new UserBuilder().setFirstName("head").setLastName("supervisor").create(); User student = new UserBuilder().setFirstName("author").setLastName("1").create(); project = Project.builder() .title("some title") @@ -41,9 +38,7 @@ public class SupervisorForumBasePageTest extends SciProTest { .build(); DomainObjects.injectId(project, 1L); when(projectService.findOne(isA(Long.class))).thenReturn(project); - when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn( - true - ); + when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn(true); setRoles(Roles.values()); setLoggedIn(true); } @@ -59,9 +54,7 @@ public class SupervisorForumBasePageTest extends SciProTest { PageParameters pp = new PageParameters(); pp.add(PageParameterKeys.MAP.get(Project.class), "1"); pp.add(PageParameterKeys.MAP.get(ForumThread.class), "2"); - when(projectForumService.findOne(isA(Long.class))).thenReturn( - new ForumBuilder().createThread() - ); + when(projectForumService.findOne(isA(Long.class))).thenReturn(new ForumBuilder().createThread()); tester.startPage(getPage(), pp); tester.assertRenderedPage(SupervisorViewForumThreadPage.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPageTest.java b/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPageTest.java index 5e8502f364..7c6279e67e 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPageTest.java @@ -35,10 +35,7 @@ public class SupervisorCreateForumThreadPageTest extends PageTest { @BeforeEach public void setUp() throws Exception { - User headSupervisor = new UserBuilder() - .setFirstName("head") - .setLastName("supervisor") - .create(); + User headSupervisor = new UserBuilder().setFirstName("head").setLastName("supervisor").create(); Project project = Project.builder() .title("some title") .projectType(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")) @@ -48,18 +45,13 @@ public class SupervisorCreateForumThreadPageTest extends PageTest { DomainObjects.injectId(project, 1L); when(projectService.findOne(isA(Long.class))).thenReturn(project); - when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn( - true - ); + when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn(true); tester.startPage(SupervisorCreateForumThreadPage.class, getPageParameters()); } @Test public void testPageContainsBackLink() { - tester.assertComponent( - SupervisorCreateForumThreadPage.BACK_LINK, - BookmarkablePageLink.class - ); + tester.assertComponent(SupervisorCreateForumThreadPage.BACK_LINK, BookmarkablePageLink.class); } @Test @@ -70,9 +62,6 @@ public class SupervisorCreateForumThreadPageTest extends PageTest { @Test public void testPageContainsCreateThreadPanel() { - tester.assertComponent( - SupervisorCreateForumThreadPage.CREATE_THREAD, - SubmitForumThreadPanel.class - ); + tester.assertComponent(SupervisorCreateForumThreadPage.CREATE_THREAD, SubmitForumThreadPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPageTest.java b/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPageTest.java index 76d24a09b1..255e38d59a 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPageTest.java @@ -36,10 +36,7 @@ public class SupervisorThreadedForumPageTest extends PageTest { @BeforeEach public void setUp() throws Exception { - User headSupervisor = new UserBuilder() - .setFirstName("head") - .setLastName("supervisor") - .create(); + User headSupervisor = new UserBuilder().setFirstName("head").setLastName("supervisor").create(); project = Project.builder() .title("some title") .projectType(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")) @@ -50,9 +47,7 @@ public class SupervisorThreadedForumPageTest extends PageTest { project.setStartDate(LocalDate.now()); when(projectService.findOne(isA(Long.class))).thenReturn(project); - when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn( - true - ); + when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn(true); page = tester.startPage(SupervisorThreadedForumPage.class, getPageParameters()); } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPageTest.java b/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPageTest.java index 467cd910ff..b80342d196 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPageTest.java @@ -41,10 +41,7 @@ public class SupervisorViewForumThreadPageTest extends PageTest { @BeforeEach public void setUp() throws Exception { - User headSupervisor = new UserBuilder() - .setFirstName("head") - .setLastName("supervisor") - .create(); + User headSupervisor = new UserBuilder().setFirstName("head").setLastName("supervisor").create(); Project project = Project.builder() .title("some title") .projectType(new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor")) @@ -56,9 +53,7 @@ public class SupervisorViewForumThreadPageTest extends PageTest { thread = new ForumBuilder().createThread(); when(projectForumService.findOne(isA(Long.class))).thenReturn(thread); - when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn( - true - ); + when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn(true); page = tester.startPage(SupervisorViewForumThreadPage.class, getPageParameters()); } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanelTest.java b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanelTest.java index 731fdf0a20..49a0278784 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanelTest.java @@ -27,18 +27,9 @@ public class ForumPostPanelTest extends SciProTest { @Test public void testCorrectModelValues() { - tester.assertModelValue( - path(panel.getId(), ForumPostPanel.POSTED_BY), - forumPost.getPostedBy() - ); - tester.assertModelValue( - path(panel.getId(), ForumPostPanel.CONTENT), - forumPost.getContent() - ); - tester.assertModelValue( - path(panel.getId(), ForumPostPanel.DATE_CREATED), - forumPost.getDateCreated() - ); + tester.assertModelValue(path(panel.getId(), ForumPostPanel.POSTED_BY), forumPost.getPostedBy()); + tester.assertModelValue(path(panel.getId(), ForumPostPanel.CONTENT), forumPost.getContent()); + tester.assertModelValue(path(panel.getId(), ForumPostPanel.DATE_CREATED), forumPost.getDateCreated()); } private void startPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanelTest.java b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanelTest.java index e4c0194d92..02ad031f6e 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanelTest.java @@ -49,12 +49,7 @@ public class SubmitForumReplyPanelTest extends SciProTest { ProjectThread thread = new ForumBuilder().createThread(); lenient() .when( - projectForumService.createReply( - any(ProjectThread.class), - any(User.class), - any(String.class), - anySet() - ) + projectForumService.createReply(any(ProjectThread.class), any(User.class), any(String.class), anySet()) ) .thenReturn(new ForumBuilder().createPost()); return thread; @@ -70,12 +65,7 @@ public class SubmitForumReplyPanelTest extends SciProTest { formTester.submit(); } - private <A extends Serializable> void startPanel( - A thread, - se.su.dsv.scipro.forum.ForumThread<A> forumThread - ) { - panel = tester.startComponentInPage( - new SubmitForumReplyPanel<>("panel", Model.of(thread), forumThread) - ); + private <A extends Serializable> void startPanel(A thread, se.su.dsv.scipro.forum.ForumThread<A> forumThread) { + panel = tester.startComponentInPage(new SubmitForumReplyPanel<>("panel", Model.of(thread), forumThread)); } } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanelTest.java b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanelTest.java index a5d2b60309..82c893e095 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanelTest.java @@ -84,10 +84,7 @@ public class SubmitForumThreadPanelTest extends SciProTest { private void startPanel() { panel = tester.startComponentInPage( - new SubmitForumThreadPanel<>( - "panel", - new ProjectForum(projectForumService, Model.of(project)) - ) + new SubmitForumThreadPanel<>("panel", new ProjectForum(projectForumService, Model.of(project))) ); } } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanelTest.java b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanelTest.java index a297b10044..89f646f576 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanelTest.java @@ -56,8 +56,6 @@ public class ThreadReadStatePanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new ThreadReadStatePanel("panel", Model.of(forumThread)) - ); + panel = tester.startComponentInPage(new ThreadReadStatePanel("panel", Model.of(forumThread))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanelTest.java index 5777e21c00..8c99db6c4f 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ThreadsOverviewPanelTest.java @@ -45,10 +45,7 @@ public class ThreadsOverviewPanelTest extends SciProTest { } }, (id, thread) -> { - final BookmarkablePageLink<Void> link = new BookmarkablePageLink<>( - id, - InternalErrorPage.class - ); + final BookmarkablePageLink<Void> link = new BookmarkablePageLink<>(id, InternalErrorPage.class); return link; } ) @@ -56,11 +53,7 @@ public class ThreadsOverviewPanelTest extends SciProTest { } private ForumThread createThread() { - User bob = User.builder() - .firstName("Bob") - .lastName("the Builder") - .emailAddress("bob@building.com") - .build(); + User bob = User.builder().firstName("Bob").lastName("the Builder").emailAddress("bob@building.com").build(); ForumPost post = new ForumPost(); post.setPostedBy(bob); ForumThread groupForumThread = new ForumThread(); diff --git a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanelTest.java b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanelTest.java index 3e1226fa3b..a28c9c6f3e 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanelTest.java @@ -49,9 +49,7 @@ public class ViewForumThreadPanelTest extends SciProTest { .build(); DomainObjects.injectId(project, 1L); - lenient() - .when(projectForumService.getPosts(isA(ProjectThread.class))) - .thenReturn(Arrays.asList(post, post)); + lenient().when(projectForumService.getPosts(isA(ProjectThread.class))).thenReturn(Arrays.asList(post, post)); } @Test @@ -96,18 +94,11 @@ public class ViewForumThreadPanelTest extends SciProTest { @Test public void testSubmittingReplyThroughUpperReplyPanelRendersWrapper() { when( - projectForumService.createReply( - any(ProjectThread.class), - any(User.class), - any(String.class), - anySet() - ) + projectForumService.createReply(any(ProjectThread.class), any(User.class), any(String.class), anySet()) ).thenReturn(post); startPanel(); - tester.clickLink( - path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.TOP_REPLY_LINK) - ); + tester.clickLink(path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.TOP_REPLY_LINK)); testFormSubmission(ViewForumThreadPanel.TOP_REPLY_PANEL); } @@ -115,9 +106,7 @@ public class ViewForumThreadPanelTest extends SciProTest { public void testClickTopReplyLinkShowsReplyPanelAndHidesLink() { startPanel(); - tester.clickLink( - path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.TOP_REPLY_LINK) - ); + tester.clickLink(path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.TOP_REPLY_LINK)); tester.assertComponentOnAjaxResponse(path(panel.getId(), ViewForumThreadPanel.WRAPPER)); boolean isPanelVisible = panel @@ -141,9 +130,7 @@ public class ViewForumThreadPanelTest extends SciProTest { new ReviewerInteractionForumThread(reviewerInteractionService) ) ); - tester.assertInvisible( - path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.BACK_LINK) - ); + tester.assertInvisible(path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.BACK_LINK)); } private ReviewerThread mockReviewerThread() { @@ -171,11 +158,7 @@ public class ViewForumThreadPanelTest extends SciProTest { private void startPanel() { panel = tester.startComponentInPage( - new ViewForumThreadPanel<>( - "panel", - Model.of(thread), - new ProjectForumThread(projectForumService) - ) + new ViewForumThreadPanel<>("panel", Model.of(thread), new ProjectForumThread(projectForumService)) ); } } diff --git a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanelTest.java b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanelTest.java index c46e1451e7..2056880ec8 100644 --- a/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/ViewProjectForumThreadPanelTest.java @@ -29,9 +29,7 @@ public class ViewProjectForumThreadPanelTest extends SciProTest { @Test public void testClickBackLinkRedirectsUser() { startPanel(); - tester.clickLink( - path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.BACK_LINK) - ); + tester.clickLink(path(panel.getId(), ViewForumThreadPanel.WRAPPER, ViewForumThreadPanel.BACK_LINK)); tester.assertRenderedPage(ProjectThreadedForumPage.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPageTest.java b/view/src/test/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPageTest.java index 0f9806abd2..02332d7a8c 100644 --- a/view/src/test/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPageTest.java @@ -28,9 +28,7 @@ public class AdminGeneralSettingsPageTest extends PageTest { setLoggedIn(true); setRoles(Roles.SYSADMIN); - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); page = tester.startPage(AdminGeneralSettingsPage.class); } @@ -71,9 +69,7 @@ public class AdminGeneralSettingsPageTest extends PageTest { } private GeneralSystemSettings captureSaveArgument() { - ArgumentCaptor<GeneralSystemSettings> captor = ArgumentCaptor.forClass( - GeneralSystemSettings.class - ); + ArgumentCaptor<GeneralSystemSettings> captor = ArgumentCaptor.forClass(GeneralSystemSettings.class); verify(generalSystemSettingsService).save(captor.capture()); return captor.getValue(); } diff --git a/view/src/test/java/se/su/dsv/scipro/grading/CriteriaPanelTest.java b/view/src/test/java/se/su/dsv/scipro/grading/CriteriaPanelTest.java index 1da86f7396..4c26f4119f 100644 --- a/view/src/test/java/se/su/dsv/scipro/grading/CriteriaPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/grading/CriteriaPanelTest.java @@ -23,24 +23,14 @@ import se.su.dsv.scipro.test.UserBuilder; public class CriteriaPanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); public static final Project SOME_PROJECT = Project.builder() .title("Grading report project") .projectType(BACHELOR) .startDate(LocalDate.now()) .build(); - public static final User SOME_USER = new UserBuilder() - .setFirstName("Author") - .setLastName("One") - .create(); - public static final User SOME_USER_2 = new UserBuilder() - .setFirstName("Author") - .setLastName("two") - .create(); + public static final User SOME_USER = new UserBuilder().setFirstName("Author").setLastName("One").create(); + public static final User SOME_USER_2 = new UserBuilder().setFirstName("Author").setLastName("two").create(); private CriteriaPanel panel; private SupervisorGradingReport gradingReport; @@ -81,10 +71,7 @@ public class CriteriaPanelTest extends SciProTest { public void displays_title_for_all_criteria() { startPanel(); - tester.assertLabel( - path(CRITERIA, 0, TITLE), - gradingReport.getGradingCriteria().get(0).getTitle() - ); + tester.assertLabel(path(CRITERIA, 0, TITLE), gradingReport.getGradingCriteria().get(0).getTitle()); } @Test @@ -125,9 +112,7 @@ public class CriteriaPanelTest extends SciProTest { } private static void setUpProject() { - SOME_PROJECT.setHeadSupervisor( - new UserBuilder().setFirstName("Head").setLastName("Supervisor").create() - ); + SOME_PROJECT.setHeadSupervisor(new UserBuilder().setFirstName("Head").setLastName("Supervisor").create()); SOME_PROJECT.addProjectParticipant(SOME_USER); SOME_PROJECT.addProjectParticipant(SOME_USER_2); SOME_PROJECT.addReviewer(new UserBuilder().create()); @@ -138,12 +123,7 @@ public class CriteriaPanelTest extends SciProTest { BACHELOR, LocalDate.of(2024, Month.JANUARY, 1) ); - gradingReportTemplate.addIndividualCriterion( - "Projektkriterium", - "Project criterion", - 1, - getPointTemplates(2) - ); + gradingReportTemplate.addIndividualCriterion("Projektkriterium", "Project criterion", 1, getPointTemplates(2)); gradingReportTemplate.addIndividualCriterion( "Individuellt kriterium", "Individual criterion", diff --git a/view/src/test/java/se/su/dsv/scipro/grading/FillOutReportPanelTest.java b/view/src/test/java/se/su/dsv/scipro/grading/FillOutReportPanelTest.java index 0054d67d1e..e8e9367d12 100644 --- a/view/src/test/java/se/su/dsv/scipro/grading/FillOutReportPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/grading/FillOutReportPanelTest.java @@ -49,10 +49,7 @@ public class FillOutReportPanelTest extends SciProTest { .headSupervisor(headSupervisorUser) .build(); finalSeminar.setProject(project); - GradingReportTemplate template = new GradingReportTemplate( - projectType, - LocalDate.of(2024, Month.JANUARY, 1) - ); + GradingReportTemplate template = new GradingReportTemplate(projectType, LocalDate.of(2024, Month.JANUARY, 1)); template.addProjectCriterion("U1", "U1", 1, getPointTemplates(1)); FinalSeminarOpposition finalSeminarOpposition = new FinalSeminarOpposition(); finalSeminarOpposition.setFinalSeminar(finalSeminar); @@ -78,10 +75,7 @@ public class FillOutReportPanelTest extends SciProTest { @Test public void has_criteria_list() { - tester.assertModelValue( - path(panel, FORM, GRADING_CRITERIA), - oppositionReport.getCriteria() - ); + tester.assertModelValue(path(panel, FORM, GRADING_CRITERIA), oppositionReport.getCriteria()); } @Test @@ -203,8 +197,6 @@ public class FillOutReportPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new FillOutReportPanel<>("id", Model.of(oppositionReport)) - ); + panel = tester.startComponentInPage(new FillOutReportPanel<>("id", Model.of(oppositionReport))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/grading/GradingReportPointsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/grading/GradingReportPointsPanelTest.java index 62651424a3..caa5835e3f 100644 --- a/view/src/test/java/se/su/dsv/scipro/grading/GradingReportPointsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/grading/GradingReportPointsPanelTest.java @@ -23,20 +23,13 @@ import se.su.dsv.scipro.test.UserBuilder; public class GradingReportPointsPanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); public static final Project SOME_PROJECT = Project.builder() .title("Grading report project") .projectType(BACHELOR) .startDate(LocalDate.now()) .build(); - public static final User SOME_USER = new UserBuilder() - .setFirstName("Author") - .setLastName("One") - .create(); + public static final User SOME_USER = new UserBuilder().setFirstName("Author").setLastName("One").create(); @Mock private GradeCalculator gradeCalculator; diff --git a/view/src/test/java/se/su/dsv/scipro/grading/SendToExaminerTest.java b/view/src/test/java/se/su/dsv/scipro/grading/SendToExaminerTest.java index 60c906e049..af5c1e93bd 100644 --- a/view/src/test/java/se/su/dsv/scipro/grading/SendToExaminerTest.java +++ b/view/src/test/java/se/su/dsv/scipro/grading/SendToExaminerTest.java @@ -87,26 +87,19 @@ public class SendToExaminerTest extends SciProTest { new Grade(Grade.Type.FAILING, "F") ) ); - when( - gradingService.getExaminations(TOKEN, project.getIdentifier(), biden.getIdentifier()) - ).thenReturn(List.of(pam, gw)); + when(gradingService.getExaminations(TOKEN, project.getIdentifier(), biden.getIdentifier())).thenReturn( + List.of(pam, gw) + ); // results for problem and method - when( - gradingService.getResult( - TOKEN, - project.getIdentifier(), - biden.getIdentifier(), - pam.id() - ) - ).thenReturn( + when(gradingService.getResult(TOKEN, project.getIdentifier(), biden.getIdentifier(), pam.id())).thenReturn( Either.right(Optional.of(new Result("P", LocalDate.of(2023, Month.JANUARY, 20)))) ); // results for graduation work - when( - gradingService.getResult(TOKEN, project.getIdentifier(), biden.getIdentifier(), gw.id()) - ).thenReturn(Either.right(Optional.empty())); + when(gradingService.getResult(TOKEN, project.getIdentifier(), biden.getIdentifier(), gw.id())).thenReturn( + Either.right(Optional.empty()) + ); LocalDate thesisUploadDate = LocalDate.of(2023, Month.FEBRUARY, 1); ZonedDateTime thesisUploadTimestamp = ZonedDateTime.of( @@ -132,12 +125,9 @@ public class SendToExaminerTest extends SciProTest { finalThesis.setTextMatchingDocument(textMatchingReference); when(finalThesisService.findByProject(project)).thenReturn(finalThesis); - SupervisorGradingReport supervisorGradingReport = new SupervisorGradingReportFactory() - .create(project, biden); + SupervisorGradingReport supervisorGradingReport = new SupervisorGradingReportFactory().create(project, biden); supervisorGradingReport.setMotivation("The best speech I ever heard"); - when(gradingReportService.getSupervisorGradingReport(project, biden)).thenReturn( - supervisorGradingReport - ); + when(gradingReportService.getSupervisorGradingReport(project, biden)).thenReturn(supervisorGradingReport); GradingReport.Grade grade = GradingReport.Grade.B; when(gradeCalculatorService.getSupervisorCalculator(project)).thenReturn(fixedGrade(grade)); @@ -145,9 +135,7 @@ public class SendToExaminerTest extends SciProTest { when(daisyAPI.sendPublication(anyLong(), any())).thenReturn(true); when(daisyAPI.sendPublicationFile(anyLong(), any(), any())).thenReturn(true); when(daisyAPI.getThesis(project.getIdentifier())).thenReturn(Optional.of(daisyThesis())); - when(gradingService.sendTextMatchingDocument(any(), anyLong(), any(), any())).thenReturn( - Either.right(null) - ); + when(gradingService.sendTextMatchingDocument(any(), anyLong(), any(), any())).thenReturn(Either.right(null)); when( gradingService.reportGrade( @@ -159,13 +147,11 @@ public class SendToExaminerTest extends SciProTest { thesisUploadDate ) ).thenReturn(Either.right(null)); - when( - gradingService.sendProtocol(any(), anyLong(), anyLong(), anyInt(), any(), any()) - ).thenReturn(Either.right(null)); - - tester.startComponentInPage( - new SendToExaminer("id", () -> project, () -> biden, () -> null) + when(gradingService.sendProtocol(any(), anyLong(), anyLong(), anyInt(), any(), any())).thenReturn( + Either.right(null) ); + + tester.startComponentInPage(new SendToExaminer("id", () -> project, () -> biden, () -> null)); FormTester formTester = tester.newFormTester(path("id", "form")); formTester.submit(); @@ -227,12 +213,7 @@ public class SendToExaminerTest extends SciProTest { ); tester.startComponentInPage( - new SendToExaminer( - "id", - () -> project, - () -> biden, - () -> "please check active participations" - ) + new SendToExaminer("id", () -> project, () -> biden, () -> "please check active participations") ); tester.assertBehavior(path("id", "form", "send"), JavascriptEventConfirmation.class); diff --git a/view/src/test/java/se/su/dsv/scipro/grading/SupervisorGradingReportPageTest.java b/view/src/test/java/se/su/dsv/scipro/grading/SupervisorGradingReportPageTest.java index f90564e316..5f7f5cfda6 100644 --- a/view/src/test/java/se/su/dsv/scipro/grading/SupervisorGradingReportPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/grading/SupervisorGradingReportPageTest.java @@ -27,11 +27,7 @@ import se.su.dsv.scipro.test.UserBuilder; public class SupervisorGradingReportPageTest extends SupervisorPageTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "bachelor", - "bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); public static final Project SOME_PROJECT = Project.builder() .title("some title") .projectType(BACHELOR) diff --git a/view/src/test/java/se/su/dsv/scipro/grading/TemplatePanelTest.java b/view/src/test/java/se/su/dsv/scipro/grading/TemplatePanelTest.java index 791c88eb1a..cfcdb6977a 100644 --- a/view/src/test/java/se/su/dsv/scipro/grading/TemplatePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/grading/TemplatePanelTest.java @@ -15,17 +15,9 @@ import se.su.dsv.scipro.system.ProjectType; public class TemplatePanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); public static final ProjectType MASTER = new ProjectType(DegreeType.MASTER, "Master", "Master"); - public static final ProjectType MAGISTER = new ProjectType( - DegreeType.MAGISTER, - "Magister", - "Magister" - ); + public static final ProjectType MAGISTER = new ProjectType(DegreeType.MAGISTER, "Magister", "Magister"); private TemplatePanel panel; @Test diff --git a/view/src/test/java/se/su/dsv/scipro/grading/ThesisApprovedPanelTest.java b/view/src/test/java/se/su/dsv/scipro/grading/ThesisApprovedPanelTest.java index c6e4d05706..1d1240281a 100644 --- a/view/src/test/java/se/su/dsv/scipro/grading/ThesisApprovedPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/grading/ThesisApprovedPanelTest.java @@ -38,8 +38,6 @@ public class ThesisApprovedPanelTest extends SciProTest { Mockito.when(gradingReportService.getTemplate(SOME_PROJECT)).thenReturn( new GradingReportTemplate(projectType, LocalDate.of(2024, Month.JANUARY, 1)) ); - panel = tester.startComponentInPage( - new ThesisApprovedPanel("panel", Model.of(SOME_PROJECT)) - ); + panel = tester.startComponentInPage(new ThesisApprovedPanel("panel", Model.of(SOME_PROJECT))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/group/AuthorGroupPageTest.java b/view/src/test/java/se/su/dsv/scipro/group/AuthorGroupPageTest.java index 6a864146be..d26475a49c 100644 --- a/view/src/test/java/se/su/dsv/scipro/group/AuthorGroupPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/group/AuthorGroupPageTest.java @@ -28,11 +28,7 @@ public class AuthorGroupPageTest extends PageTest { .emailAddress("john@example.com") .build(); supervisor.setId(1L); - student = User.builder() - .firstName("Stina") - .lastName("Student") - .emailAddress("stina@example.com") - .build(); + student = User.builder().firstName("Stina").lastName("Student").emailAddress("stina@example.com").build(); student.setId(2L); final Project project = Project.builder() .title("Some project") diff --git a/view/src/test/java/se/su/dsv/scipro/group/GroupDetailsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/group/GroupDetailsPanelTest.java index 091d1cdcfb..9a8b4b8d52 100644 --- a/view/src/test/java/se/su/dsv/scipro/group/GroupDetailsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/group/GroupDetailsPanelTest.java @@ -37,11 +37,7 @@ public class GroupDetailsPanelTest extends SciProTest { private void setUpGroup() { group = new Group(); group.setId(1L); - User user = User.builder() - .firstName("John") - .lastName("Smith") - .emailAddress("john@example.com") - .build(); + User user = User.builder().firstName("John").lastName("Smith").emailAddress("john@example.com").build(); group.setUser(user); group.setActive(true); } diff --git a/view/src/test/java/se/su/dsv/scipro/group/GroupsOverviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/group/GroupsOverviewPanelTest.java index a0b4a51120..0b43269c14 100644 --- a/view/src/test/java/se/su/dsv/scipro/group/GroupsOverviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/group/GroupsOverviewPanelTest.java @@ -30,11 +30,7 @@ public class GroupsOverviewPanelTest extends SciProTest { public void group_link() { mockExistingGroup(); startPanel(); - tester.assertBookmarkablePageLink( - path("id", "groupList", 0, "groupLink"), - SupervisorGroupPage.class, - mockPP() - ); + tester.assertBookmarkablePageLink(path("id", "groupList", 0, "groupLink"), SupervisorGroupPage.class, mockPP()); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/group/ViewGroupProjectsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/group/ViewGroupProjectsPanelTest.java index 4c87e1dad1..0d6fa5e346 100644 --- a/view/src/test/java/se/su/dsv/scipro/group/ViewGroupProjectsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/group/ViewGroupProjectsPanelTest.java @@ -86,11 +86,7 @@ public class ViewGroupProjectsPanelTest extends SciProTest { } private User createUser(long id, String firstName, String lastName, String emailAddress) { - User user = User.builder() - .firstName(firstName) - .lastName(lastName) - .emailAddress(emailAddress) - .build(); + User user = User.builder().firstName(firstName).lastName(lastName).emailAddress(emailAddress).build(); user.setId(id); return user; } diff --git a/view/src/test/java/se/su/dsv/scipro/latestevents/LatestEventsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/latestevents/LatestEventsPanelTest.java index 1eec54b3bf..001bd2830b 100644 --- a/view/src/test/java/se/su/dsv/scipro/latestevents/LatestEventsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/latestevents/LatestEventsPanelTest.java @@ -91,9 +91,9 @@ public class LatestEventsPanelTest extends SciProTest { pf.setFileReference(fileReference); List<ProjectFile> projectFiles = new ArrayList<>(); projectFiles.add(pf); - when( - projectFileService.latestUpload(isA(Project.class), eq(LatestEventsPanel.AMOUNT)) - ).thenReturn(projectFiles); + when(projectFileService.latestUpload(isA(Project.class), eq(LatestEventsPanel.AMOUNT))).thenReturn( + projectFiles + ); } private void addForumEvent() { @@ -107,8 +107,6 @@ public class LatestEventsPanelTest extends SciProTest { fp.setId(1L); List<Pair<ProjectThread, ForumPost>> forumPosts = new ArrayList<>(); forumPosts.add(new Pair<>(ft, fp)); - when( - projectForumService.latestPost(isA(Project.class), eq(LatestEventsPanel.AMOUNT)) - ).thenReturn(forumPosts); + when(projectForumService.latestPost(isA(Project.class), eq(LatestEventsPanel.AMOUNT))).thenReturn(forumPosts); } } diff --git a/view/src/test/java/se/su/dsv/scipro/loginlogout/panels/LoginPanelTest.java b/view/src/test/java/se/su/dsv/scipro/loginlogout/panels/LoginPanelTest.java index 89384ce7c7..1e430a844a 100644 --- a/view/src/test/java/se/su/dsv/scipro/loginlogout/panels/LoginPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/loginlogout/panels/LoginPanelTest.java @@ -21,11 +21,7 @@ public class LoginPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - user = User.builder() - .firstName("Kalle") - .lastName("Tester") - .emailAddress("kalle@dsv.su.se") - .build(); + user = User.builder().firstName("Kalle").lastName("Tester").emailAddress("kalle@dsv.su.se").build(); DomainObjects.injectId(user, 17L); startPanel(); } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanelTest.java index ec0efc9b6a..a386b5ae81 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanelTest.java @@ -19,9 +19,7 @@ public class AbstractAdminIdeaPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - Mockito.when(applicationPeriodService.findAll()).thenReturn( - new ArrayList<ApplicationPeriod>() - ); + Mockito.when(applicationPeriodService.findAll()).thenReturn(new ArrayList<ApplicationPeriod>()); } @Test @@ -34,16 +32,12 @@ public class AbstractAdminIdeaPanelTest extends SciProTest { ApplicationPeriod wanted = new ApplicationPeriod(); DomainObjects.injectId(wanted, 42L); - Mockito.when(applicationPeriodService.findAll()).thenReturn( - Collections.singletonList(wanted) - ); + Mockito.when(applicationPeriodService.findAll()).thenReturn(Collections.singletonList(wanted)); startPanel(); filterApplicationPeriod(wanted); - ArgumentCaptor<IdeaService.Filter> captor = ArgumentCaptor.forClass( - IdeaService.Filter.class - ); + ArgumentCaptor<IdeaService.Filter> captor = ArgumentCaptor.forClass(IdeaService.Filter.class); Mockito.verify(ideaService, Mockito.atLeastOnce()).count(captor.capture()); Assertions.assertEquals(wanted, captor.getValue().getApplicationPeriod()); } @@ -56,19 +50,14 @@ public class AbstractAdminIdeaPanelTest extends SciProTest { } private void filterApplicationPeriod(ApplicationPeriod wanted) { - FormComponent<?> applicationPeriodFilter = (FormComponent< - ? - >) tester.getComponentFromLastRenderedPage( + FormComponent<?> applicationPeriodFilter = (FormComponent<?>) tester.getComponentFromLastRenderedPage( path(panel, "filter", "applicationPeriodFilter") ); applicationPeriodFilter.setDefaultModelObject(wanted); tester .getRequest() .getPostParameters() - .setParameterValue( - applicationPeriodFilter.getInputName(), - String.valueOf(wanted.getId()) - ); + .setParameterValue(applicationPeriodFilter.getInputName(), String.valueOf(wanted.getId())); tester.executeAjaxEvent(path(panel, "filter", "applicationPeriodFilter"), "change"); } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanelTest.java index 9adcdfe7aa..b76620abb5 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanelTest.java @@ -64,12 +64,7 @@ public class AcceptIdeaDialogPanelTest extends SciProTest { private void validateStudentAcceptance(boolean b, String reason) { when( - ideaService.validateStudentAcceptance( - idea, - SciProSession.get().getUser(), - null, - applicationPeriod - ) + ideaService.validateStudentAcceptance(idea, SciProSession.get().getUser(), null, applicationPeriod) ).thenReturn(new Pair<>(b, reason)); } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanelTest.java index e08d949b83..a5da0c1857 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanelTest.java @@ -35,11 +35,7 @@ public class AdminIdeaDetailsCrudPanelTest extends SciProTest { @Test public void renders_as_student_idea() { - User author = User.builder() - .firstName("Anna") - .lastName("Author") - .emailAddress("anna@example.com") - .build(); + User author = User.builder().firstName("Anna").lastName("Author").emailAddress("anna@example.com").build(); author.setId(23452L); IdeaParticipation participation = new IdeaParticipation(author, idea); idea.addIdeaParticipation(participation); diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanelTest.java index 5b39a3335d..931f874496 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanelTest.java @@ -15,9 +15,6 @@ public class AdminIdeaHistoryPanelTest extends SciProTest { @Test public void test_data_table() { - tester.assertComponent( - path("id", AdminIdeaHistoryPanel.DATA_TABLE), - ExportableDataPanel.class - ); + tester.assertComponent(path("id", AdminIdeaHistoryPanel.DATA_TABLE), ExportableDataPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanelTest.java index ff739a7aaa..7c58dcddc3 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanelTest.java @@ -25,9 +25,7 @@ public class AdminIdeaOverviewPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - Mockito.when(applicationPeriodService.findAll()).thenReturn( - new ArrayList<ApplicationPeriod>() - ); + Mockito.when(applicationPeriodService.findAll()).thenReturn(new ArrayList<ApplicationPeriod>()); } @Test @@ -52,8 +50,7 @@ public class AdminIdeaOverviewPanelTest extends SciProTest { startPanel(); Panel dataTable = (Panel) panel.get(AbstractAdminIdeaPanel.DATA_TABLE); checkBoxIsAvailable = false; - dataTable.visitChildren(AjaxCheckBox.class, (checkbox, visit) -> checkBoxIsAvailable = true - ); + dataTable.visitChildren(AjaxCheckBox.class, (checkbox, visit) -> checkBoxIsAvailable = true); Assertions.assertTrue(checkBoxIsAvailable); } @@ -82,14 +79,9 @@ public class AdminIdeaOverviewPanelTest extends SciProTest { idea.setType(Idea.Type.STUDENT); idea.setProjectType(new ProjectType(ProjectType.BACHELOR, "bachelor", "bachelor")); Mockito.when( - ideaService.findAll( - ArgumentMatchers.any(IdeaService.Filter.class), - ArgumentMatchers.any(Pageable.class) - ) + ideaService.findAll(ArgumentMatchers.any(IdeaService.Filter.class), ArgumentMatchers.any(Pageable.class)) ).thenReturn(asList(idea)); - Mockito.when(ideaService.count(ArgumentMatchers.any(IdeaService.Filter.class))).thenReturn( - 1L - ); + Mockito.when(ideaService.count(ArgumentMatchers.any(IdeaService.Filter.class))).thenReturn(1L); } private void startPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaPopupPageTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaPopupPageTest.java index 786ed2db83..954d15d82b 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaPopupPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaPopupPageTest.java @@ -10,9 +10,7 @@ public class AdminIdeaPopupPageTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - Mockito.when(applicationPeriodService.findAll()).thenReturn( - new ArrayList<ApplicationPeriod>() - ); + Mockito.when(applicationPeriodService.findAll()).thenReturn(new ArrayList<ApplicationPeriod>()); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPageTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPageTest.java index b92d498b6b..f3aaa28097 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPageTest.java @@ -19,9 +19,7 @@ public class AdminIdeaStatisticsPageTest extends SciProTest { @BeforeEach public void startPage() { - Mockito.when( - applicationPeriodService.findAll(ArgumentMatchers.any(Pageable.class)) - ).thenReturn(createPage()); + Mockito.when(applicationPeriodService.findAll(ArgumentMatchers.any(Pageable.class))).thenReturn(createPage()); Mockito.when(applicationPeriodService.count()).thenReturn(1L); tester.startPage(AdminIdeaStatisticsPage.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordCrudPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordCrudPanelTest.java index 801591ec8e..8909e8d781 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordCrudPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordCrudPanelTest.java @@ -29,13 +29,9 @@ public class AdminKeywordCrudPanelTest extends SciProTest { Keyword keyword = new Keyword("Test keyword"); DomainObjects.injectId(keyword, 1L); List<Keyword> keywords = Collections.singletonList(keyword); - Mockito.when(keywordService.findAll(ArgumentMatchers.isA(Pageable.class))).thenReturn( - keywords - ); + Mockito.when(keywordService.findAll(ArgumentMatchers.isA(Pageable.class))).thenReturn(keywords); Mockito.when(keywordService.count()).thenReturn(1L); - Mockito.lenient() - .when(keywordService.findOne(ArgumentMatchers.anyLong())) - .thenReturn(keyword); + Mockito.lenient().when(keywordService.findOne(ArgumentMatchers.anyLong())).thenReturn(keyword); panel = tester.startComponentInPage(new AdminKeywordCrudPanel("panel")); } @@ -57,9 +53,7 @@ public class AdminKeywordCrudPanelTest extends SciProTest { AjaxCheckBox.class, (IVisitor<AjaxCheckBox, Object>) (component, visit) -> { tester.executeAjaxEvent(component.getPageRelativePath(), "click"); - ExportableDataPanel dataPanel = (ExportableDataPanel) panel.get( - AdminKeywordCrudPanel.DATA_TABLE - ); + ExportableDataPanel dataPanel = (ExportableDataPanel) panel.get(AdminKeywordCrudPanel.DATA_TABLE); tester.assertComponentOnAjaxResponse(dataPanel); visit.stop(); } @@ -73,9 +67,7 @@ public class AdminKeywordCrudPanelTest extends SciProTest { (IVisitor<AjaxLink, Object>) (component, visit) -> { if (component.getParent().getParent().getId().equals(EDIT_COLUMN_ID)) { tester.executeAjaxEvent(component.getPageRelativePath(), "click"); - tester.assertComponentOnAjaxResponse( - path(panel.getId(), AdminKeywordCrudPanel.DIALOG) - ); + tester.assertComponentOnAjaxResponse(path(panel.getId(), AdminKeywordCrudPanel.DIALOG)); } } ); @@ -88,9 +80,7 @@ public class AdminKeywordCrudPanelTest extends SciProTest { (IVisitor<AjaxLink, Object>) (component, visit) -> { if (component.getParent().getParent().getId().equals(DELETE_COLUMN_ID)) { tester.executeAjaxEvent(component.getPageRelativePath(), "click"); - Mockito.verify(keywordService, Mockito.times(1)).delete( - ArgumentMatchers.isA(Long.class) - ); + Mockito.verify(keywordService, Mockito.times(1)).delete(ArgumentMatchers.isA(Long.class)); tester.assertNoErrorMessage(); } } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordSwitchPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordSwitchPanelTest.java index ab4e9bcc7c..532d14e555 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordSwitchPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminKeywordSwitchPanelTest.java @@ -30,32 +30,21 @@ public class AdminKeywordSwitchPanelTest extends SciProTest { @Test public void testPanelContainsSwitchPanel() { - tester.assertComponent( - path(panel.getId(), AdminKeywordSwitchPanel.PANEL), - AdminKeywordCrudPanel.class - ); + tester.assertComponent(path(panel.getId(), AdminKeywordSwitchPanel.PANEL), AdminKeywordCrudPanel.class); } @Test public void testSwitchPanelShouldChangeOnLinkClick() { tester.clickLink(path(panel.getId(), AdminKeywordSwitchPanel.AREA_LINK)); - tester.assertComponent( - path(panel.getId(), AdminKeywordSwitchPanel.PANEL), - AdminResearchAreaCrudPanel.class - ); + tester.assertComponent(path(panel.getId(), AdminKeywordSwitchPanel.PANEL), AdminResearchAreaCrudPanel.class); tester.clickLink(path(panel.getId(), AdminKeywordSwitchPanel.KEYWORD_LINK)); - tester.assertComponent( - path(panel.getId(), AdminKeywordSwitchPanel.PANEL), - AdminKeywordCrudPanel.class - ); + tester.assertComponent(path(panel.getId(), AdminKeywordSwitchPanel.PANEL), AdminKeywordCrudPanel.class); } @Test public void testKeywordLinkIsNotEnabledWhenEnteringPage() { - boolean keywordEnabled = panel - .get(AdminKeywordSwitchPanel.KEYWORD_LINK) - .isEnabledInHierarchy(); + boolean keywordEnabled = panel.get(AdminKeywordSwitchPanel.KEYWORD_LINK).isEnabledInHierarchy(); Assertions.assertFalse(keywordEnabled); } @@ -66,9 +55,7 @@ public class AdminKeywordSwitchPanelTest extends SciProTest { tester.clickLink(path(panel.getId(), AdminKeywordSwitchPanel.AREA_LINK)); - boolean areaEnabledAfterClick = panel - .get(AdminKeywordSwitchPanel.AREA_LINK) - .isEnabledInHierarchy(); + boolean areaEnabledAfterClick = panel.get(AdminKeywordSwitchPanel.AREA_LINK).isEnabledInHierarchy(); Assertions.assertFalse(areaEnabledAfterClick); } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminManageIdeaPageTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminManageIdeaPageTest.java index 6f2e2cf519..f1ebc43299 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminManageIdeaPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminManageIdeaPageTest.java @@ -10,9 +10,7 @@ public class AdminManageIdeaPageTest extends SciProTest { @BeforeEach public void createSettings() { - Mockito.when(applicationPeriodService.findAll()).thenReturn( - new ArrayList<ApplicationPeriod>() - ); + Mockito.when(applicationPeriodService.findAll()).thenReturn(new ArrayList<ApplicationPeriod>()); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminProgramPageTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminProgramPageTest.java index 247b2d0569..468c65a143 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminProgramPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminProgramPageTest.java @@ -22,9 +22,7 @@ public class AdminProgramPageTest extends PageTest { program.setCode("sp"); program.setId(1L); - when(programService.findAll(isA(Pageable.class))).thenReturn( - Collections.singletonList(program) - ); + when(programService.findAll(isA(Pageable.class))).thenReturn(Collections.singletonList(program)); when(programService.count()).thenReturn(1L); page = tester.startPage(AdminProgramPage.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanelTest.java index c8c9333b00..9c9e96f2ab 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanelTest.java @@ -16,9 +16,6 @@ public class AdminResearchAreaCrudPanelTest extends SciProTest { @Test public void test_datatable() { - tester.assertComponent( - path(panel.getId(), AdminResearchAreaCrudPanel.DATA_TABLE), - ExportableDataPanel.class - ); + tester.assertComponent(path(panel.getId(), AdminResearchAreaCrudPanel.DATA_TABLE), ExportableDataPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanelTest.java index 284ac2f443..f820f43dbc 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanelTest.java @@ -20,9 +20,7 @@ public class AdminResearchAreaEditPanelTest extends SciProTest { public void setUp() throws Exception { area = new ResearchArea(); keyword = new Keyword("k"); - when(keywordService.findByResearchArea(area)).thenReturn( - Collections.singletonList(keyword) - ); + when(keywordService.findByResearchArea(area)).thenReturn(Collections.singletonList(keyword)); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanelTest.java index 9d55e52b0b..5881ab56f7 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanelTest.java @@ -11,16 +11,11 @@ public class AdminResearchAreaKeywordPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - tester.startComponentInPage( - new AdminResearchAreaKeywordPanel("id", new Model<>(new ResearchArea())) - ); + tester.startComponentInPage(new AdminResearchAreaKeywordPanel("id", new Model<>(new ResearchArea()))); } @Test public void test_data_table() { - tester.assertComponent( - path("id", AdminResearchAreaKeywordPanel.DATA_TABLE), - ExportableDataPanel.class - ); + tester.assertComponent(path("id", AdminResearchAreaKeywordPanel.DATA_TABLE), ExportableDataPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanelTest.java index 27d03ca901..e08adaa763 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanelTest.java @@ -11,16 +11,11 @@ public class AdminResearchAreaSupervisorPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - tester.startComponentInPage( - new AdminResearchAreaSupervisorPanel("id", new Model<>(new ResearchArea())) - ); + tester.startComponentInPage(new AdminResearchAreaSupervisorPanel("id", new Model<>(new ResearchArea()))); } @Test public void test_data_table() { - tester.assertComponent( - path("id", AdminResearchAreaSupervisorPanel.DATA_TABLE), - ExportableDataPanel.class - ); + tester.assertComponent(path("id", AdminResearchAreaSupervisorPanel.DATA_TABLE), ExportableDataPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/match/IdeaExportPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/IdeaExportPanelTest.java index c7e6f80f47..ea5ff8fff6 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/IdeaExportPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/IdeaExportPanelTest.java @@ -45,10 +45,7 @@ public class IdeaExportPanelTest extends SciProTest { start_panel(idea); // then - Assertions.assertFalse( - panel.isVisibleInHierarchy(), - "Panel is visible when idea is not exported" - ); + Assertions.assertFalse(panel.isVisibleInHierarchy(), "Panel is visible when idea is not exported"); } @Test @@ -64,10 +61,7 @@ public class IdeaExportPanelTest extends SciProTest { start_panel(idea); // then - Assertions.assertFalse( - panel.isVisibleInHierarchy(), - "Panel is visible when idea was successfully exported" - ); + Assertions.assertFalse(panel.isVisibleInHierarchy(), "Panel is visible when idea was successfully exported"); } @Test @@ -107,10 +101,7 @@ public class IdeaExportPanelTest extends SciProTest { String renderedReason = tester .getComponentFromLastRenderedPage(path(panel, "reason")) .getDefaultModelObjectAsString(); - assertTrue( - renderedReason.contains(reason), - "Rendered reason does not contain export failure reason" - ); + assertTrue(renderedReason.contains(reason), "Rendered reason does not contain export failure reason"); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPageTest.java b/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPageTest.java index ea060b0aba..fc02509226 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPageTest.java @@ -20,9 +20,7 @@ public class ProjectIdeaSubmissionPageTest extends PageTest { applicationPeriod.setId(1L); User user = new UserBuilder().create(); setLoggedInAs(user); - Mockito.lenient() - .when(userService.findOne(ArgumentMatchers.isA(Long.class))) - .thenReturn(user); + Mockito.lenient().when(userService.findOne(ArgumentMatchers.isA(Long.class))).thenReturn(user); Mockito.lenient() .when(applicationPeriodService.findOne(ArgumentMatchers.anyLong())) .thenReturn(applicationPeriod); diff --git a/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanelTest.java index c21d56a3b9..f3d54949e0 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanelTest.java @@ -41,9 +41,9 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { setLoggedInAs(user); idea = createIdea(2, 2); - when( - applicationPeriodService.getTypesForStudent(idea.getApplicationPeriod(), user) - ).thenReturn(new ArrayList<>(idea.getApplicationPeriod().getProjectTypes())); + when(applicationPeriodService.getTypesForStudent(idea.getApplicationPeriod(), user)).thenReturn( + new ArrayList<>(idea.getApplicationPeriod().getProjectTypes()) + ); when(applicationPeriodService.isOpen(idea.getApplicationPeriod())).thenReturn(true); } @@ -64,9 +64,7 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { @Test public void submit_form_without_selecting_partner_on_bachelor_level_passes_if_exemption_exists() { - when( - applicationPeriodService.hasIdeaSizeExemption(eq(user), any(ApplicationPeriod.class)) - ).thenReturn(true); + when(applicationPeriodService.hasIdeaSizeExemption(eq(user), any(ApplicationPeriod.class))).thenReturn(true); startPanel(idea); fillInFormAndSubmit(); tester.assertNoErrorMessage(); @@ -83,13 +81,9 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { @Test public void submit_form_when_co_author_already_participating_on_another_idea() { User coAuthor = mockCoAuthor(); - when( - ideaService.authorParticipatingOnOtherActiveIdea( - coAuthor, - idea.getApplicationPeriod(), - idea - ) - ).thenReturn(true); + when(ideaService.authorParticipatingOnOtherActiveIdea(coAuthor, idea.getApplicationPeriod(), idea)).thenReturn( + true + ); startPanel(idea); fillInFormAndSubmit(coAuthor.getId(), true); assertSpecificFeedback( @@ -102,9 +96,9 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { public void submit_form_when_project_type_max_authors_is_exceeded_fails() { User coAuthor = mockCoAuthor(); final Idea masterIdea = createIdea(1, 1); - when( - applicationPeriodService.getTypesForStudent(masterIdea.getApplicationPeriod(), user) - ).thenReturn(new ArrayList<>(masterIdea.getApplicationPeriod().getProjectTypes())); + when(applicationPeriodService.getTypesForStudent(masterIdea.getApplicationPeriod(), user)).thenReturn( + new ArrayList<>(masterIdea.getApplicationPeriod().getProjectTypes()) + ); startPanel(masterIdea); fillInFormAndSubmit(coAuthor.getId(), true); assertSpecificFeedback( @@ -117,17 +111,14 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { public void submit_form_without_checking_contract_checkbox() { startPanel(idea); fillInFormAndSubmit(mockCoAuthor().getId(), false); - assertSpecificFeedback( - feedbackPath("contractFeedback"), - panel.getString("CheckBoxRequiredValidator") - ); + assertSpecificFeedback(feedbackPath("contractFeedback"), panel.getString("CheckBoxRequiredValidator")); } @Test public void can_not_submit_idea_if_already_has_active_project() { - when( - projectService.getActiveProjectsByUserAndProjectType(eq(user), any(ProjectType.class)) - ).thenReturn(Collections.singletonList(new Project())); + when(projectService.getActiveProjectsByUserAndProjectType(eq(user), any(ProjectType.class))).thenReturn( + Collections.singletonList(new Project()) + ); startPanel(idea); fillInFormAndSubmit(); tester.assertFeedback( @@ -139,23 +130,17 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { @Test public void can_not_submit_idea_if_co_author_has_active_project() { final User coAuthor = mockCoAuthor(); - when( - projectService.getActiveProjectsByUserAndProjectType(eq(user), any(ProjectType.class)) - ).thenReturn(List.of()); - when( - projectService.getActiveProjectsByUserAndProjectType( - eq(coAuthor), - any(ProjectType.class) - ) - ).thenReturn(Collections.singletonList(new Project())); + when(projectService.getActiveProjectsByUserAndProjectType(eq(user), any(ProjectType.class))).thenReturn( + List.of() + ); + when(projectService.getActiveProjectsByUserAndProjectType(eq(coAuthor), any(ProjectType.class))).thenReturn( + Collections.singletonList(new Project()) + ); startPanel(idea); fillInFormAndSubmit(coAuthor.getId(), true); tester.assertFeedback( path(panel, "feedback"), - panel.getString( - "partner.already.has.an.active.project.on.this.level", - Model.of(coAuthor) - ) + panel.getString("partner.already.has.an.active.project.on.this.level", Model.of(coAuthor)) ); } @@ -205,12 +190,8 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { private void startPanel(Idea theIdea) { ResearchArea researchArea = new ResearchArea(); researchArea.setId(5L); - when(researchAreaService.findNotDeleted()).thenReturn( - Collections.singletonList(researchArea) - ); - panel = tester.startComponentInPage( - new ProjectIdeaSubmissionPanel("id", Model.of(theIdea), true) - ); + when(researchAreaService.findNotDeleted()).thenReturn(Collections.singletonList(researchArea)); + panel = tester.startComponentInPage(new ProjectIdeaSubmissionPanel("id", Model.of(theIdea), true)); } private Idea createIdea(int minAuthors, int maxAuthors) { @@ -242,9 +223,7 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest { } private void assertSpecificFeedback(final String feedbackPanelPath, final String... messages) { - final FeedbackPanel fbp = (FeedbackPanel) tester.getComponentFromLastRenderedPage( - feedbackPanelPath - ); + final FeedbackPanel fbp = (FeedbackPanel) tester.getComponentFromLastRenderedPage(feedbackPanelPath); final IModel<List<FeedbackMessage>> model = fbp.getFeedbackMessagesModel(); final Iterable<String> renderedMessages = model .getObject() diff --git a/view/src/test/java/se/su/dsv/scipro/match/ProjectMyIdeasPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/ProjectMyIdeasPanelTest.java index ea2e774bd2..405211a826 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/ProjectMyIdeasPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/ProjectMyIdeasPanelTest.java @@ -22,9 +22,6 @@ public class ProjectMyIdeasPanelTest extends SciProTest { @Test public void testContainsDataTablePanel() { - tester.assertComponent( - path(panel.getId(), ProjectMyIdeasPanel.DATA_TABLE), - ExportableDataPanel.class - ); + tester.assertComponent(path(panel.getId(), ProjectMyIdeasPanel.DATA_TABLE), ExportableDataPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanelTest.java index 97535a0473..b71b817a49 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanelTest.java @@ -18,10 +18,7 @@ public class StudentApplicationPeriodInfoPanelTest extends SciProTest { final ApplicationPeriod somePeriod = createSomePeriod(); when(applicationPeriodService.getCurrentStudentPeriods(any(User.class))).thenReturn( Collections.singletonList( - new ExemptedPeriod( - somePeriod, - List.of(ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA) - ) + new ExemptedPeriod(somePeriod, List.of(ApplicationPeriodExemption.Type.SUBMIT_STUDENT_IDEA)) ) ); final StudentApplicationPeriodInfoPanel panel = tester.startComponentInPage( @@ -48,9 +45,7 @@ public class StudentApplicationPeriodInfoPanelTest extends SciProTest { when(applicationPeriodService.getCurrentStudentPeriods(any(User.class))).thenReturn( Collections.singletonList(new OpenPeriod(somePeriod, Collections.emptyList())) ); - when( - ideaService.authorParticipatingOnActiveIdea(any(User.class), eq(somePeriod)) - ).thenReturn(true); + when(ideaService.authorParticipatingOnActiveIdea(any(User.class), eq(somePeriod))).thenReturn(true); final StudentApplicationPeriodInfoPanel panel = tester.startComponentInPage( StudentApplicationPeriodInfoPanel.class ); diff --git a/view/src/test/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanelTest.java index 89d096a2da..2462820277 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanelTest.java @@ -41,9 +41,7 @@ public class StudentIdeaStatusColumnPanelTest extends SciProTest { idea.addIdeaParticipation(new IdeaParticipation(new User(), idea)); idea.setApplicationPeriod(new ApplicationPeriod()); Mockito.when( - applicationPeriodService.courseStartHasPassed( - ArgumentMatchers.any(ApplicationPeriod.class) - ) + applicationPeriodService.courseStartHasPassed(ArgumentMatchers.any(ApplicationPeriod.class)) ).thenReturn(true); startPanel(); tester.assertLabel( diff --git a/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPageTest.java b/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPageTest.java index b36a271663..bac616456b 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPageTest.java @@ -12,9 +12,9 @@ public class SupervisorAllStudentIdeasPageTest extends PageTest { @Test public void shows_label_if_no_current_period() { - Mockito.when( - applicationPeriodService.getCurrentSupervisorPeriods(Mockito.any(User.class)) - ).thenReturn(Collections.emptyList()); + Mockito.when(applicationPeriodService.getCurrentSupervisorPeriods(Mockito.any(User.class))).thenReturn( + Collections.emptyList() + ); startPage(); @@ -24,12 +24,10 @@ public class SupervisorAllStudentIdeasPageTest extends PageTest { @Test public void displays_panel_with_current_period_if_there_is_one() { ApplicationPeriod applicationPeriod = createCurrentPeriod(); - Mockito.when( - applicationPeriodService.isVisibleForSupervisors(applicationPeriod) - ).thenReturn(true); - Mockito.when( - applicationPeriodService.getCurrentSupervisorPeriods(Mockito.any(User.class)) - ).thenReturn(Collections.singletonList(applicationPeriod)); + Mockito.when(applicationPeriodService.isVisibleForSupervisors(applicationPeriod)).thenReturn(true); + Mockito.when(applicationPeriodService.getCurrentSupervisorPeriods(Mockito.any(User.class))).thenReturn( + Collections.singletonList(applicationPeriod) + ); startPage(); diff --git a/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanelTest.java index 7a0c48dc23..72747cb125 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanelTest.java @@ -19,9 +19,7 @@ public class SupervisorAllStudentIdeasPanelTest extends SciProTest { @BeforeEach void setUp() { - when( - applicationPeriodService.isVisibleForSupervisors(any(ApplicationPeriod.class)) - ).thenReturn(true); + when(applicationPeriodService.isVisibleForSupervisors(any(ApplicationPeriod.class))).thenReturn(true); } @Test @@ -44,11 +42,7 @@ public class SupervisorAllStudentIdeasPanelTest extends SciProTest { public void renders_with_a_matched_student_idea() { Match match = new Match(); match.setSupervisor( - User.builder() - .firstName("Bob") - .lastName("Supervisor") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Supervisor").emailAddress("bob@example.com").build() ); final ProjectType projectType = new ProjectType(); final Idea matchedIdea = new Idea(); diff --git a/view/src/test/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanelTest.java index e3486059e6..e86cfd772f 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanelTest.java @@ -52,8 +52,6 @@ public class SupervisorEditIdeaPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new SupervisorEditIdeaPanel("id", Model.of(new Idea()), true) - ); + panel = tester.startComponentInPage(new SupervisorEditIdeaPanel("id", Model.of(new Idea()), true)); } } diff --git a/view/src/test/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanelTest.java index 13ca9cb605..89586e7f73 100755 --- a/view/src/test/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/SupervisorIdeaDetailsPanelTest.java @@ -29,9 +29,7 @@ public class SupervisorIdeaDetailsPanelTest extends SciProTest { idea.setResearchArea(new ResearchArea()); ApplicationPeriod applicationPeriod = new ApplicationPeriod(); idea.setApplicationPeriod(applicationPeriod); - panel = tester.startComponentInPage( - new SupervisorIdeaDetailsPanel("panel", Model.of(idea)) - ); + panel = tester.startComponentInPage(new SupervisorIdeaDetailsPanel("panel", Model.of(idea))); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanelTest.java b/view/src/test/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanelTest.java index 1e2bc997eb..137603b491 100644 --- a/view/src/test/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanelTest.java @@ -21,8 +21,7 @@ import se.su.dsv.scipro.test.UserBuilder; public class SupervisorMyIdeasPanelTest extends SciProTest { private static final String TITLE_LINK = "id:dataTable:body:rows:1:cells:3:cell:link"; - private static final String FIRST_MEETING_LINK = - "id:dataTable:body:rows:1:cells:7:cell:label:link"; + private static final String FIRST_MEETING_LINK = "id:dataTable:body:rows:1:cells:7:cell:label:link"; private static final String EDIT_LINK = "id:dataTable:body:rows:1:cells:8:cell:link"; private static final String DELETE_LINK = "id:dataTable:body:rows:1:cells:10:cell:link"; private SupervisorMyIdeasPanel panel; @@ -35,9 +34,7 @@ public class SupervisorMyIdeasPanelTest extends SciProTest { setLoggedInAs(supervisorUser); idea = createIdea(); List<Idea> ideas = Collections.singletonList(idea); - when(ideaService.findAll(any(IdeaService.Filter.class), any(Pageable.class))).thenReturn( - ideas - ); + when(ideaService.findAll(any(IdeaService.Filter.class), any(Pageable.class))).thenReturn(ideas); when(ideaService.count(any(IdeaService.Filter.class))).thenReturn((long) ideas.size()); when(ideaService.getSelectionState(any(Idea.class))).thenReturn(SelectionState.AVAILABLE); startPanel(); @@ -100,9 +97,7 @@ public class SupervisorMyIdeasPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new SupervisorMyIdeasPanel("id", Model.of(new UserBuilder().create())) - ); + panel = tester.startComponentInPage(new SupervisorMyIdeasPanel("id", Model.of(new UserBuilder().create()))); } private Idea createIdea() { diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/AdminMilestoneSettingsPageTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/AdminMilestoneSettingsPageTest.java index 7bba04e45e..4339763c80 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/AdminMilestoneSettingsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/AdminMilestoneSettingsPageTest.java @@ -21,17 +21,11 @@ public class AdminMilestoneSettingsPageTest extends PageTest { @Test public void testPageContainsPhasePanel() { - tester.assertComponent( - AdminMileStoneSettingsPage.PHASE_SETTINGS, - MileStonePhaseAdminPanel.class - ); + tester.assertComponent(AdminMileStoneSettingsPage.PHASE_SETTINGS, MileStonePhaseAdminPanel.class); } @Test public void testPageContainsActivityPanel() { - tester.assertComponent( - AdminMileStoneSettingsPage.MILESTONE_SETTINGS, - MileStoneActivityAdminPanel.class - ); + tester.assertComponent(AdminMileStoneSettingsPage.MILESTONE_SETTINGS, MileStoneActivityAdminPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanelTest.java index ed4ff11d5a..2226495642 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanelTest.java @@ -35,14 +35,12 @@ public class EditMilestoneActivityPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - projectTypes = Collections.singletonList( - new ProjectType(ProjectType.BACHELOR, "bachelor", "master") - ); + projectTypes = Collections.singletonList(new ProjectType(ProjectType.BACHELOR, "bachelor", "master")); Mockito.when(projectTypeService.findAllActive()).thenReturn(projectTypes); MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "desc"); - Mockito.when( - mileStonePhaseTemplateService.findAll(ArgumentMatchers.isA(Sort.class)) - ).thenReturn(Collections.singletonList(phase)); + Mockito.when(mileStonePhaseTemplateService.findAll(ArgumentMatchers.isA(Sort.class))).thenReturn( + Collections.singletonList(phase) + ); activity = new MilestoneActivityTemplate( MilestoneActivityTemplate.Type.PROJECT, "Activity title", @@ -60,18 +58,12 @@ public class EditMilestoneActivityPanelTest extends SciProTest { @Test public void testPanelContainsFeedback() { - tester.assertComponent( - path(panel.getId(), EditMilestoneActivityPanel.FEEDBACK), - FeedbackPanel.class - ); + tester.assertComponent(path(panel.getId(), EditMilestoneActivityPanel.FEEDBACK), FeedbackPanel.class); } @Test public void testPanelContainsForm() { - tester.assertComponent( - path(panel.getId(), EditMilestoneActivityPanel.EDIT_FORM), - Form.class - ); + tester.assertComponent(path(panel.getId(), EditMilestoneActivityPanel.EDIT_FORM), Form.class); } @Test @@ -83,26 +75,17 @@ public class EditMilestoneActivityPanelTest extends SciProTest { @Test public void testFormContainsDescriptionArea() { tester.assertComponent(formPath(EditMilestoneActivityPanel.DESCRIPTION), TextArea.class); - tester.assertModelValue( - formPath(EditMilestoneActivityPanel.DESCRIPTION), - activity.getDescription() - ); + tester.assertModelValue(formPath(EditMilestoneActivityPanel.DESCRIPTION), activity.getDescription()); } @Test public void testFormContainsCheckboxMultipleChoice() { - tester.assertComponent( - formPath(EditMilestoneActivityPanel.PROJECT_TYPES), - CheckBoxMultipleChoice.class - ); + tester.assertComponent(formPath(EditMilestoneActivityPanel.PROJECT_TYPES), CheckBoxMultipleChoice.class); } @Test public void testFormContainsEditableByStudentChoice() { - tester.assertComponent( - formPath(EditMilestoneActivityPanel.EDITABLE_BY_AUTHORS), - CheckBox.class - ); + tester.assertComponent(formPath(EditMilestoneActivityPanel.EDITABLE_BY_AUTHORS), CheckBox.class); } @Test @@ -118,9 +101,7 @@ public class EditMilestoneActivityPanelTest extends SciProTest { Assertions.assertFalse(tester.getMessages(FeedbackMessage.ERROR).isEmpty()); - tester.assertComponentOnAjaxResponse( - path(panel.getId(), EditMilestoneActivityPanel.FEEDBACK) - ); + tester.assertComponentOnAjaxResponse(path(panel.getId(), EditMilestoneActivityPanel.FEEDBACK)); } @Test @@ -165,9 +146,7 @@ public class EditMilestoneActivityPanelTest extends SciProTest { } private MilestoneActivityTemplate captureSave() { - ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass( - MilestoneActivityTemplate.class - ); + ArgumentCaptor<MilestoneActivityTemplate> captor = ArgumentCaptor.forClass(MilestoneActivityTemplate.class); Mockito.verify(milestoneActivityTemplateService).save( captor.capture(), ArgumentMatchers.isA(MilestonePhaseTemplate.class) @@ -184,9 +163,7 @@ public class EditMilestoneActivityPanelTest extends SciProTest { } private void startPanel(final MilestoneActivityTemplate activity) { - panel = tester.startComponentInPage( - new EditMilestoneActivityPanel("panel", Model.of(activity)) - ); + panel = tester.startComponentInPage(new EditMilestoneActivityPanel("panel", Model.of(activity))); } private String formPath(String... paths) { diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestonePhasePanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestonePhasePanelTest.java index 3108e8a0d9..5acec77cdb 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestonePhasePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/EditMilestonePhasePanelTest.java @@ -36,10 +36,7 @@ public class EditMilestonePhasePanelTest extends SciProTest { @Test public void testPanelContainsFeedback() { - tester.assertComponent( - path(panel.getId(), EditMileStonePhasePanel.FEEDBACK), - FeedbackPanel.class - ); + tester.assertComponent(path(panel.getId(), EditMileStonePhasePanel.FEEDBACK), FeedbackPanel.class); } @Test @@ -56,10 +53,7 @@ public class EditMilestonePhasePanelTest extends SciProTest { @Test public void testFormContainsDescriptionArea() { tester.assertComponent(formPath(EditMileStonePhasePanel.DESCRIPTION), TextArea.class); - tester.assertModelValue( - formPath(EditMileStonePhasePanel.DESCRIPTION), - phase.getDescription() - ); + tester.assertModelValue(formPath(EditMileStonePhasePanel.DESCRIPTION), phase.getDescription()); } @Test @@ -90,18 +84,14 @@ public class EditMilestonePhasePanelTest extends SciProTest { String titleString = "this is a title"; submitForm(titleString, "and this is a description"); - ArgumentCaptor<MilestonePhaseTemplate> captor = ArgumentCaptor.forClass( - MilestonePhaseTemplate.class - ); + ArgumentCaptor<MilestonePhaseTemplate> captor = ArgumentCaptor.forClass(MilestonePhaseTemplate.class); Mockito.verify(mileStonePhaseTemplateService).save(captor.capture()); Assertions.assertEquals(titleString, captor.getValue().getTitle()); } private void submitForm(String title, String desc) { - FormTester formTester = tester.newFormTester( - path(panel.getId(), EditMileStonePhasePanel.EDIT_FORM) - ); + FormTester formTester = tester.newFormTester(path(panel.getId(), EditMileStonePhasePanel.EDIT_FORM)); formTester.setValue(EditMileStonePhasePanel.TITLE, title); formTester.setValue(EditMileStonePhasePanel.DESCRIPTION, desc); formTester.submit(); diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/MilestoneActivityAdminPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/MilestoneActivityAdminPanelTest.java index 8c9016390b..b4ee0c09b4 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/MilestoneActivityAdminPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/MilestoneActivityAdminPanelTest.java @@ -31,22 +31,14 @@ public class MilestoneActivityAdminPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { activityList = Collections.singletonList( - new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT, - "Create final seminar", - "Description" - ) + new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT, "Create final seminar", "Description") ); phase = new MilestonePhaseTemplate("This is a title", "This is a description"); phaseList = Collections.singletonList(phase); + Mockito.when(mileStonePhaseTemplateService.findAll(ArgumentMatchers.isA(Sort.class))).thenReturn(phaseList); Mockito.when( - mileStonePhaseTemplateService.findAll(ArgumentMatchers.isA(Sort.class)) - ).thenReturn(phaseList); - Mockito.when( - milestoneActivityTemplateService.findByMileStonePhase( - ArgumentMatchers.isA(MilestonePhaseTemplate.class) - ) + milestoneActivityTemplateService.findByMileStonePhase(ArgumentMatchers.isA(MilestonePhaseTemplate.class)) ).thenReturn(activityList); startPanel(); } @@ -58,21 +50,13 @@ public class MilestoneActivityAdminPanelTest extends SciProTest { @Test public void testPanelContainsCreateNewLink() { - tester.assertComponent( - path(panel.getId(), MileStoneActivityAdminPanel.CREATE_LINK), - AjaxLink.class - ); + tester.assertComponent(path(panel.getId(), MileStoneActivityAdminPanel.CREATE_LINK), AjaxLink.class); } @Test public void testClickCreateNewOpensDialog() { - tester.executeAjaxEvent( - path(panel.getId(), MileStoneActivityAdminPanel.CREATE_LINK), - "click" - ); - tester.assertComponentOnAjaxResponse( - path(panel.getId(), MileStoneActivityAdminPanel.DIALOG) - ); + tester.executeAjaxEvent(path(panel.getId(), MileStoneActivityAdminPanel.CREATE_LINK), "click"); + tester.assertComponentOnAjaxResponse(path(panel.getId(), MileStoneActivityAdminPanel.DIALOG)); } @Test @@ -102,34 +86,23 @@ public class MilestoneActivityAdminPanelTest extends SciProTest { @Test public void testActivityContainsTitle() { - tester.assertLabel( - activityPath(MileStoneActivityAdminPanel.MILESTONE_TITLE), - activityList.get(0).getTitle() - ); + tester.assertLabel(activityPath(MileStoneActivityAdminPanel.MILESTONE_TITLE), activityList.get(0).getTitle()); } @Test public void testActivityContainsType() { - tester.assertLabel( - activityPath(MileStoneActivityAdminPanel.TYPE), - activityList.get(0).getType().toString() - ); + tester.assertLabel(activityPath(MileStoneActivityAdminPanel.TYPE), activityList.get(0).getType().toString()); } @Test public void testActivityContainsProjectTypes() { - tester.assertComponent( - activityPath(MileStoneActivityAdminPanel.PROJECT_TYPES), - DisplayMultiplesPanel.class - ); + tester.assertComponent(activityPath(MileStoneActivityAdminPanel.PROJECT_TYPES), DisplayMultiplesPanel.class); } @Test public void testClickEditOpensDialog() { tester.executeAjaxEvent(activityPath(MileStoneActivityAdminPanel.EDIT), "click"); - tester.assertComponentOnAjaxResponse( - path(panel.getId(), MileStoneActivityAdminPanel.DIALOG) - ); + tester.assertComponentOnAjaxResponse(path(panel.getId(), MileStoneActivityAdminPanel.DIALOG)); } @Test @@ -148,9 +121,7 @@ public class MilestoneActivityAdminPanelTest extends SciProTest { @Test public void testClickSwitchRendersContainer() { tester.executeAjaxEvent(activityPath(MileStoneActivityAdminPanel.STATE_SWITCH), "click"); - tester.assertComponentOnAjaxResponse( - path(panel.getId(), MileStoneActivityAdminPanel.LIST_CONTAINER) - ); + tester.assertComponentOnAjaxResponse(path(panel.getId(), MileStoneActivityAdminPanel.LIST_CONTAINER)); } private void startPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/MilestonePhaseAdminPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/MilestonePhaseAdminPanelTest.java index f2b027f175..54242f08dd 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/MilestonePhaseAdminPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/MilestonePhaseAdminPanelTest.java @@ -24,9 +24,7 @@ public class MilestonePhaseAdminPanelTest extends SciProTest { public void setUp() throws Exception { MilestonePhaseTemplate phase = new MilestonePhaseTemplate("title", "description"); phaseList = Collections.singletonList(phase); - Mockito.when( - mileStonePhaseTemplateService.findAll(ArgumentMatchers.isA(Sort.class)) - ).thenReturn(phaseList); + Mockito.when(mileStonePhaseTemplateService.findAll(ArgumentMatchers.isA(Sort.class))).thenReturn(phaseList); panel = tester.startComponentInPage(MileStonePhaseAdminPanel.class); } @@ -37,10 +35,7 @@ public class MilestonePhaseAdminPanelTest extends SciProTest { @Test public void testPanelContainsCreateNewLink() { - tester.assertComponent( - path(panel.getId(), MileStonePhaseAdminPanel.CREATE_LINK), - AjaxLink.class - ); + tester.assertComponent(path(panel.getId(), MileStonePhaseAdminPanel.CREATE_LINK), AjaxLink.class); } @Test @@ -82,18 +77,14 @@ public class MilestonePhaseAdminPanelTest extends SciProTest { MilestonePhaseTemplate phase = phaseList.get(0); boolean deleted = phase.isDeleted(); tester.executeAjaxEvent(phasePath(MileStonePhaseAdminPanel.STATE_SWITCH), "click"); - Mockito.verify(mileStonePhaseTemplateService, Mockito.times(1)).save( - ArgumentMatchers.eq(phase) - ); + Mockito.verify(mileStonePhaseTemplateService, Mockito.times(1)).save(ArgumentMatchers.eq(phase)); Assertions.assertNotSame(deleted, phase.isDeleted()); } @Test public void testClickSwitchRendersContainer() { tester.executeAjaxEvent(phasePath(MileStonePhaseAdminPanel.STATE_SWITCH), "click"); - tester.assertComponentOnAjaxResponse( - path(panel.getId(), MileStonePhaseAdminPanel.LIST_CONTAINER) - ); + tester.assertComponentOnAjaxResponse(path(panel.getId(), MileStonePhaseAdminPanel.LIST_CONTAINER)); } private String phasePath(String... paths) { diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/pages/SupervisorMilestonePageTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/pages/SupervisorMilestonePageTest.java index 55b0d7843a..2ca6364667 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/pages/SupervisorMilestonePageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/pages/SupervisorMilestonePageTest.java @@ -25,10 +25,7 @@ public class SupervisorMilestonePageTest extends PageTest { @BeforeEach public void setUp() throws Exception { - User headSupervisor = new UserBuilder() - .setFirstName("head") - .setLastName("supervisor") - .create(); + User headSupervisor = new UserBuilder().setFirstName("head").setLastName("supervisor").create(); User student = new UserBuilder().setFirstName("author").setLastName("1").create(); User student2 = new UserBuilder().setFirstName("author").setLastName("2").create(); project = Project.builder() @@ -39,9 +36,7 @@ public class SupervisorMilestonePageTest extends PageTest { .build(); DomainObjects.injectId(project, 1L); when(projectService.findOne(isA(Long.class))).thenReturn(project); - when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn( - true - ); + when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn(true); page = tester.startPage(SupervisorMileStonePage.class, getPageParameters()); } @@ -59,9 +54,6 @@ public class SupervisorMilestonePageTest extends PageTest { @Test public void testPageContainsOverviewPanel() { - tester.assertComponent( - SupervisorMileStonePage.OVERVIEW_PANEL, - MileStoneOverviewPanel.class - ); + tester.assertComponent(SupervisorMileStonePage.OVERVIEW_PANEL, MileStoneOverviewPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCheckBoxPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCheckBoxPanelTest.java index ee15c4883e..98320958d9 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCheckBoxPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCheckBoxPanelTest.java @@ -34,9 +34,7 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { .build(); DomainObjects.injectId(project, 1L); - MilestoneActivityTemplate activity = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT - ); + MilestoneActivityTemplate activity = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT); Milestone milestone = new Milestone(project, new MilestoneActivityTemplate()); DomainObjects.injectId(milestone, 2L); @@ -82,15 +80,9 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { @Test public void testClickOnUnconfirmedStudentCheckBoxChangesToConfirmed() { - MilestoneActivityTemplate activity = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.STUDENT - ); + MilestoneActivityTemplate activity = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.STUDENT); when( - mileStoneService.isConfirmed( - isA(Project.class), - isA(User.class), - isA(MilestoneActivityTemplate.class) - ) + mileStoneService.isConfirmed(isA(Project.class), isA(User.class), isA(MilestoneActivityTemplate.class)) ).thenReturn(false); startPanel(Model.of(activity), Model.of(new User())); @@ -105,15 +97,9 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { @Test public void testClickOnConfirmedStudentCheckBoxChangesToUnconfirmed() { - MilestoneActivityTemplate activity = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.STUDENT - ); + MilestoneActivityTemplate activity = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.STUDENT); when( - mileStoneService.isConfirmed( - isA(Project.class), - isA(User.class), - isA(MilestoneActivityTemplate.class) - ) + mileStoneService.isConfirmed(isA(Project.class), isA(User.class), isA(MilestoneActivityTemplate.class)) ).thenReturn(true); startPanel(Model.of(activity), Model.of(new User())); @@ -129,12 +115,8 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { @Test public void testClickOnProjectCheckBoxSendsCorrectNotificationEvent() { String checkBoxPath = path(panel.getId(), CHECKBOX); - MilestoneActivityTemplate activity = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT - ); - when( - mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(true); + MilestoneActivityTemplate activity = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT); + when(mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn(true); startPanel(Model.of(activity), MilestoneActivityTemplate.Type.PROJECT); tester.executeAjaxEvent(checkBoxPath, "click"); verify(mileStoneService, times(1)).setConfirmed( @@ -143,9 +125,7 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { eq(false) ); - when( - mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(false); + when(mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn(false); startPanel(Model.of(activity), MilestoneActivityTemplate.Type.PROJECT); tester.executeAjaxEvent(checkBoxPath, "click"); verify(mileStoneService, times(1)).setConfirmed( @@ -157,13 +137,9 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { @Test public void testShowSeminarLinkIfActivityHasSeminarExceptionAndMileStoneIsNotConfirmed() { - MilestoneActivityTemplate activity = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT - ); + MilestoneActivityTemplate activity = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT); activity.setCode(MilestoneActivityTemplate.CREATE_SEMINAR); - when( - mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(false); + when(mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn(false); startPanel(Model.of(activity), MilestoneActivityTemplate.Type.PROJECT); boolean isVisible = panel.get(CREATE_SEMINAR).isVisibleInHierarchy(); @@ -172,9 +148,7 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { @Test public void testHideSeminarLinkIfActivityDoesNotHaveSeminarException() { - when( - mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(false); + when(mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn(false); startPanel( Model.of(new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT)), MilestoneActivityTemplate.Type.PROJECT @@ -186,13 +160,9 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { @Test public void testHideSeminarLinkIfActivityUsWrongType() { - MilestoneActivityTemplate activity = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT - ); + MilestoneActivityTemplate activity = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT); activity.setCode(MilestoneActivityTemplate.CREATE_SEMINAR); - when( - mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(false); + when(mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn(false); startPanel(Model.of(activity), MilestoneActivityTemplate.Type.STUDENT); boolean isVisible = panel.get(CREATE_SEMINAR).isVisibleInHierarchy(); @@ -201,23 +171,16 @@ public class MilestoneCheckBoxPanelTest extends SciProTest { @Test public void testHideSeminarLinkIfMileStoneIsConfirmed() { - MilestoneActivityTemplate activity = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT - ); + MilestoneActivityTemplate activity = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT); activity.setCode(MilestoneActivityTemplate.CREATE_SEMINAR); - when( - mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(true); + when(mileStoneService.isConfirmed(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn(true); startPanel(Model.of(activity), MilestoneActivityTemplate.Type.PROJECT); boolean isVisible = panel.get(CREATE_SEMINAR).isVisibleInHierarchy(); assertFalse(isVisible); } - private void startPanel( - final IModel<MilestoneActivityTemplate> activityModel, - final IModel<User> studentModel - ) { + private void startPanel(final IModel<MilestoneActivityTemplate> activityModel, final IModel<User> studentModel) { panel = tester.startComponentInPage( new MileStoneCheckBoxPanel( "panel", diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCounterPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCounterPanelTest.java index c60593a6e2..8e24912e8c 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCounterPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneCounterPanelTest.java @@ -44,10 +44,7 @@ public class MilestoneCounterPanelTest extends SciProTest { @Test public void testIncludeLabelWithCompletedMileStones() { tester.assertComponent(path(panel.getId(), MileStoneCounterPanel.COMPLETED), Label.class); - tester.assertLabel( - path(panel.getId(), MileStoneCounterPanel.COMPLETED), - String.valueOf(COMPLETED) - ); + tester.assertLabel(path(panel.getId(), MileStoneCounterPanel.COMPLETED), String.valueOf(COMPLETED)); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneOverviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneOverviewPanelTest.java index 71e2359884..ae4ac72661 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneOverviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneOverviewPanelTest.java @@ -44,27 +44,19 @@ public class MilestoneOverviewPanelTest extends SciProTest { MilestoneActivityTemplate.Type.STUDENT ); activityList = Arrays.asList(projectActivity, studentActivity); - MilestonePhaseTemplate phase = new MilestonePhaseTemplate( - "This is a title", - "This is a description" - ); + MilestonePhaseTemplate phase = new MilestonePhaseTemplate("This is a title", "This is a description"); phaseList = Collections.singletonList(phase); Milestone milestone = new Milestone(project, new MilestoneActivityTemplate()); DomainObjects.injectId(milestone, 2L); - when(mileStonePhaseTemplateService.findAllActive(project.getStartDate())).thenReturn( - phaseList - ); + when(mileStonePhaseTemplateService.findAllActive(project.getStartDate())).thenReturn(phaseList); when( - milestoneActivityTemplateService.findActiveByPhase( - isA(MilestonePhaseTemplate.class), - eq(project) - ) + milestoneActivityTemplateService.findActiveByPhase(isA(MilestonePhaseTemplate.class), eq(project)) ).thenReturn(activityList); - when( - mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(milestone); + when(mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn( + milestone + ); startPanel(); } @@ -105,10 +97,7 @@ public class MilestoneOverviewPanelTest extends SciProTest { @Test public void phase_is_hidden_if_no_activities() { when( - milestoneActivityTemplateService.findActiveByPhase( - any(MilestonePhaseTemplate.class), - any(Project.class) - ) + milestoneActivityTemplateService.findActiveByPhase(any(MilestonePhaseTemplate.class), any(Project.class)) ).thenReturn(Collections.emptyList()); startPanel(); diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneProgressPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneProgressPanelTest.java index 2a1d878dd2..05f0a88456 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneProgressPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneProgressPanelTest.java @@ -50,12 +50,7 @@ public class MilestoneProgressPanelTest extends SciProTest { private void startPanel() { panel = tester.startComponentInPage( - new MileStoneProgressPanel( - "panel", - Model.of(3L), - MilestoneActivityTemplate.Type.PROJECT, - Model.of(project) - ) + new MileStoneProgressPanel("panel", Model.of(3L), MilestoneActivityTemplate.Type.PROJECT, Model.of(project)) ); } } diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneStatusPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneStatusPanelTest.java index f5f08731a3..176b162c91 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneStatusPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneStatusPanelTest.java @@ -36,18 +36,18 @@ public class MilestoneStatusPanelTest extends SciProTest { @Test public void testRenders() throws Exception { - when( - mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(getMileStone(true)); + when(mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn( + getMileStone(true) + ); startPanel(Model.of(new MilestoneActivityTemplate())); assert panel != null; } @Test public void testCheckIconIsVisibleWithConfirmedMileStone() { - when( - mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(getMileStone(true)); + when(mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn( + getMileStone(true) + ); startPanel(Model.of(new MilestoneActivityTemplate())); boolean isVisible = panel.get(MileStoneStatusPanel.CHECK_ICON).isVisibleInHierarchy(); @@ -56,9 +56,9 @@ public class MilestoneStatusPanelTest extends SciProTest { @Test public void testCheckIconIsInvisibleWithUnconfirmedMileStone() { - when( - mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(getMileStone(false)); + when(mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn( + getMileStone(false) + ); startPanel(Model.of(new MilestoneActivityTemplate())); boolean isVisible = panel.get(MileStoneStatusPanel.CHECK_ICON).isVisibleInHierarchy(); @@ -68,11 +68,7 @@ public class MilestoneStatusPanelTest extends SciProTest { @Test public void testCheckIconIsVisibleForStudentMilestones() { when( - mileStoneService.getMileStone( - isA(Project.class), - isA(User.class), - isA(MilestoneActivityTemplate.class) - ) + mileStoneService.getMileStone(isA(Project.class), isA(User.class), isA(MilestoneActivityTemplate.class)) ).thenReturn(getMileStone(true)); startPanel(Model.of(new MilestoneActivityTemplate()), Model.of(new User())); @@ -83,11 +79,7 @@ public class MilestoneStatusPanelTest extends SciProTest { @Test public void testCheckIconIsInvisibleForStudentMilestonesNotConfirmed() { when( - mileStoneService.getMileStone( - isA(Project.class), - isA(User.class), - isA(MilestoneActivityTemplate.class) - ) + mileStoneService.getMileStone(isA(Project.class), isA(User.class), isA(MilestoneActivityTemplate.class)) ).thenReturn(getMileStone(false)); startPanel(Model.of(new MilestoneActivityTemplate()), Model.of(new User())); @@ -97,9 +89,9 @@ public class MilestoneStatusPanelTest extends SciProTest { @Test public void testNotCheckedContainerIsVisibleIfMileStoneIsCorrectTypeAndUnconfirmed() { - when( - mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(getMileStone(false)); + when(mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn( + getMileStone(false) + ); startPanel(Model.of(new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT))); boolean isVisible = panel.get(MileStoneStatusPanel.NOT_CHECKED).isVisibleInHierarchy(); @@ -108,9 +100,9 @@ public class MilestoneStatusPanelTest extends SciProTest { @Test public void testNotCheckedContainerIsNotVisibleIfMilestoneIsConfirmed() { - when( - mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(getMileStone(true)); + when(mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn( + getMileStone(true) + ); startPanel(Model.of(new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT))); boolean isVisible = panel.get(MileStoneStatusPanel.NOT_CHECKED).isVisibleInHierarchy(); @@ -119,9 +111,9 @@ public class MilestoneStatusPanelTest extends SciProTest { @Test public void testNotCheckedContainerIsNotVisibleIfMilestoneIsWrongType() { - when( - mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class)) - ).thenReturn(getMileStone(false)); + when(mileStoneService.getMileStone(isA(Project.class), isA(MilestoneActivityTemplate.class))).thenReturn( + getMileStone(false) + ); startPanel(Model.of(new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.STUDENT))); boolean isVisible = panel.get(MileStoneStatusPanel.NOT_CHECKED).isVisibleInHierarchy(); @@ -136,19 +128,11 @@ public class MilestoneStatusPanelTest extends SciProTest { private void startPanel(final IModel<MilestoneActivityTemplate> activityModel) { panel = tester.startComponentInPage( - new MileStoneStatusPanel( - "panel", - Model.of(project), - activityModel, - MilestoneActivityTemplate.Type.PROJECT - ) + new MileStoneStatusPanel("panel", Model.of(project), activityModel, MilestoneActivityTemplate.Type.PROJECT) ); } - private void startPanel( - final IModel<MilestoneActivityTemplate> activityModel, - final IModel<User> studentModel - ) { + private void startPanel(final IModel<MilestoneActivityTemplate> activityModel, final IModel<User> studentModel) { panel = tester.startComponentInPage( new MileStoneStatusPanel( "panel", diff --git a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanelTest.java b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanelTest.java index 9a21cc2604..db164dcdae 100644 --- a/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanelTest.java @@ -47,10 +47,7 @@ public class MilestoneSummaryPanelTest extends SciProTest { .build(); DomainObjects.injectId(project, 1L); when( - milestoneActivityTemplateService.countActivities( - project.getProjectType(), - project.getStartDate() - ) + milestoneActivityTemplateService.countActivities(project.getProjectType(), project.getStartDate()) ).thenReturn(1L); MilestoneActivityTemplate notEditableByStudent = new MilestoneActivityTemplate(); @@ -60,10 +57,7 @@ public class MilestoneSummaryPanelTest extends SciProTest { editableByStudent.setEditableByStudents(true); when( - milestoneActivityTemplateService.getActivitiesInOrder( - MilestoneActivityTemplate.Type.PROJECT, - project - ) + milestoneActivityTemplateService.getActivitiesInOrder(MilestoneActivityTemplate.Type.PROJECT, project) ).thenReturn(Arrays.asList(notEditableByStudent, editableByStudent)); startPanel(); @@ -76,10 +70,7 @@ public class MilestoneSummaryPanelTest extends SciProTest { @Test public void testPanelContainsProjectProgress() { - tester.assertComponent( - path(panel, MilestoneSummaryPanel.PROJECT_PROGRESS), - MileStoneProgressPanel.class - ); + tester.assertComponent(path(panel, MilestoneSummaryPanel.PROJECT_PROGRESS), MileStoneProgressPanel.class); } @Test @@ -100,46 +91,30 @@ public class MilestoneSummaryPanelTest extends SciProTest { @Test public void testEachStudentContainsProgress() { - tester.assertComponent( - studentPath(MilestoneSummaryPanel.STUDENT_PROGRESS), - MileStoneProgressPanel.class - ); + tester.assertComponent(studentPath(MilestoneSummaryPanel.STUDENT_PROGRESS), MileStoneProgressPanel.class); } @Test public void testPanelContainsListOfUpcomingActivities() { - MilestoneActivityTemplate activity1 = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT - ); + MilestoneActivityTemplate activity1 = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT); DomainObjects.injectId(activity1, 1L); - MilestoneActivityTemplate activity2 = new MilestoneActivityTemplate( - MilestoneActivityTemplate.Type.PROJECT - ); + MilestoneActivityTemplate activity2 = new MilestoneActivityTemplate(MilestoneActivityTemplate.Type.PROJECT); DomainObjects.injectId(activity2, 2L); when( - milestoneActivityTemplateService.getActivitiesInOrder( - MilestoneActivityTemplate.Type.PROJECT, - project - ) + milestoneActivityTemplateService.getActivitiesInOrder(MilestoneActivityTemplate.Type.PROJECT, project) ).thenReturn(Arrays.asList(activity1, activity2)); when(mileStoneService.isConfirmed(isA(Project.class), eq(activity1))).thenReturn(true); when(mileStoneService.isConfirmed(isA(Project.class), eq(activity2))).thenReturn(false); startPanel(); - tester.assertModelValue( - path(panel, MilestoneSummaryPanel.UPCOMING_LIST), - Collections.singletonList(activity2) - ); + tester.assertModelValue(path(panel, MilestoneSummaryPanel.UPCOMING_LIST), Collections.singletonList(activity2)); } @Test public void invisibleWhenNoActiveActivities() { when( - milestoneActivityTemplateService.countActivities( - project.getProjectType(), - project.getStartDate() - ) + milestoneActivityTemplateService.countActivities(project.getProjectType(), project.getStartDate()) ).thenReturn(0L); startPanel(); assertFalse(panel.isVisibilityAllowed()); diff --git a/view/src/test/java/se/su/dsv/scipro/notes/NotesPageTest.java b/view/src/test/java/se/su/dsv/scipro/notes/NotesPageTest.java index 43b87fcc6b..98d2574cca 100644 --- a/view/src/test/java/se/su/dsv/scipro/notes/NotesPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/notes/NotesPageTest.java @@ -16,11 +16,7 @@ public class NotesPageTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - User user = User.builder() - .firstName("John") - .lastName("Rambo") - .emailAddress("rambo@gov.us") - .build(); + User user = User.builder().firstName("John").lastName("Rambo").emailAddress("rambo@gov.us").build(); Note note = new Note(); note.setUser(user); when(noteService.getNote(isA(User.class))).thenReturn(note); diff --git a/view/src/test/java/se/su/dsv/scipro/notifications/pages/SupervisorNotificationSettingsPageTest.java b/view/src/test/java/se/su/dsv/scipro/notifications/pages/SupervisorNotificationSettingsPageTest.java index 2c7cd73fa5..a421da9fc1 100644 --- a/view/src/test/java/se/su/dsv/scipro/notifications/pages/SupervisorNotificationSettingsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/notifications/pages/SupervisorNotificationSettingsPageTest.java @@ -42,9 +42,6 @@ public class SupervisorNotificationSettingsPageTest extends PageTest { @Test public void testPageContainsSettingsPanel() { - tester.assertComponent( - SupervisorNotificationSettingsPage.SETTINGS_PANEL, - NotificationSettingsPanel.class - ); + tester.assertComponent(SupervisorNotificationSettingsPage.SETTINGS_PANEL, NotificationSettingsPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanelTest.java b/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanelTest.java index aeaa01e7a2..d1d7c6bcca 100644 --- a/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanelTest.java @@ -37,11 +37,7 @@ public class NotificationDataPanelTest extends SciProTest { @Test public void test_mark_read() { // given - User user = new UserBuilder() - .setId(72L) - .setFirstName("Kalle") - .setLastName("Testare") - .create(); + User user = new UserBuilder().setId(72L).setFirstName("Kalle").setLastName("Testare").create(); setLoggedInAs(user); // when @@ -65,13 +61,11 @@ public class NotificationDataPanelTest extends SciProTest { } private void startPanel(Project project, User causedBy) { - when( - notificationService.findAll(any(NotificationService.Filter.class), any(Pageable.class)) - ).thenReturn(Collections.singletonList(createNotification(project, causedBy))); + when(notificationService.findAll(any(NotificationService.Filter.class), any(Pageable.class))).thenReturn( + Collections.singletonList(createNotification(project, causedBy)) + ); when(notificationService.count(any(NotificationService.Filter.class))).thenReturn(1L); - lenient() - .when(projectService.getMemberType(project, causedBy)) - .thenReturn(Member.Type.SUPERVISOR); + lenient().when(projectService.getMemberType(project, causedBy)).thenReturn(Member.Type.SUPERVISOR); panel = tester.startComponentInPage(NotificationDataPanel.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanelTest.java index 76b70271ca..eeb2c6275d 100644 --- a/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanelTest.java @@ -48,13 +48,9 @@ public class NotificationSettingsPanelTest extends SciProTest { NotificationSettingsPanel.MAIL_COMPILATION ); tester.assertComponent(componentPath, RadioGroup.class); - RadioGroup<?> radioGroup = (RadioGroup<?>) tester.getComponentFromLastRenderedPage( - componentPath - ); + RadioGroup<?> radioGroup = (RadioGroup<?>) tester.getComponentFromLastRenderedPage(componentPath); - FormTester formTester = tester.newFormTester( - path(panel.getId(), NotificationSettingsPanel.FORM) - ); + FormTester formTester = tester.newFormTester(path(panel.getId(), NotificationSettingsPanel.FORM)); formTester.select(NotificationSettingsPanel.MAIL_COMPILATION, mailCompilation ? 0 : 1); tester.executeAjaxEvent(radioGroup, "change"); @@ -63,10 +59,6 @@ public class NotificationSettingsPanelTest extends SciProTest { ArgumentCaptor<UserProfile> captor = ArgumentCaptor.forClass(UserProfile.class); verify(userProfileService).save(captor.capture()); - assertSame( - mailCompilation, - captor.getValue().isMailCompilation(), - "Mail compilation setting is wrong" - ); + assertSame(mailCompilation, captor.getValue().isMailCompilation(), "Mail compilation setting is wrong"); } } diff --git a/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanelTest.java b/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanelTest.java index d92ec19f14..d996eb6014 100644 --- a/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanelTest.java @@ -49,25 +49,15 @@ public class AbstractReceiverConfigurationPanelTest extends SciProTest { @Test public void testContainsListOfMembers() { - tester.assertComponent( - path(panel.getId(), AbstractReceiverConfigurationPanel.MEMBER_LIST), - ListView.class - ); - ListView<?> listView = (ListView<?>) panel.get( - AbstractReceiverConfigurationPanel.MEMBER_LIST - ); + tester.assertComponent(path(panel.getId(), AbstractReceiverConfigurationPanel.MEMBER_LIST), ListView.class); + ListView<?> listView = (ListView<?>) panel.get(AbstractReceiverConfigurationPanel.MEMBER_LIST); assertEquals(MEMBERS.size(), listView.getViewSize(), "Does not list every member"); } @Test public void testContainsAllEvents() { - tester.assertComponent( - path(panel.getId(), AbstractReceiverConfigurationPanel.EVENT_LIST), - ListView.class - ); - ListView<?> listView = (ListView<?>) panel.get( - AbstractReceiverConfigurationPanel.EVENT_LIST - ); + tester.assertComponent(path(panel.getId(), AbstractReceiverConfigurationPanel.EVENT_LIST), ListView.class); + ListView<?> listView = (ListView<?>) panel.get(AbstractReceiverConfigurationPanel.EVENT_LIST); assertEquals(EVENTS.length, listView.getViewSize(), "Does not list every event"); } @@ -129,11 +119,7 @@ public class AbstractReceiverConfigurationPanelTest extends SciProTest { // when when( - receiverConfiguration.isReceiving( - isA(Notification.Type.class), - isA(Enum.class), - isA(Member.Type.class) - ) + receiverConfiguration.isReceiving(isA(Notification.Type.class), isA(Enum.class), isA(Member.Type.class)) ).thenReturn(setting, !setting); setUp(); // Re-render the panel @@ -166,11 +152,7 @@ public class AbstractReceiverConfigurationPanelTest extends SciProTest { class TestPanel extends AbstractReceiverConfigurationPanel { public TestPanel(String id) { - super( - id, - AbstractReceiverConfigurationPanelTest.TYPE, - AbstractReceiverConfigurationPanelTest.EVENTS - ); + super(id, AbstractReceiverConfigurationPanelTest.TYPE, AbstractReceiverConfigurationPanelTest.EVENTS); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanelTest.java b/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanelTest.java index f8a031b250..be2f33f3b9 100644 --- a/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanelTest.java @@ -23,9 +23,7 @@ public class MemberDeliveryConfigurationPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - panel = tester.startComponentInPage( - new MemberDeliveryConfigurationPanel("panel", Member.Type.SUPERVISOR) - ); + panel = tester.startComponentInPage(new MemberDeliveryConfigurationPanel("panel", Member.Type.SUPERVISOR)); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanelTest.java b/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanelTest.java index c17ab3858b..1224116381 100644 --- a/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanelTest.java @@ -24,11 +24,7 @@ public class TypeDeliveryConfigurationPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { panel = tester.startComponentInPage( - new TypeDeliveryConfigurationPanel( - "panel", - Notification.Type.PROJECT, - ProjectEvent.Event.values() - ) + new TypeDeliveryConfigurationPanel("panel", Notification.Type.PROJECT, ProjectEvent.Event.values()) ); } @@ -56,12 +52,7 @@ public class TypeDeliveryConfigurationPanelTest extends SciProTest { @Test public void testEventRowContainsListOfDeliveryMethods() { tester.assertModelValue( - path( - panel, - TypeDeliveryConfigurationPanel.EVENTS, - 0, - TypeDeliveryConfigurationPanel.METHODS - ), + path(panel, TypeDeliveryConfigurationPanel.EVENTS, 0, TypeDeliveryConfigurationPanel.METHODS), Arrays.asList(DeliveryMethod.values()) ); } diff --git a/view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java b/view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java index 66334a64a5..44568bdb9c 100644 --- a/view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java @@ -54,9 +54,7 @@ public class CommentThreadPanelTest extends SciProTest { @Test public void testStartWithACommentThreadDoesNotCreateANewOne() { - when(commentThreadService.getCommentThread(review)).thenReturn( - new CommentThread(new PeerReview()) - ); + when(commentThreadService.getCommentThread(review)).thenReturn(new CommentThread(new PeerReview())); startPanel(); verify(commentThreadService, never()).save(any(CommentThread.class)); } @@ -115,9 +113,7 @@ public class CommentThreadPanelTest extends SciProTest { comment.setCreator(creatorUser); comment.setComment("comment"); List<Comment> commentList = Collections.singletonList(comment); - when(commentThreadService.getCommentThread(review)).thenReturn( - new CommentThread(new PeerReview()) - ); + when(commentThreadService.getCommentThread(review)).thenReturn(new CommentThread(new PeerReview())); when(commentService.findByCommentThread(isA(CommentThread.class))).thenReturn(commentList); return commentList; } diff --git a/view/src/test/java/se/su/dsv/scipro/peer/AdminPeerReviewPageTest.java b/view/src/test/java/se/su/dsv/scipro/peer/AdminPeerReviewPageTest.java index e3230859c5..c656d54e48 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/AdminPeerReviewPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/AdminPeerReviewPageTest.java @@ -31,11 +31,7 @@ public class AdminPeerReviewPageTest extends SciProTest { project.setTitle("My project"); project.setProjectType(projectType); - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); FileDescription fileDescription = new FileDescription(); fileDescription.setIdentifier("some_file.pdf"); @@ -48,22 +44,14 @@ public class AdminPeerReviewPageTest extends SciProTest { peerRequest.setRequester(user); peerRequest.setFile(fileReference); - User reviewerUser = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User reviewerUser = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); PeerReview peerReview = new PeerReview(); peerReview.setPeerRequest(peerRequest); peerReview.setDateCreated(new Date()); peerReview.setReviewer(reviewerUser); peerReview.setProject( - Project.builder() - .title("some reviewer project") - .projectType(projectType) - .startDate(LocalDate.now()) - .build() + Project.builder().title("some reviewer project").projectType(projectType).startDate(LocalDate.now()).build() ); when(peerReviewService.findOne(anyLong())).thenReturn(peerReview); diff --git a/view/src/test/java/se/su/dsv/scipro/peer/DisplayQuestionPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/DisplayQuestionPanelTest.java index 4bcb13f6ac..320f9e4e7a 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/DisplayQuestionPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/DisplayQuestionPanelTest.java @@ -33,9 +33,7 @@ public class DisplayQuestionPanelTest extends SciProTest { @Test public void throws_exception_with_unknown_answer() { - assertThrows(IllegalStateException.class, () -> - startPanel(ChecklistAnswerEnum.NO_ANSWER, "motivation") - ); + assertThrows(IllegalStateException.class, () -> startPanel(ChecklistAnswerEnum.NO_ANSWER, "motivation")); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/peer/ExpiredRequestWorkerTest.java b/view/src/test/java/se/su/dsv/scipro/peer/ExpiredRequestWorkerTest.java index 2659cf35ca..e2ccb20de5 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/ExpiredRequestWorkerTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/ExpiredRequestWorkerTest.java @@ -75,9 +75,7 @@ public class ExpiredRequestWorkerTest { project.setProjectType(pClass); expiredRequest.setProject(project); - final Date dateCreated = Date.from( - ZonedDateTime.now().minusDays(expirationDays + 1).toInstant() - ); + final Date dateCreated = Date.from(ZonedDateTime.now().minusDays(expirationDays + 1).toInstant()); expiredRequest.setDateCreated(dateCreated); currentRequest.setProject(project); currentRequest.setDateCreated(new Date()); @@ -90,9 +88,7 @@ public class ExpiredRequestWorkerTest { worker.doWork(); // then - ArgumentCaptor<PeerRequestExpiredEvent> captor = ArgumentCaptor.forClass( - PeerRequestExpiredEvent.class - ); + ArgumentCaptor<PeerRequestExpiredEvent> captor = ArgumentCaptor.forClass(PeerRequestExpiredEvent.class); verify(eventBus, times(1)).post(captor.capture()); PeerRequestExpiredEvent capture = captor.getValue(); diff --git a/view/src/test/java/se/su/dsv/scipro/peer/LatestReviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/LatestReviewPanelTest.java index 0e9b29f21b..3ad29817cc 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/LatestReviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/LatestReviewPanelTest.java @@ -58,11 +58,7 @@ public class LatestReviewPanelTest extends SciProTest { startPanel(DISPLAY_REVIEWS, PUBLIC_REVIEWS, getReviewList()); PageParameters parameters = new PageParameters(); parameters.add(PageParameterKeys.MAP.get(PeerReview.class), getReviewList().get(0).getId()); - tester.assertBookmarkablePageLink( - path(PANEL, LIST_VIEW, 0, REVIEW_LINK), - ViewPeerReviewPage.class, - parameters - ); + tester.assertBookmarkablePageLink(path(PANEL, LIST_VIEW, 0, REVIEW_LINK), ViewPeerReviewPage.class, parameters); } @Test @@ -71,24 +67,15 @@ public class LatestReviewPanelTest extends SciProTest { tester.assertDisabled(path(PANEL, LIST_VIEW, 0, REVIEW_LINK)); } - private void startPanel( - boolean displayReviews, - boolean reviewsActivated, - List<PeerReview> reviewList - ) { - lenient() - .when(peerReviewService.findAllCompleted(any(Pageable.class))) - .thenReturn(reviewList); + private void startPanel(boolean displayReviews, boolean reviewsActivated, List<PeerReview> reviewList) { + lenient().when(peerReviewService.findAllCompleted(any(Pageable.class))).thenReturn(reviewList); when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( createSettings(displayReviews, reviewsActivated) ); tester.startComponentInPage(new LatestReviewPanel(PANEL)); } - private GeneralSystemSettings createSettings( - boolean displayLatestReviews, - boolean reviewsActivated - ) { + private GeneralSystemSettings createSettings(boolean displayLatestReviews, boolean reviewsActivated) { GeneralSystemSettings settings = new GeneralSystemSettings(); settings.setPeerDisplayLatestReviews(displayLatestReviews); settings.setPublicReviewsActivated(reviewsActivated); diff --git a/view/src/test/java/se/su/dsv/scipro/peer/MyPeerPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/MyPeerPanelTest.java index d35d1dec21..fca11efd12 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/MyPeerPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/MyPeerPanelTest.java @@ -63,21 +63,14 @@ public class MyPeerPanelTest extends SciProTest { @Test public void review_list_shows_title_of_request_project() { - tester.assertLabel( - path(PANEL, REVIEW_LIST, 0, REVIEW_LINK, PROJECT_TITLE), - SOME_PROJECT_TITLE - ); + tester.assertLabel(path(PANEL, REVIEW_LIST, 0, REVIEW_LINK, PROJECT_TITLE), SOME_PROJECT_TITLE); } @Test public void click_on_review_title_takes_reviewer_to_the_review() { PageParameters parameters = new PageParameters(); parameters.add(PageParameterKeys.MAP.get(PeerReview.class), REVIEW_ID); - tester.assertBookmarkablePageLink( - path(PANEL, REVIEW_LIST, 0, REVIEW_LINK), - PeerPortalPage.class, - parameters - ); + tester.assertBookmarkablePageLink(path(PANEL, REVIEW_LIST, 0, REVIEW_LINK), PeerPortalPage.class, parameters); tester.assertBookmarkablePageLink( path(PANEL, REVIEW_LIST, 1, REVIEW_LINK), ViewPeerReviewPage.class, @@ -95,10 +88,7 @@ public class MyPeerPanelTest extends SciProTest { @Test public void review_list_shows_review_status() { - tester.assertModelValue( - path(PANEL, REVIEW_LIST, 0, REVIEW_STATUS), - getReviews().get(0).getStatus() - ); + tester.assertModelValue(path(PANEL, REVIEW_LIST, 0, REVIEW_STATUS), getReviews().get(0).getStatus()); } @Test @@ -154,9 +144,7 @@ public class MyPeerPanelTest extends SciProTest { private void mockExistingPeers(List<PeerRequest> requests, List<PeerReview> reviews) { User me = SciProSession.get().getUser(); when(peerRequestService.findByRequesterAndProject(me, SOME_PROJECT)).thenReturn(requests); - when(peerReviewService.findNonExpiredReviewsByProjectAuthor(me, SOME_PROJECT)).thenReturn( - reviews - ); + when(peerReviewService.findNonExpiredReviewsByProjectAuthor(me, SOME_PROJECT)).thenReturn(reviews); } private List<PeerReview> getReviews() { diff --git a/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalHeaderTest.java b/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalHeaderTest.java index db49e8b343..5d99208291 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalHeaderTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalHeaderTest.java @@ -120,15 +120,15 @@ public class PeerPortalHeaderTest extends SciProTest { } private void mockReviewInProgress() { - when( - peerReviewService.findInProgressReviews(SciProSession.get().getUser(), project) - ).thenReturn(Collections.singletonList(new PeerReview())); + when(peerReviewService.findInProgressReviews(SciProSession.get().getUser(), project)).thenReturn( + Collections.singletonList(new PeerReview()) + ); } private void mockNoReviewInProgress() { - when( - peerReviewService.findInProgressReviews(SciProSession.get().getUser(), project) - ).thenReturn(new ArrayList<PeerReview>()); + when(peerReviewService.findInProgressReviews(SciProSession.get().getUser(), project)).thenReturn( + new ArrayList<PeerReview>() + ); } private void startPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalPageTest.java b/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalPageTest.java index 7d26f11fb5..4339ac17b4 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/PeerPortalPageTest.java @@ -35,12 +35,10 @@ public class PeerPortalPageTest extends PageTest { setLoggedInAs(user); when(projectService.findOne(anyLong())).thenReturn(project); when(projectService.isPartOfProject(project, user)).thenReturn(true); - when( - peerRequestService.findByRequesterAndProject(SciProSession.get().getUser(), project) - ).thenReturn(Collections.singletonList(new PeerRequest())); - when(performReviewService.getInProgressReview(any(User.class), eq(project))).thenReturn( - null + when(peerRequestService.findByRequesterAndProject(SciProSession.get().getUser(), project)).thenReturn( + Collections.singletonList(new PeerRequest()) ); + when(performReviewService.getInProgressReview(any(User.class), eq(project))).thenReturn(null); } @Override @@ -58,17 +56,8 @@ public class PeerPortalPageTest extends PageTest { @Test public void assert_components() { startPage(); - tester.assertComponent( - path(AbstractPeerPortalPage.PEER_REVIEW_GUIDE_PANEL), - PeerReviewGuidePanel.class - ); - tester.assertComponent( - path(AbstractPeerPortalPage.MY_REQUEST_AND_REVIEWS_PANEL), - MyPeerPanel.class - ); - tester.assertComponent( - path(AbstractPeerPortalPage.LATEST_REVIEW_PANEL), - LatestReviewPanel.class - ); + tester.assertComponent(path(AbstractPeerPortalPage.PEER_REVIEW_GUIDE_PANEL), PeerReviewGuidePanel.class); + tester.assertComponent(path(AbstractPeerPortalPage.MY_REQUEST_AND_REVIEWS_PANEL), MyPeerPanel.class); + tester.assertComponent(path(AbstractPeerPortalPage.LATEST_REVIEW_PANEL), LatestReviewPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanelTest.java index da7b1d62dd..7eb6e57162 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanelTest.java @@ -33,11 +33,7 @@ public class PeerRequestSelectionPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - requestProject = Project.builder() - .title("Project") - .projectType(BACHELOR) - .startDate(LocalDate.now()) - .build(); + requestProject = Project.builder().title("Project").projectType(BACHELOR).startDate(LocalDate.now()).build(); startPanel(2L, 1L, new ArrayList<PeerReview>()); } @@ -94,9 +90,7 @@ public class PeerRequestSelectionPanelTest extends SciProTest { } private void expectErrorMessage(RuntimeException exception, String expected) { - when( - peerPortal.acceptReview(any(PeerRequest.class), any(User.class), any(Project.class)) - ).thenThrow(exception); + when(peerPortal.acceptReview(any(PeerRequest.class), any(User.class), any(Project.class))).thenThrow(exception); startPanel(2L, 1L, new ArrayList<PeerReview>()); tester.clickLink(path(PANEL, AVAILABLE_REQUESTS, 1, ACCEPT)); tester.assertErrorMessages(panel.getString(expected)); @@ -122,18 +116,12 @@ public class PeerRequestSelectionPanelTest extends SciProTest { ) ) .thenReturn(1L); - lenient() - .when(peerRequestService.count(any(PeerRequestService.Filter.class))) - .thenReturn(requests); - lenient() - .when(peerReviewService.count(any(PeerReviewService.Filter.class))) - .thenReturn(reviews); - when( - peerReviewService.findInProgressReviews(SciProSession.get().getUser(), SOME_PROJECT) - ).thenReturn(existingReviews); - panel = tester.startComponentInPage( - new PeerRequestSelectionPanel(PANEL, Model.of(SOME_PROJECT)) + lenient().when(peerRequestService.count(any(PeerRequestService.Filter.class))).thenReturn(requests); + lenient().when(peerReviewService.count(any(PeerReviewService.Filter.class))).thenReturn(reviews); + when(peerReviewService.findInProgressReviews(SciProSession.get().getUser(), SOME_PROJECT)).thenReturn( + existingReviews ); + panel = tester.startComponentInPage(new PeerRequestSelectionPanel(PANEL, Model.of(SOME_PROJECT))); } private PeerRequest createRequest() { diff --git a/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanelTest.java index 9dbb04e3a4..9dca9b50fb 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanelTest.java @@ -102,16 +102,12 @@ public class PeerRequestSubmissionPanelTest extends SciProTest { } private static File getTestFile() throws Exception { - URL resource = Thread.currentThread() - .getContextClassLoader() - .getResource("peer_request.txt"); + URL resource = Thread.currentThread().getContextClassLoader().getResource("peer_request.txt"); assert resource != null; return new File(resource.toURI()); } private void startPanel() { - panel = tester.startComponentInPage( - new PeerRequestSubmissionPanel("id", Model.of(project)) - ); + panel = tester.startComponentInPage(new PeerRequestSubmissionPanel("id", Model.of(project))); } } diff --git a/view/src/test/java/se/su/dsv/scipro/peer/PeerSummaryPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/PeerSummaryPanelTest.java index 6c537b6fd4..da5a05102c 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/PeerSummaryPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/PeerSummaryPanelTest.java @@ -27,31 +27,19 @@ public class PeerSummaryPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - User author = User.builder() - .firstName("author") - .lastName("author") - .emailAddress("author@author.com") - .build(); + User author = User.builder().firstName("author").lastName("author").emailAddress("author@author.com").build(); author.setId(4L); Date reviewReceivedDate = Date.from(ZonedDateTime.now().plusDays(1).toInstant()); reviewReceived = createReview( 1L, reviewReceivedDate, - User.builder() - .firstName("reviewer") - .lastName("1") - .emailAddress("reviewer@example.com") - .build() + User.builder().firstName("reviewer").lastName("1").emailAddress("reviewer@example.com").build() ); Date reviewPerformedDate = Date.from(ZonedDateTime.now().plusDays(3).toInstant()); reviewPerformed = createReview( 2L, reviewPerformedDate, - User.builder() - .firstName("reviewer") - .lastName("2") - .emailAddress("reviewer@example.com") - .build() + User.builder().firstName("reviewer").lastName("2").emailAddress("reviewer@example.com").build() ); project = Project.builder() .title("title") @@ -99,14 +87,8 @@ public class PeerSummaryPanelTest extends SciProTest { @Test public void lists_show_reviewer_name() { - tester.assertLabel( - path(PANEL, RECEIVED_REVIEWS, 0, REVIEWER), - reviewReceived.getReviewer().getFullName() - ); - tester.assertLabel( - path(PANEL, PERFORMED_REVIEWS, 0, REVIEWER), - reviewPerformed.getReviewer().getFullName() - ); + tester.assertLabel(path(PANEL, RECEIVED_REVIEWS, 0, REVIEWER), reviewReceived.getReviewer().getFullName()); + tester.assertLabel(path(PANEL, PERFORMED_REVIEWS, 0, REVIEWER), reviewPerformed.getReviewer().getFullName()); } @Test @@ -129,11 +111,7 @@ public class PeerSummaryPanelTest extends SciProTest { private void assertReviewPageLink(Class<? extends WebPage> pageClass) { PageParameters parameters = new PageParameters(); parameters.add(PageParameterKeys.MAP.get(PeerReview.class), reviewReceived.getId()); - tester.assertBookmarkablePageLink( - path(PANEL, RECEIVED_REVIEWS, 0, REVIEW_LINK), - pageClass, - parameters - ); + tester.assertBookmarkablePageLink(path(PANEL, RECEIVED_REVIEWS, 0, REVIEW_LINK), pageClass, parameters); } private List<PeerReview> receivedReviews() { diff --git a/view/src/test/java/se/su/dsv/scipro/peer/PerformReviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/PerformReviewPanelTest.java index e2b99be9f1..38173ec867 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/PerformReviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/PerformReviewPanelTest.java @@ -35,17 +35,9 @@ public class PerformReviewPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Name", "Description"); - Project project = Project.builder() - .title("Title") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + Project project = Project.builder().title("Title").projectType(projectType).startDate(LocalDate.now()).build(); PeerRequest peerRequest = new PeerRequest(); - User reviewer = User.builder() - .firstName("Kalle") - .lastName("Testare") - .emailAddress("kalle@dsv.su.se") - .build(); + User reviewer = User.builder().firstName("Kalle").lastName("Testare").emailAddress("kalle@dsv.su.se").build(); DomainObjects.injectId(reviewer, 23432L); peerReview = new PeerReview(); peerReview.setReviewer(reviewer); @@ -100,9 +92,7 @@ public class PerformReviewPanelTest extends SciProTest { @Test public void submit_review_shows_error_if_not_all_questions_are_answered() { - doThrow(MissingAnswerException.class) - .when(performReviewService) - .submit(peerReview, Optional.empty()); + doThrow(MissingAnswerException.class).when(performReviewService).submit(peerReview, Optional.empty()); startPanel(); FormTester formTester = tester.newFormTester(path(panel, REVIEW_FORM)); @@ -113,9 +103,7 @@ public class PerformReviewPanelTest extends SciProTest { @Test public void submit_review_shows_error_if_no_comment_provided() { - doThrow(TooShortCommentException.class) - .when(performReviewService) - .submit(peerReview, Optional.empty()); + doThrow(TooShortCommentException.class).when(performReviewService).submit(peerReview, Optional.empty()); startPanel(); FormTester formTester = tester.newFormTester(path(panel, REVIEW_FORM)); @@ -204,9 +192,7 @@ public class PerformReviewPanelTest extends SciProTest { } private static File getTestFile() throws Exception { - URL resource = Thread.currentThread() - .getContextClassLoader() - .getResource("peer_review.txt"); + URL resource = Thread.currentThread().getContextClassLoader().getResource("peer_review.txt"); assert resource != null; return new File(resource.toURI()); } diff --git a/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerPortalPageTest.java b/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerPortalPageTest.java index 2fcd355205..d2eaa02802 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerPortalPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerPortalPageTest.java @@ -32,9 +32,7 @@ public class ProjectPeerPortalPageTest extends PageTest { setLoggedInAs(user); when(projectService.findOne(anyLong())).thenReturn(project); when(projectService.isPartOfProject(project, user)).thenReturn(true); - when(performReviewService.getInProgressReview(any(User.class), eq(project))).thenReturn( - null - ); + when(performReviewService.getInProgressReview(any(User.class), eq(project))).thenReturn(null); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerStatsPageTest.java b/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerStatsPageTest.java index bb430e6bd9..ae6468f375 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerStatsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/ProjectPeerStatsPageTest.java @@ -38,9 +38,7 @@ public class ProjectPeerStatsPageTest extends PageTest { when(projectService.findOne(anyLong())).thenReturn(project); when(projectService.isPartOfProject(project, user)).thenReturn(true); - when(performReviewService.getInProgressReview(any(User.class), eq(project))).thenReturn( - null - ); + when(performReviewService.getInProgressReview(any(User.class), eq(project))).thenReturn(null); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/peer/RequestDetailsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/peer/RequestDetailsPanelTest.java index e77b34c285..757f0c3ea2 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/RequestDetailsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/RequestDetailsPanelTest.java @@ -11,11 +11,7 @@ import se.su.dsv.scipro.system.ProjectType; public class RequestDetailsPanelTest extends SciProTest { - public static final ProjectType SOME_PROJECT_TYPE = new ProjectType( - DegreeType.BACHELOR, - "bachelor", - "bachelor" - ); + public static final ProjectType SOME_PROJECT_TYPE = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); private RequestDetailsPanel panel; @Test @@ -34,11 +30,7 @@ public class RequestDetailsPanelTest extends SciProTest { private void startPanel() { PeerRequest peerRequest = new PeerRequest(); peerRequest.setProject( - Project.builder() - .title("title") - .projectType(SOME_PROJECT_TYPE) - .startDate(LocalDate.now()) - .build() + Project.builder().title("title").projectType(SOME_PROJECT_TYPE).startDate(LocalDate.now()).build() ); ChecklistTemplate checklistTemplate = new ChecklistTemplate(); checklistTemplate.addQuestion("question"); diff --git a/view/src/test/java/se/su/dsv/scipro/peer/ViewPeerReviewPageTest.java b/view/src/test/java/se/su/dsv/scipro/peer/ViewPeerReviewPageTest.java index 3f0e57effe..65728c156f 100644 --- a/view/src/test/java/se/su/dsv/scipro/peer/ViewPeerReviewPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/peer/ViewPeerReviewPageTest.java @@ -27,19 +27,11 @@ public class ViewPeerReviewPageTest extends PageTest { @BeforeEach public void setUp() throws Exception { - User reviewer = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User reviewer = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); DomainObjects.injectId(reviewer, 234L); ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - Project project = Project.builder() - .title("Title") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); + Project project = Project.builder().title("Title").projectType(projectType).startDate(LocalDate.now()).build(); project.setHeadSupervisor(reviewer); DomainObjects.injectId(project, 234234L); @@ -55,9 +47,7 @@ public class ViewPeerReviewPageTest extends PageTest { when(projectService.findOne(anyLong())).thenReturn(project); when(projectService.isPartOfProject(eq(project), any(User.class))).thenReturn(true); generalSystemSettings = new GeneralSystemSettings(); - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - generalSystemSettings - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(generalSystemSettings); setLoggedInAs(reviewer); } @@ -88,13 +78,7 @@ public class ViewPeerReviewPageTest extends PageTest { @Test public void random_user_can_not_see() { - setLoggedInAs( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + setLoggedInAs(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); generalSystemSettings.setPublicReviewsActivated(false); startPage(); @@ -104,13 +88,7 @@ public class ViewPeerReviewPageTest extends PageTest { @Test public void if_reviews_are_public_random_user_can_see() { - setLoggedInAs( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() - ); + setLoggedInAs(User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build()); generalSystemSettings.setPublicReviewsActivated(true); startPage(); diff --git a/view/src/test/java/se/su/dsv/scipro/profile/DisplayUserProfilePanelTest.java b/view/src/test/java/se/su/dsv/scipro/profile/DisplayUserProfilePanelTest.java index a9ab782fc8..f628e0d5ff 100644 --- a/view/src/test/java/se/su/dsv/scipro/profile/DisplayUserProfilePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/profile/DisplayUserProfilePanelTest.java @@ -38,11 +38,7 @@ public class DisplayUserProfilePanelTest extends SciProTest { ResearchArea it = new ResearchArea(); it.setTitle("IT"); - user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); user.setUnit(unit); user.setLanguages(Collections.singleton(swedish)); user.addResearchArea(it); diff --git a/view/src/test/java/se/su/dsv/scipro/profile/StudentProfileProgramPanelTest.java b/view/src/test/java/se/su/dsv/scipro/profile/StudentProfileProgramPanelTest.java index 6672122aa4..ef50e9bf85 100644 --- a/view/src/test/java/se/su/dsv/scipro/profile/StudentProfileProgramPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/profile/StudentProfileProgramPanelTest.java @@ -30,9 +30,7 @@ public class StudentProfileProgramPanelTest extends SciProTest { nip = new IdeaParticipation(user, new Idea()); nip.setProgram(program); - panel = tester.startComponentInPage( - new StudentProfileProgramPanel("id", Model.of(nip), false) - ); + panel = tester.startComponentInPage(new StudentProfileProgramPanel("id", Model.of(nip), false)); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/profile/UserLinkPanelTest.java b/view/src/test/java/se/su/dsv/scipro/profile/UserLinkPanelTest.java index 6e822b536f..fa19b9fe5d 100644 --- a/view/src/test/java/se/su/dsv/scipro/profile/UserLinkPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/profile/UserLinkPanelTest.java @@ -24,11 +24,7 @@ public class UserLinkPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); panel = tester.startComponentInPage(new UserLinkPanel("panel", Model.of(user))); } diff --git a/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectDetailsPageTest.java b/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectDetailsPageTest.java index 5ea207792c..f8dbdeb0aa 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectDetailsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectDetailsPageTest.java @@ -28,10 +28,7 @@ public class ProjectDetailsPageTest extends PageTest { private static final Long PROJECT_PP = 1L; - private static final User SOME_USER = new UserBuilder() - .setFirstName("Rolf") - .setLastName("Rolfsson") - .create(); + private static final User SOME_USER = new UserBuilder().setFirstName("Rolf").setLastName("Rolfsson").create(); private static final User SOME_SUPERVISOR = new UserBuilder() .setFirstName("head") .setLastName("supervisor") @@ -124,9 +121,7 @@ public class ProjectDetailsPageTest extends PageTest { private void mockGroup(long id) { Group group = new Group(); group.setId(id); - when(groupService.findAll(any(GroupService.Filter.class))).thenReturn( - Collections.singletonList(group) - ); + when(groupService.findAll(any(GroupService.Filter.class))).thenReturn(Collections.singletonList(group)); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectStartPageTest.java b/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectStartPageTest.java index c21eb1aa34..0b6a0c72d5 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectStartPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/pages/ProjectStartPageTest.java @@ -34,9 +34,7 @@ public class ProjectStartPageTest extends SciProTest { DomainObjects.injectId(project, 1L); when(projectService.getProjectsByUser(user)).thenReturn(Collections.singletonList(project)); - when(projectService.findAll(any(ProjectService.Filter.class))).thenReturn( - Arrays.asList(project, project) - ); + when(projectService.findAll(any(ProjectService.Filter.class))).thenReturn(Arrays.asList(project, project)); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/project/pages/SupervisorEditProjectPageTest.java b/view/src/test/java/se/su/dsv/scipro/project/pages/SupervisorEditProjectPageTest.java index e26e43d533..ef4dd649a6 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/pages/SupervisorEditProjectPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/pages/SupervisorEditProjectPageTest.java @@ -20,9 +20,7 @@ public class SupervisorEditProjectPageTest extends SupervisorPageTest { @Test public void not_head_supervisor_can_not_edit_project() { - setLoggedInAs( - User.builder().firstName("any").lastName("any").emailAddress("any@test.com").build() - ); + setLoggedInAs(User.builder().firstName("any").lastName("any").emailAddress("any@test.com").build()); startPage(); tester.assertRenderedPage(getHomePage()); } diff --git a/view/src/test/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanelTest.java b/view/src/test/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanelTest.java index 16d04708bc..5224c74b55 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanelTest.java @@ -20,9 +20,7 @@ public class ExternalResourcesPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - when(externalResourceService.findBy(bachelor)).thenReturn( - Collections.singletonList(createResource()) - ); + when(externalResourceService.findBy(bachelor)).thenReturn(Collections.singletonList(createResource())); tester.startComponentInPage(new ExternalResourcesPanel("id", Model.of(bachelor))); } @@ -38,9 +36,7 @@ public class ExternalResourcesPanelTest extends SciProTest { @Test public void is_hidden_if_no_resources_exists() { - when(externalResourceService.findBy(any(ProjectType.class))).thenReturn( - Collections.emptyList() - ); + when(externalResourceService.findBy(any(ProjectType.class))).thenReturn(Collections.emptyList()); tester.startComponentInPage(new ExternalResourcesPanel("id", Model.of(bachelor))); tester.assertInvisible("id"); } diff --git a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanelTest.java b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanelTest.java index 3b49a9cf40..8b3a5564c8 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectHeaderPanelTest.java @@ -51,10 +51,7 @@ public class ProjectHeaderPanelTest extends SciProTest { @Test public void testShowProjectLevel() { tester.assertComponent(panel(ProjectHeaderPanel.PROJECT_TYPE), Label.class); - tester.assertLabel( - panel(ProjectHeaderPanel.PROJECT_TYPE), - project.getProjectType().getName() - ); + tester.assertLabel(panel(ProjectHeaderPanel.PROJECT_TYPE), project.getProjectType().getName()); } @Test @@ -82,10 +79,7 @@ public class ProjectHeaderPanelTest extends SciProTest { startPanel(project); tester.assertVisible(panel(ProjectHeaderPanel.CO_SUPERVISOR_LIST)); - tester.assertModelValue( - panel(ProjectHeaderPanel.CO_SUPERVISOR_LIST), - Collections.singletonList(coSupervisor) - ); + tester.assertModelValue(panel(ProjectHeaderPanel.CO_SUPERVISOR_LIST), Collections.singletonList(coSupervisor)); } @Test @@ -101,10 +95,7 @@ public class ProjectHeaderPanelTest extends SciProTest { startPanel(project); tester.assertVisible(panel(ProjectHeaderPanel.REVIEWER_LIST)); - tester.assertModelValue( - panel(ProjectHeaderPanel.REVIEWER_LIST), - Collections.singletonList(reviewer) - ); + tester.assertModelValue(panel(ProjectHeaderPanel.REVIEWER_LIST), Collections.singletonList(reviewer)); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanelTest.java b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanelTest.java index 69f30d05ab..99572307f7 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanelTest.java @@ -57,9 +57,7 @@ public class ProjectSubTabMenuPanelTest extends SciProTest { @Test public void final_seminar_tab_is_visible_for_bachelor_project_that_has_final_seminar() { - when(finalSeminarService.findByProject(SOME_BACHELOR_PROJECT)).thenReturn( - new FinalSeminar() - ); + when(finalSeminarService.findByProject(SOME_BACHELOR_PROJECT)).thenReturn(new FinalSeminar()); assertVisible(ProjectSubTabMenuPanel.FINAL_SEMINAR, SOME_BACHELOR_PROJECT); } @@ -96,12 +94,7 @@ public class ProjectSubTabMenuPanelTest extends SciProTest { private ProjectSubTabMenuPanel startPanel(Project project) { return tester.startComponentInPage( - new ProjectSubTabMenuPanel( - "id", - AbstractProjectDetailsPage.class, - new PageParameters(), - () -> project - ) + new ProjectSubTabMenuPanel("id", AbstractProjectDetailsPage.class, new PageParameters(), () -> project) ); } } diff --git a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanelTest.java b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanelTest.java index ca080b9c75..7113730938 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanelTest.java @@ -35,27 +35,21 @@ public class ProjectTabMenuPanelTest extends SciProTest { @Test public void renders() throws Exception { setLoggedInAs(LOGGED_IN_USER); - when(projectService.getProjectsByUser(LOGGED_IN_USER)).thenReturn( - Collections.singletonList(SOME_PROJECT) - ); + when(projectService.getProjectsByUser(LOGGED_IN_USER)).thenReturn(Collections.singletonList(SOME_PROJECT)); assertNotNull(startPanel()); } @Test public void all_final_seminars_tab_is_visible_for_student_with_normal_projects() { setLoggedInAs(LOGGED_IN_USER); - when(projectService.getProjectsByUser(LOGGED_IN_USER)).thenReturn( - Collections.singletonList(SOME_PROJECT) - ); + when(projectService.getProjectsByUser(LOGGED_IN_USER)).thenReturn(Collections.singletonList(SOME_PROJECT)); assertVisible(ProjectTabMenuPanel.ALL_FINAL_SEMINARS); } @Test public void all_final_seminars_tab_is_not_visible_for_student_with_ICT4D_project() { setLoggedInAs(LOGGED_IN_USER); - when(projectService.getProjectsByUser(LOGGED_IN_USER)).thenReturn( - Collections.singletonList(ICT4D_PROJECT) - ); + when(projectService.getProjectsByUser(LOGGED_IN_USER)).thenReturn(Collections.singletonList(ICT4D_PROJECT)); assertNotVisible(ProjectTabMenuPanel.ALL_FINAL_SEMINARS); } @@ -85,8 +79,6 @@ public class ProjectTabMenuPanelTest extends SciProTest { } private ProjectTabMenuPanel startPanel() { - return tester.startComponentInPage( - new ProjectTabMenuPanel("id", AbstractProjectDetailsPage.class) - ); + return tester.startComponentInPage(new ProjectTabMenuPanel("id", AbstractProjectDetailsPage.class)); } } diff --git a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanelTest.java b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanelTest.java index b2c06e759c..40d4b99fec 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanelTest.java @@ -21,11 +21,7 @@ import se.su.dsv.scipro.test.ObjectMother; public class ProjectsOverviewPanelTest extends SciProTest { - public static final ProjectType BACHELOR = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "Bachelor" - ); + public static final ProjectType BACHELOR = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); private User author; private List<Project> projects; @@ -35,11 +31,7 @@ public class ProjectsOverviewPanelTest extends SciProTest { projects = Collections.singletonList(buildProject()); lenient().when(projectService.findAll(anyFilter())).thenReturn(projects); - author = User.builder() - .firstName("Kalle") - .lastName("Testare") - .emailAddress("kalle@dsv.su.se") - .build(); + author = User.builder().firstName("Kalle").lastName("Testare").emailAddress("kalle@dsv.su.se").build(); setLoggedInAs(author); } @@ -66,9 +58,7 @@ public class ProjectsOverviewPanelTest extends SciProTest { when(projectService.findByUserAndStatus(author, ProjectStatus.COMPLETED)).thenReturn( Collections.singletonList(ObjectMother.SOME_PROJECT) ); - when(projectService.findByUserAndStatus(author, ProjectStatus.ACTIVE)).thenReturn( - Collections.emptyList() - ); + when(projectService.findByUserAndStatus(author, ProjectStatus.ACTIVE)).thenReturn(Collections.emptyList()); tester.startComponentInPage(ProjectsOverviewPanel.class); tester.assertVisible(path("tableContainer", "emptyLabel")); } @@ -90,20 +80,14 @@ public class ProjectsOverviewPanelTest extends SciProTest { .startDate(LocalDate.now()) .build(); project.setHeadSupervisor( - User.builder() - .firstName("Susan") - .lastName("Supervisor") - .emailAddress("susan@dsv.su.se") - .build() + User.builder().firstName("Susan").lastName("Supervisor").emailAddress("susan@dsv.su.se").build() ); DomainObjects.injectId(project, 1L); return project; } private ProjectService.Filter filter() { - ArgumentCaptor<ProjectService.Filter> captor = ArgumentCaptor.forClass( - ProjectService.Filter.class - ); + ArgumentCaptor<ProjectService.Filter> captor = ArgumentCaptor.forClass(ProjectService.Filter.class); verify(projectService, atLeastOnce()).findAll(captor.capture()); return captor.getValue(); } diff --git a/view/src/test/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanelTest.java b/view/src/test/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanelTest.java index cfb27a4b12..e1c7e33209 100644 --- a/view/src/test/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanelTest.java @@ -28,11 +28,7 @@ public class SupervisorEditProjectPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - project = Project.builder() - .title("any") - .projectType(ObjectMother.BACHELOR) - .startDate(LocalDate.now()) - .build(); + project = Project.builder().title("any").projectType(ObjectMother.BACHELOR).startDate(LocalDate.now()).build(); DomainObjects.injectId(project, 1L); lenient().when(projectService.save(project)).thenReturn(project); } @@ -74,10 +70,7 @@ public class SupervisorEditProjectPanelTest extends SciProTest { startPanel(); - tester.executeAjaxEvent( - path("id", FORM, CO_SUPERVISORS, "wmc", "users", 0, "remove"), - "click" - ); + tester.executeAjaxEvent(path("id", FORM, CO_SUPERVISORS, "wmc", "users", 0, "remove"), "click"); submitForm("any"); Project updatedProject = captureSavedProject(); @@ -85,9 +78,7 @@ public class SupervisorEditProjectPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new SupervisorEditProjectPanel("id", Model.of(project)) - ); + panel = tester.startComponentInPage(new SupervisorEditProjectPanel("id", Model.of(project))); } private void submitForm(String newTitle) { diff --git a/view/src/test/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPageTest.java b/view/src/test/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPageTest.java index 0db30c0ca8..afec00e0e8 100644 --- a/view/src/test/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPageTest.java @@ -20,9 +20,7 @@ public class AdminProjectPartnerPageTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); } @Test @@ -37,9 +35,7 @@ public class AdminProjectPartnerPageTest extends SciProTest { FormTester formTester = tester.newFormTester("daysForm"); formTester.setValue("amountOfDaysField", "90"); formTester.submit(); - ArgumentCaptor<GeneralSystemSettings> captor = ArgumentCaptor.forClass( - GeneralSystemSettings.class - ); + ArgumentCaptor<GeneralSystemSettings> captor = ArgumentCaptor.forClass(GeneralSystemSettings.class); verify(generalSystemSettingsService).save(captor.capture()); GeneralSystemSettings updatedSettings = captor.getValue(); assertEquals(90, updatedSettings.getProjectPartnerDaysToLive()); diff --git a/view/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPageTest.java b/view/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPageTest.java index 35b7fa5ebb..5f49d31c5a 100644 --- a/view/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPageTest.java @@ -37,9 +37,7 @@ public class ProjectPartnerPageTest extends SciProTest { applicationPeriod.addProjectType(bachelor); applicationPeriod.addProjectType(master); applicationPeriod.setId(234L); - when(applicationPeriodService.findUpcomingPeriods()).thenReturn( - Collections.singletonList(applicationPeriod) - ); + when(applicationPeriodService.findUpcomingPeriods()).thenReturn(Collections.singletonList(applicationPeriod)); settings.setProjectPartnerDaysToLive(daysToLive); when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(settings); tester.startPage(ProjectPartnerPage.class); diff --git a/view/src/test/java/se/su/dsv/scipro/projectpartner/SinglesPanelTest.java b/view/src/test/java/se/su/dsv/scipro/projectpartner/SinglesPanelTest.java index 9fa88fb51f..95a7cda25d 100644 --- a/view/src/test/java/se/su/dsv/scipro/projectpartner/SinglesPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/projectpartner/SinglesPanelTest.java @@ -14,11 +14,7 @@ import se.su.dsv.scipro.system.User; public class SinglesPanelTest extends SciProTest { - private final ProjectType bachelor = new ProjectType( - DegreeType.BACHELOR, - "Bachelor", - "bachelor" - ); + private final ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "bachelor"); private final ProjectType master = new ProjectType(DegreeType.MASTER, "Master", "master"); private final ApplicationPeriod applicationPeriod = new ApplicationPeriod("Some period"); @@ -30,19 +26,11 @@ public class SinglesPanelTest extends SciProTest { applicationPeriod.addProjectType(bachelor); applicationPeriod.addProjectType(master); - final User bill = User.builder() - .firstName("Bill") - .lastName("Gates") - .emailAddress("bill@example.com") - .build(); + final User bill = User.builder().firstName("Bill").lastName("Gates").emailAddress("bill@example.com").build(); final ProjectPartner billsAd = new ProjectPartner(bill); billsAd.setProjectType(bachelor); - final User steve = User.builder() - .firstName("Steve") - .lastName("Jobs") - .emailAddress("steve@example.com") - .build(); + final User steve = User.builder().firstName("Steve").lastName("Jobs").emailAddress("steve@example.com").build(); final ProjectPartner stevesPartner = new ProjectPartner(steve); stevesPartner.setProjectType(master); diff --git a/view/src/test/java/se/su/dsv/scipro/projectstate/ProjectStatePanelTest.java b/view/src/test/java/se/su/dsv/scipro/projectstate/ProjectStatePanelTest.java index bb58a4cd53..080cdfe7b0 100644 --- a/view/src/test/java/se/su/dsv/scipro/projectstate/ProjectStatePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/projectstate/ProjectStatePanelTest.java @@ -103,20 +103,14 @@ public class ProjectStatePanelTest extends SciProTest { @Test public void testDropDownVisibleWhenStudent() { startPanel(StateOfMind.FINE, true); - tester.assertComponent( - path(panel.getId(), ProjectStatePanel.DROPDOWN), - AjaxDropDownChoice.class - ); + tester.assertComponent(path(panel.getId(), ProjectStatePanel.DROPDOWN), AjaxDropDownChoice.class); tester.assertVisible(path(panel.getId(), ProjectStatePanel.DROPDOWN)); } @Test public void testContainsReason() { startPanel(StateOfMind.NEEDHELP, false); - tester.assertComponent( - path(panel.getId(), ProjectStatePanel.REASON_LABEL), - MultiLineLabel.class - ); + tester.assertComponent(path(panel.getId(), ProjectStatePanel.REASON_LABEL), MultiLineLabel.class); tester.assertVisible(path(panel.getId(), ProjectStatePanel.REASON_LABEL)); } diff --git a/view/src/test/java/se/su/dsv/scipro/repository/panels/ProjectFilePanelTest.java b/view/src/test/java/se/su/dsv/scipro/repository/panels/ProjectFilePanelTest.java index afb3d61fa5..de353e728d 100644 --- a/view/src/test/java/se/su/dsv/scipro/repository/panels/ProjectFilePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/repository/panels/ProjectFilePanelTest.java @@ -45,9 +45,9 @@ public class ProjectFilePanelTest extends SciProTest { DomainObjects.injectId(projectFile, 1L); DomainObjects.injectId(fileDescription, 1L); - when( - projectFileService.getProjectFiles(eq(ObjectMother.SOME_PROJECT), any(Pageable.class)) - ).thenReturn(Collections.singletonList(projectFile)); + when(projectFileService.getProjectFiles(eq(ObjectMother.SOME_PROJECT), any(Pageable.class))).thenReturn( + Collections.singletonList(projectFile) + ); when(projectFileService.countProjectFiles(ObjectMother.SOME_PROJECT)).thenReturn(1L); when(projectFileService.findOne(projectFile.getId())).thenReturn(projectFile); } @@ -85,9 +85,7 @@ public class ProjectFilePanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new ProjectFilePanel("id", Model.of(ObjectMother.SOME_PROJECT)) - ); + panel = tester.startComponentInPage(new ProjectFilePanel("id", Model.of(ObjectMother.SOME_PROJECT))); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanelTest.java b/view/src/test/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanelTest.java index da8fffa821..2c414b56d9 100644 --- a/view/src/test/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/repository/panels/ViewAttachmentPanelTest.java @@ -49,9 +49,7 @@ public class ViewAttachmentPanelTest extends SciProTest { @Test public void date_label_visible_if_date_style_provided() { - tester.startComponentInPage( - new ViewAttachmentPanel("panel", Model.of(newFile()), DateStyle.DATE) - ); + tester.startComponentInPage(new ViewAttachmentPanel("panel", Model.of(newFile()), DateStyle.DATE)); tester.assertVisible(path("panel", ViewAttachmentPanel.UPLOAD_TIME)); } diff --git a/view/src/test/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanelTest.java b/view/src/test/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanelTest.java index cf9e66ad57..630f65c0cc 100644 --- a/view/src/test/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanelTest.java @@ -50,16 +50,8 @@ public class ApprovalReviewerPanelTest extends SciProTest { private Project createProject() { final ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - final User jane = User.builder() - .firstName("Jane") - .lastName("Doe") - .emailAddress("jane@example.com") - .build(); - final User john = User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build(); + final User jane = User.builder().firstName("Jane").lastName("Doe").emailAddress("jane@example.com").build(); + final User john = User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build(); john.setId(23523L); final Project project = Project.builder() .title("Title") diff --git a/view/src/test/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPageTest.java b/view/src/test/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPageTest.java index 999706bdbc..8b8607472a 100644 --- a/view/src/test/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPageTest.java @@ -57,9 +57,7 @@ public class ReviewerInteractionPageTest extends SciProTest { when(projectService.findOne(anyLong())).thenReturn(ObjectMother.SOME_PROJECT); ReviewerThread reviewerThread = new ReviewerThread(); reviewerThread.setProject(ObjectMother.SOME_PROJECT); - when(reviewerInteractionService.getReviewerThread(ObjectMother.SOME_PROJECT)).thenReturn( - reviewerThread - ); + when(reviewerInteractionService.getReviewerThread(ObjectMother.SOME_PROJECT)).thenReturn(reviewerThread); } private PageParameters getPageParameters() { diff --git a/view/src/test/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPageTest.java b/view/src/test/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPageTest.java index ab1b649a85..0ca0b83f68 100644 --- a/view/src/test/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPageTest.java @@ -49,12 +49,7 @@ public class RoughDraftApprovalDecisionPageTest extends SciProTest { public void setUp() throws Exception { project = createProject(); setLoggedInAs(project.getReviewer()); - roughDraftApproval = new RoughDraftApproval( - project, - mock(FileReference.class), - "test", - new Date() - ); + roughDraftApproval = new RoughDraftApproval(project, mock(FileReference.class), "test", new Date()); DomainObjects.injectId(roughDraftApproval, 123L); when(projectService.findOne(project.getId())).thenReturn(project); when(roughDraftApprovalService.findBy(project)).thenReturn(Optional.of(roughDraftApproval)); @@ -120,11 +115,7 @@ public class RoughDraftApprovalDecisionPageTest extends SciProTest { tester.assertNoErrorMessage(); ArgumentCaptor<Optional> captor = ArgumentCaptor.forClass(Optional.class); - verify(reviewerDecisionService).approve( - eq(roughDraftApproval), - eq(feedback), - captor.capture() - ); + verify(reviewerDecisionService).approve(eq(roughDraftApproval), eq(feedback), captor.capture()); assertTrue(captor.getValue().isPresent()); } @@ -154,21 +145,9 @@ public class RoughDraftApprovalDecisionPageTest extends SciProTest { private Project createProject() { ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - User supervisor = User.builder() - .firstName("Kalle") - .lastName("Tester") - .emailAddress("kalle@dsv.su.se") - .build(); - User reviewer = User.builder() - .firstName("John") - .lastName("Doe") - .emailAddress("john@example.com") - .build(); - User stina = User.builder() - .firstName("Stina") - .lastName("Student") - .emailAddress("stina@example.com") - .build(); + User supervisor = User.builder().firstName("Kalle").lastName("Tester").emailAddress("kalle@dsv.su.se").build(); + User reviewer = User.builder().firstName("John").lastName("Doe").emailAddress("john@example.com").build(); + User stina = User.builder().firstName("Stina").lastName("Student").emailAddress("stina@example.com").build(); stina.setId(987L); stina.setIdentifier(523); reviewer.setId(34L); diff --git a/view/src/test/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanelTest.java b/view/src/test/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanelTest.java index 0cbf3b35ec..35195f9f0c 100644 --- a/view/src/test/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanelTest.java @@ -24,16 +24,10 @@ public class TimelinePanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { final ProjectType bachelor = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - project = Project.builder() - .title("Project") - .projectType(bachelor) - .startDate(LocalDate.now()) - .build(); + project = Project.builder().title("Project").projectType(bachelor).startDate(LocalDate.now()).build(); final ForumPost forumPost = new ForumPost(); - when(reviewerInteractionService.getPosts(project)).thenReturn( - Collections.singletonList(forumPost) - ); + when(reviewerInteractionService.getPosts(project)).thenReturn(Collections.singletonList(forumPost)); final FinalSeminarApproval finalSeminarApproval = new FinalSeminarApproval( project, @@ -41,16 +35,9 @@ public class TimelinePanelTest extends SciProTest { "comment", new Date() ); - when(finalSeminarApprovalService.findBy(project)).thenReturn( - Optional.of(finalSeminarApproval) - ); + when(finalSeminarApprovalService.findBy(project)).thenReturn(Optional.of(finalSeminarApproval)); - final RoughDraftApproval draftApproval = new RoughDraftApproval( - project, - createFile(), - "comment", - new Date() - ); + final RoughDraftApproval draftApproval = new RoughDraftApproval(project, createFile(), "comment", new Date()); draftApproval.reject("Really bad", Optional.empty()); draftApproval.addNewThesis(createFile(), "now?", new Date()); draftApproval.approve("Ok", Optional.empty()); diff --git a/view/src/test/java/se/su/dsv/scipro/security/auth/ProjectProjectModuleBasedAuthorizationStrategyTest.java b/view/src/test/java/se/su/dsv/scipro/security/auth/ProjectProjectModuleBasedAuthorizationStrategyTest.java index 4268c749d3..6ded2491b0 100644 --- a/view/src/test/java/se/su/dsv/scipro/security/auth/ProjectProjectModuleBasedAuthorizationStrategyTest.java +++ b/view/src/test/java/se/su/dsv/scipro/security/auth/ProjectProjectModuleBasedAuthorizationStrategyTest.java @@ -25,9 +25,7 @@ public class ProjectProjectModuleBasedAuthorizationStrategyTest extends SciProTe public void setUp() throws Exception { authorizationStrategy = new ProjectModuleBasedAuthorizationStrategy() { @Override - protected ProjectModuleComponent internalGetAnnotation( - Class<? extends Component> authRequired - ) { + protected ProjectModuleComponent internalGetAnnotation(Class<? extends Component> authRequired) { return authorization; } }; diff --git a/view/src/test/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategyTest.java b/view/src/test/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategyTest.java index 01354c3b3d..552b00bd6c 100644 --- a/view/src/test/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategyTest.java +++ b/view/src/test/java/se/su/dsv/scipro/security/auth/SystemModuleBasedAuthorizationStrategyTest.java @@ -25,9 +25,7 @@ public class SystemModuleBasedAuthorizationStrategyTest extends SciProTest { public void setUp() throws Exception { authorizationStrategy = new SystemModuleBasedAuthorizationStrategy() { @Override - protected SystemModuleComponent internalGetAnnotation( - Class<? extends Component> authRequired - ) { + protected SystemModuleComponent internalGetAnnotation(Class<? extends Component> authRequired) { return authorization; } }; diff --git a/view/src/test/java/se/su/dsv/scipro/settings/pages/BasicProfilePageTest.java b/view/src/test/java/se/su/dsv/scipro/settings/pages/BasicProfilePageTest.java index 9218c43609..f678afc869 100644 --- a/view/src/test/java/se/su/dsv/scipro/settings/pages/BasicProfilePageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/settings/pages/BasicProfilePageTest.java @@ -21,11 +21,7 @@ public class BasicProfilePageTest extends PageTest { @BeforeEach public void setUp() throws Exception { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); setLoggedInAs(user); when(userProfileService.findByUser(user)).thenReturn(new UserProfile()); diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPageTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPageTest.java index e599cc7c0c..5e20f84e0b 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPageTest.java @@ -31,10 +31,7 @@ public class AdminAuthorsStatisticsPageTest extends SciProTest { @Test public void projectTypeFilter() { tester.startPage(AdminAuthorsStatisticsPage.class); - tester.assertComponent( - path(CONTAINER, PROJECT_TYPE_FILTER), - AjaxCheckBoxMultipleChoice.class - ); + tester.assertComponent(path(CONTAINER, PROJECT_TYPE_FILTER), AjaxCheckBoxMultipleChoice.class); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPageTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPageTest.java index 024d315058..abecdd2c29 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/AdminMilestoneStatisticsPageTest.java @@ -30,9 +30,7 @@ public class AdminMilestoneStatisticsPageTest extends SciProTest { @Test public void individual_page_link_links_to_supervisor_individual_page() { - tester.clickLink( - path("statistics", "container", "individualActivityList", 0, "individualActivityName") - ); + tester.clickLink(path("statistics", "container", "individualActivityList", 0, "individualActivityName")); tester.assertRenderedPage(AdminIndividualMilestoneDetailsPage.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPageTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPageTest.java index 2fac0fe2cc..2aefd61c0c 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPageTest.java @@ -24,9 +24,9 @@ public class AdminMultipleAuthorsStatisticsPageTest extends SciProTest { public void setUp() throws Exception { filter = new ProjectService.Filter(); Mockito.when(getMultipleAuthors()).thenReturn(Collections.singletonList(SOME_USER)); - Mockito.when( - projectService.findAll(ArgumentMatchers.any(ProjectService.Filter.class)) - ).thenReturn(Collections.singletonList(ObjectMother.SOME_PROJECT)); + Mockito.when(projectService.findAll(ArgumentMatchers.any(ProjectService.Filter.class))).thenReturn( + Collections.singletonList(ObjectMother.SOME_PROJECT) + ); tester.startPage(new AdminMultipleAuthorsStatisticsPage(filter)); } @@ -42,14 +42,8 @@ public class AdminMultipleAuthorsStatisticsPageTest extends SciProTest { @Test public void authors_name() { - tester.assertComponent( - path(AUTHOR_LIST, 0, AdminMultipleAuthorsStatisticsPage.AUTHOR_NAME), - UserLabel.class - ); - tester.assertModelValue( - path(AUTHOR_LIST, 0, AdminMultipleAuthorsStatisticsPage.AUTHOR_NAME), - SOME_USER - ); + tester.assertComponent(path(AUTHOR_LIST, 0, AdminMultipleAuthorsStatisticsPage.AUTHOR_NAME), UserLabel.class); + tester.assertModelValue(path(AUTHOR_LIST, 0, AdminMultipleAuthorsStatisticsPage.AUTHOR_NAME), SOME_USER); } @Test diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPageTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPageTest.java index 55153a3e3e..b61b1afd97 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPageTest.java @@ -18,21 +18,14 @@ import se.su.dsv.scipro.test.ObjectMother; public class AdminUnfinishedFinalSeminarsPageTest extends SciProTest { - public static final String EXPORT_LINK_PATH = - "table:bottomToolbars:toolbars:4:td:linkContainer:1:exportLink"; + public static final String EXPORT_LINK_PATH = "table:bottomToolbars:toolbars:4:td:linkContainer:1:exportLink"; @BeforeEach public void setUp() throws Exception { when( - finalSeminarService.findUnfinishedSeminars( - any(Date.class), - any(Date.class), - any(Pageable.class) - ) + finalSeminarService.findUnfinishedSeminars(any(Date.class), any(Date.class), any(Pageable.class)) ).thenReturn(Collections.singletonList(getFinalSeminar())); - when( - finalSeminarService.countUnfinishedSeminars(any(Date.class), any(Date.class)) - ).thenReturn(1L); + when(finalSeminarService.countUnfinishedSeminars(any(Date.class), any(Date.class))).thenReturn(1L); } @Test @@ -53,11 +46,7 @@ public class AdminUnfinishedFinalSeminarsPageTest extends SciProTest { seminar.setProject(ObjectMother.SOME_PROJECT); FinalSeminarOpposition opposition = new FinalSeminarOpposition(); opposition.setProject( - Project.builder() - .title("hej") - .projectType(ObjectMother.BACHELOR) - .startDate(LocalDate.now()) - .build() + Project.builder().title("hej").projectType(ObjectMother.BACHELOR).startDate(LocalDate.now()).build() ); opposition.setUser(ObjectMother.SOME_USER); seminar.addOpposition(opposition); diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanelTest.java index f9603b5e87..4d1c496657 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanelTest.java @@ -23,9 +23,6 @@ public class AdminUnitStatisticsPanelTest extends SciProTest { @Test public void testPanelContainsDataPanel() { - tester.assertComponent( - path(panel.getId(), AdminUnitStatisticsPanel.TABLE), - ExportableDataPanel.class - ); + tester.assertComponent(path(panel.getId(), AdminUnitStatisticsPanel.TABLE), ExportableDataPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanelTest.java index 1bcd891ed4..1f63ff0447 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/IndividualMilestoneDetailsPanelTest.java @@ -19,11 +19,7 @@ public class IndividualMilestoneDetailsPanelTest extends SciProTest { @Test public void renders() throws Exception { tester.startComponentInPage( - new IndividualMilestoneDetailsPanel( - "id", - Model.of(activity), - new MileStoneService.Filter() - ) + new IndividualMilestoneDetailsPanel("id", Model.of(activity), new MileStoneService.Filter()) ); } diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanelTest.java index 77c38b0666..2119265d69 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanelTest.java @@ -17,16 +17,8 @@ public class MilestoneFilterDetailsPanelTest extends SciProTest { private MilestoneFilterDetailsPanel panel; - public static final ProjectType SOME_PROJECT_TYPE = new ProjectType( - DegreeType.BACHELOR, - "bachelor", - "bachelor" - ); - public static final ProjectType SOME_OTHER_PROJECT_TYPE = new ProjectType( - DegreeType.MASTER, - "master", - "master" - ); + public static final ProjectType SOME_PROJECT_TYPE = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); + public static final ProjectType SOME_OTHER_PROJECT_TYPE = new ProjectType(DegreeType.MASTER, "master", "master"); @Test public void filtering_without_project_started_between_includes_not_available_string() { @@ -38,10 +30,7 @@ public class MilestoneFilterDetailsPanelTest extends SciProTest { public void filter_with_project_started_between() { String dateString = "xxxx-xx-xx"; Mockito.when( - dateService.format( - ArgumentMatchers.any(Date.class), - ArgumentMatchers.eq(DateStyle.DATE) - ) + dateService.format(ArgumentMatchers.any(Date.class), ArgumentMatchers.eq(DateStyle.DATE)) ).thenReturn(dateString); MileStoneService.Filter filter = new MileStoneService.Filter(); filter.setProjectStartedAfter(new Date()); diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanelTest.java index f033a9359a..6a57da5cd0 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanelTest.java @@ -31,9 +31,7 @@ public class MilestoneStatisticsPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { - projectTypes = new ArrayList<>( - Collections.singletonList(new ProjectType(DegreeType.BACHELOR, "any", "any")) - ); + projectTypes = new ArrayList<>(Collections.singletonList(new ProjectType(DegreeType.BACHELOR, "any", "any"))); initActivities(); Mockito.when( projectTypeService.findByDegreeTypes( @@ -53,10 +51,7 @@ public class MilestoneStatisticsPanelTest extends SciProTest { } @Override - public Page projectPage( - IModel<MilestoneActivityTemplate> model, - MileStoneService.Filter filter - ) { + public Page projectPage(IModel<MilestoneActivityTemplate> model, MileStoneService.Filter filter) { return new AdminProjectMilestoneDetailsPage(model, filter); } } @@ -73,40 +68,25 @@ public class MilestoneStatisticsPanelTest extends SciProTest { public void project_milestones_have_number_of_completed_projects() { Long completed = 2L; Mockito.when( - mileStoneService.countCompletedMileStones( - eq(projectActivity), - any(MileStoneService.Filter.class) - ) + mileStoneService.countCompletedMileStones(eq(projectActivity), any(MileStoneService.Filter.class)) ).thenReturn(completed); - tester.assertModelValue( - path("panel", CONTAINER, PROJECT_ACTIVITY_LIST, 0, COMPLETED_PROJECTS), - completed - ); + tester.assertModelValue(path("panel", CONTAINER, PROJECT_ACTIVITY_LIST, 0, COMPLETED_PROJECTS), completed); } @Test public void contains_list_of_individual_milestone_activities() { - tester.assertModelValue( - path("panel", CONTAINER, INDIVIDUAL_ACTIVITY_LIST), - individualActivities - ); + tester.assertModelValue(path("panel", CONTAINER, INDIVIDUAL_ACTIVITY_LIST), individualActivities); } @Test public void individual_milestones_have_number_of_completed_authors() { Long completed = 2L; Mockito.when( - mileStoneService.countCompletedMileStones( - eq(individualActivity), - any(MileStoneService.Filter.class) - ) + mileStoneService.countCompletedMileStones(eq(individualActivity), any(MileStoneService.Filter.class)) ).thenReturn(completed); - tester.assertModelValue( - path("panel", CONTAINER, INDIVIDUAL_ACTIVITY_LIST, 0, COMPLETED_AUTHORS), - completed - ); + tester.assertModelValue(path("panel", CONTAINER, INDIVIDUAL_ACTIVITY_LIST, 0, COMPLETED_AUTHORS), completed); } @Test @@ -161,9 +141,7 @@ public class MilestoneStatisticsPanelTest extends SciProTest { @Test public void go_to_individual_milestone_activity_details() { - tester.clickLink( - path("panel", CONTAINER, INDIVIDUAL_ACTIVITY_LIST, 0, INDIVIDUAL_ACTIVITY_NAME) - ); + tester.clickLink(path("panel", CONTAINER, INDIVIDUAL_ACTIVITY_LIST, 0, INDIVIDUAL_ACTIVITY_NAME)); tester.assertRenderedPage(AdminIndividualMilestoneDetailsPage.class); } @@ -176,12 +154,7 @@ public class MilestoneStatisticsPanelTest extends SciProTest { 0 ); projectActivities = asList(projectActivity); - individualActivity = createActivity( - MilestoneActivityTemplate.Type.STUDENT, - "Student milestone", - "Hi?", - 0 - ); + individualActivity = createActivity(MilestoneActivityTemplate.Type.STUDENT, "Student milestone", "Hi?", 0); individualActivities = asList(individualActivity); Mockito.when( @@ -229,9 +202,7 @@ public class MilestoneStatisticsPanelTest extends SciProTest { } private void setDateFilterEnabled(boolean enabled) { - FormComponent<?> dateFilterToggle = (FormComponent< - ? - >) tester.getComponentFromLastRenderedPage( + FormComponent<?> dateFilterToggle = (FormComponent<?>) tester.getComponentFromLastRenderedPage( path("panel", DATE_FILTER, DeactivatableDatePickerPanel.TOGGLE) ); tester @@ -251,9 +222,7 @@ public class MilestoneStatisticsPanelTest extends SciProTest { activity.setType(type); activity.setTitle(title); activity.setDescription(description); - activity.setMilestonePhaseTemplate( - new MilestonePhaseTemplate("phase test", "this is for test", 0) - ); + activity.setMilestonePhaseTemplate(new MilestonePhaseTemplate("phase test", "this is for test", 0)); activity.setProjectTypes(new HashSet<>(projectTypes)); activity.setSortOrder(order); return activity; diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanelTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanelTest.java index ec2d410207..91f1b50ff1 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanelTest.java @@ -27,9 +27,7 @@ public class MilestoneStatisticsProgressPanelTest extends SciProTest { notCompleted.setMilestonePhaseTemplate(phase); DomainObjects.injectId(notCompleted, 2L); - when(milestoneActivityTemplateService.findAll()).thenReturn( - Arrays.asList(completed, notCompleted) - ); + when(milestoneActivityTemplateService.findAll()).thenReturn(Arrays.asList(completed, notCompleted)); tester.startComponentInPage(MilestoneStatisticsProgressPanel.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/ProjectExternalStatisticsPageTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/ProjectExternalStatisticsPageTest.java index b03b82c408..4f1db04057 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/ProjectExternalStatisticsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/ProjectExternalStatisticsPageTest.java @@ -22,9 +22,6 @@ public class ProjectExternalStatisticsPageTest extends SciProTest { @Test public void testContainsPanel() { - tester.assertComponent( - ProjectExternalStatisticsPage.PANEL, - ProjectExternalOrganisationPanel.class - ); + tester.assertComponent(ProjectExternalStatisticsPage.PANEL, ProjectExternalOrganisationPanel.class); } } diff --git a/view/src/test/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanelTest.java b/view/src/test/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanelTest.java index 6de1e4254c..2896c1e4d9 100644 --- a/view/src/test/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/statistics/ProjectMilestoneDetailsPanelTest.java @@ -23,11 +23,7 @@ public class ProjectMilestoneDetailsPanelTest extends SciProTest { public static final String PROJECT_PLAN_APPROVED = "Project plan approved"; public static final User HEAD_SUPERVISOR = new UserBuilder().create(); - public static final ProjectType SOME_PROJECT_TYPE = new ProjectType( - DegreeType.BACHELOR, - "bachelor", - "bachelor" - ); + public static final ProjectType SOME_PROJECT_TYPE = new ProjectType(DegreeType.BACHELOR, "bachelor", "bachelor"); public static final Project SOME_PROJECT = Project.builder() .title("project") .projectType(SOME_PROJECT_TYPE) @@ -69,9 +65,7 @@ public class ProjectMilestoneDetailsPanelTest extends SciProTest { private void startPage(MileStoneService.Filter filter) { mockList(filter); - tester.startComponentInPage( - new ProjectMilestoneDetailsPanel("id", Model.of(activity), filter) - ); + tester.startComponentInPage(new ProjectMilestoneDetailsPanel("id", Model.of(activity), filter)); } private void createActivity() { diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPageTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPageTest.java index 21eb21e0d1..f97079577c 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPageTest.java @@ -20,16 +20,10 @@ public class SupervisorGroupCreateThreadPageTest extends PageTest { public void setUp() throws Exception { group = new Group(); group.setId(1L); - user = User.builder() - .firstName("John") - .lastName("Smith") - .emailAddress("john@example.com") - .build(); + user = User.builder().firstName("John").lastName("Smith").emailAddress("john@example.com").build(); group.setUser(user); when(groupService.findOne(isA(Long.class))).thenReturn(group); - when(groupFacade.isSupervisorOrFollower(isA(Group.class), isA(User.class))).thenReturn( - true - ); + when(groupFacade.isSupervisorOrFollower(isA(Group.class), isA(User.class))).thenReturn(true); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPageTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPageTest.java index c32dedd6c3..7ae23e7929 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPageTest.java @@ -20,16 +20,10 @@ public class SupervisorGroupPageTest extends PageTest { public void setUp() throws Exception { group = new Group(); group.setId(1L); - user = User.builder() - .firstName("John") - .lastName("Smith") - .emailAddress("john@example.com") - .build(); + user = User.builder().firstName("John").lastName("Smith").emailAddress("john@example.com").build(); group.setUser(user); when(groupService.findOne(isA(Long.class))).thenReturn(group); - when(groupFacade.isSupervisorOrFollower(isA(Group.class), isA(User.class))).thenReturn( - true - ); + when(groupFacade.isSupervisorOrFollower(isA(Group.class), isA(User.class))).thenReturn(true); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPageTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPageTest.java index 48990d3649..3c19e39238 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorMilestoneStatisticsPageTest.java @@ -30,9 +30,7 @@ public class SupervisorMilestoneStatisticsPageTest extends SciProTest { @Test public void individual_page_link_links_to_supervisor_individual_page() { - tester.clickLink( - path("statistics", "container", "individualActivityList", 0, "individualActivityName") - ); + tester.clickLink(path("statistics", "container", "individualActivityList", 0, "individualActivityName")); tester.assertRenderedPage(SupervisorIndividualMilestoneDetailsPage.class); } diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorPageTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorPageTest.java index 12ef8e2a95..3223e22718 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorPageTest.java @@ -25,17 +25,11 @@ public abstract class SupervisorPageTest extends PageTest { setLoggedInAs(project.getHeadSupervisor()); when(projectService.findOne(anyLong())).thenReturn(project); - when(projectService.hasSupervisingRole(any(Project.class), any(User.class))).thenReturn( - true - ); + when(projectService.hasSupervisingRole(any(Project.class), any(User.class))).thenReturn(true); } protected Project createProject() { - User user = User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build(); + User user = User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build(); DomainObjects.injectId(user, 6814684L); project = Project.builder() diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePageTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePageTest.java index 4a51800e31..8db0415c35 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePageTest.java @@ -26,10 +26,7 @@ public class SupervisorProfilePageTest extends SciProTest { public void lists_users_research_areas() { User user = mockUserWithResearchAreaAndUnit(); startPage(user); - tester.assertModelValue( - path("form", "researchAreas"), - new ArrayList<>(user.getActiveResearchAreas()) - ); + tester.assertModelValue(path("form", "researchAreas"), new ArrayList<>(user.getActiveResearchAreas())); } @Test @@ -72,22 +69,14 @@ public class SupervisorProfilePageTest extends SciProTest { } private User mockUserWithResearchAreaAndUnit() { - User user = User.builder() - .firstName("first") - .lastName("last") - .emailAddress("first@last.com") - .build(); + User user = User.builder().firstName("first").lastName("last").emailAddress("first@last.com").build(); user.addResearchArea(new ResearchArea()); user.setUnit(new Unit()); return user; } private User startPage() { - final User user = User.builder() - .firstName("first") - .lastName("last") - .emailAddress("email@example.com") - .build(); + final User user = User.builder().firstName("first").lastName("last").emailAddress("email@example.com").build(); user.setId(34L); return startPage(user); } diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPageTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPageTest.java index 61d315f6dd..333a68ce11 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPageTest.java @@ -28,10 +28,7 @@ public class SupervisorProjectDetailsPageTest extends PageTest { @BeforeEach public void setUp() throws Exception { - User headSupervisor = new UserBuilder() - .setFirstName("head") - .setLastName("supervisor") - .create(); + User headSupervisor = new UserBuilder().setFirstName("head").setLastName("supervisor").create(); User student = new UserBuilder().setFirstName("author").setLastName("1").create(); Project bachelorProject = createProject( headSupervisor, @@ -46,9 +43,7 @@ public class SupervisorProjectDetailsPageTest extends PageTest { 3L ); when(projectService.findOne(isA(Long.class))).thenReturn(bachelorProject); - when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn( - true - ); + when(projectService.hasSupervisingRole(isA(Project.class), isA(User.class))).thenReturn(true); FileDescription fileDescription = new FileDescription(); fileDescription.setMimeType("pdf"); fileDescription.setId(1L); @@ -88,9 +83,7 @@ public class SupervisorProjectDetailsPageTest extends PageTest { private void mockGroup(long id) { Group group = new Group(); group.setId(id); - when(groupService.findAll(any(GroupService.Filter.class))).thenReturn( - Collections.singletonList(group) - ); + when(groupService.findAll(any(GroupService.Filter.class))).thenReturn(Collections.singletonList(group)); } @Override @@ -105,12 +98,7 @@ public class SupervisorProjectDetailsPageTest extends PageTest { return pp; } - private Project createProject( - User headSupervisor, - User student, - ProjectType projectType, - long id - ) { + private Project createProject(User headSupervisor, User student, ProjectType projectType, long id) { Project project = Project.builder() .title("some title") .projectType(projectType) diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorStartPageTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorStartPageTest.java index 75529c9f36..f981411e87 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorStartPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/pages/SupervisorStartPageTest.java @@ -63,9 +63,7 @@ public class SupervisorStartPageTest extends SciProTest { public void selecting_status_updates_filter() { ProjectStatus projectStatus = ProjectStatus.INACTIVE; - filterForm() - .select(SupervisorMyProjectsPanel.STATUS_FILTER, projectStatus.ordinal()) - .submit(); + filterForm().select(SupervisorMyProjectsPanel.STATUS_FILTER, projectStatus.ordinal()).submit(); assertThat(getFilterParams().getStatuses(), hasItem(projectStatus)); } @@ -92,9 +90,7 @@ public class SupervisorStartPageTest extends SciProTest { @Test public void ajax_clicking_project_status_updates_table() { ajaxClickFilter(SupervisorMyProjectsPanel.STATUS_FILTER); - tester.assertComponentOnAjaxResponse( - path(PROJECTS_OVERVIEW_PANEL, SupervisorMyProjectsPanel.DATA_PANEL) - ); + tester.assertComponentOnAjaxResponse(path(PROJECTS_OVERVIEW_PANEL, SupervisorMyProjectsPanel.DATA_PANEL)); } @Test @@ -115,17 +111,13 @@ public class SupervisorStartPageTest extends SciProTest { .startDate(LocalDate.now()) .build(); project.setHeadSupervisor( - User.builder() - .firstName("Bob") - .lastName("Sponge") - .emailAddress("bob@example.com") - .build() + User.builder().firstName("Bob").lastName("Sponge").emailAddress("bob@example.com").build() ); DomainObjects.injectId(project, 1L); - when( - projectService.findAll(any(ProjectService.Filter.class), any(Pageable.class)) - ).thenReturn(pageContaining(project)); + when(projectService.findAll(any(ProjectService.Filter.class), any(Pageable.class))).thenReturn( + pageContaining(project) + ); when(projectService.count(any(ProjectService.Filter.class))).thenReturn(1L); } @@ -144,23 +136,15 @@ public class SupervisorStartPageTest extends SciProTest { } private FormTester filterForm() { - return tester.newFormTester( - path(PROJECTS_OVERVIEW_PANEL, SupervisorMyProjectsPanel.FILTER_FORM) - ); + return tester.newFormTester(path(PROJECTS_OVERVIEW_PANEL, SupervisorMyProjectsPanel.FILTER_FORM)); } private String filterPath(String filterComponentId) { - return path( - PROJECTS_OVERVIEW_PANEL, - SupervisorMyProjectsPanel.FILTER_FORM, - filterComponentId - ); + return path(PROJECTS_OVERVIEW_PANEL, SupervisorMyProjectsPanel.FILTER_FORM, filterComponentId); } private ProjectService.Filter getFilterParams() { - ArgumentCaptor<ProjectService.Filter> captor = ArgumentCaptor.forClass( - ProjectService.Filter.class - ); + ArgumentCaptor<ProjectService.Filter> captor = ArgumentCaptor.forClass(ProjectService.Filter.class); verify(projectService, atLeastOnce()).count(captor.capture()); return captor.getValue(); } diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java index 4328be7f89..35269ebf7a 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java @@ -25,12 +25,7 @@ public class FinalSeminarApprovalProcessPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { final FileReference thesis = getFileReference(1L); - finalSeminarApproval = new FinalSeminarApproval( - mock(Project.class), - thesis, - "test", - new Date() - ); + finalSeminarApproval = new FinalSeminarApproval(mock(Project.class), thesis, "test", new Date()); startPanel(); } @@ -46,10 +41,7 @@ public class FinalSeminarApprovalProcessPanelTest extends SciProTest { @Test public void shows_current_status() { tester.assertComponent(path(panel, "currentStatus"), EnumLabel.class); - tester.assertModelValue( - path(panel, "currentStatus"), - finalSeminarApproval.getCurrentStatus() - ); + tester.assertModelValue(path(panel, "currentStatus"), finalSeminarApproval.getCurrentStatus()); } @Test @@ -69,10 +61,7 @@ public class FinalSeminarApprovalProcessPanelTest extends SciProTest { tester.assertComponent(path(panel, "currentAttachment"), ViewAttachmentPanel.class); tester.assertModelValue( path(panel, "currentAttachment"), - finalSeminarApproval - .getCurrentAttachment() - .map(FileReference::getFileDescription) - .orElse(null) + finalSeminarApproval.getCurrentAttachment().map(FileReference::getFileDescription).orElse(null) ); } @@ -87,9 +76,7 @@ public class FinalSeminarApprovalProcessPanelTest extends SciProTest { } private void startPanel() { - panel = tester.startComponentInPage( - new FinalSeminarApprovalProcessPanel("id", modelOf(finalSeminarApproval)) - ); + panel = tester.startComponentInPage(new FinalSeminarApprovalProcessPanel("id", modelOf(finalSeminarApproval))); } private static IModel<ReviewerApproval> modelOf(final ReviewerApproval finalSeminarApproval) { diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanelTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanelTest.java index 90ab0573d4..cedd1f903b 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanelTest.java @@ -89,10 +89,7 @@ public class SupervisorExternalProjectPanelTest extends SciProTest { startPanelWithExternalOrganization(); clickCheckBox(); - tester.assertFeedback( - path(FORM, FEEDBACK), - panel.getString("external.organization.removed") - ); + tester.assertFeedback(path(FORM, FEEDBACK), panel.getString("external.organization.removed")); } @Test @@ -103,10 +100,7 @@ public class SupervisorExternalProjectPanelTest extends SciProTest { formTester.setValue(super.path(ENCLOSURE, EXTERNAL_FIELD), "New organization"); formTester.submit(); - tester.assertFeedback( - path(FORM, FEEDBACK), - panel.getString("external.organization.changed") - ); + tester.assertFeedback(path(FORM, FEEDBACK), panel.getString("external.organization.changed")); } private void clickCheckBox() { @@ -124,9 +118,7 @@ public class SupervisorExternalProjectPanelTest extends SciProTest { } private void startPanel(final Project project) { - panel = tester.startComponentInPage( - new SupervisorExternalProjectPanel("panel", Model.of(project)) - ); + panel = tester.startComponentInPage(new SupervisorExternalProjectPanel("panel", Model.of(project))); } @Override diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanelTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanelTest.java index adcf6da198..4bc167ebf1 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanelTest.java @@ -56,23 +56,17 @@ public class SupervisorSubTabMenuPanelTest extends SciProTest { @Test public void milestone_tab_is_hidden_if_no_activities_are_available() { - when( - milestoneActivityTemplateService.countActivities( - any(ProjectType.class), - any(LocalDate.class) - ) - ).thenReturn(0L); + when(milestoneActivityTemplateService.countActivities(any(ProjectType.class), any(LocalDate.class))).thenReturn( + 0L + ); assertNotVisible(MILESTONES, SOME_BACHELOR_PROJECT); } @Test public void milestone_is_visible_if_activities_are_available() { - when( - milestoneActivityTemplateService.countActivities( - any(ProjectType.class), - any(LocalDate.class) - ) - ).thenReturn(1L); + when(milestoneActivityTemplateService.countActivities(any(ProjectType.class), any(LocalDate.class))).thenReturn( + 1L + ); assertVisible(MILESTONES, SOME_BACHELOR_PROJECT); } diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanelTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanelTest.java index 9be60d1023..7b974d9b2b 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanelTest.java @@ -27,9 +27,7 @@ public class SupervisorTabMenuPanelTest extends SciProTest { } private SupervisorTabMenuPanel startPanel() { - return tester.startComponentInPage( - new SupervisorTabMenuPanel("id", AbstractSupervisorPage.class) - ); + return tester.startComponentInPage(new SupervisorTabMenuPanel("id", AbstractSupervisorPage.class)); } private String renderedPanel() { diff --git a/view/src/test/java/se/su/dsv/scipro/thesislink/ExternalLinkPanelTest.java b/view/src/test/java/se/su/dsv/scipro/thesislink/ExternalLinkPanelTest.java index 5efde6ffac..3bb11c9be9 100644 --- a/view/src/test/java/se/su/dsv/scipro/thesislink/ExternalLinkPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/thesislink/ExternalLinkPanelTest.java @@ -27,16 +27,8 @@ public class ExternalLinkPanelTest extends SciProTest { @BeforeEach public void setUp() throws Exception { ProjectType projectType = new ProjectType(DegreeType.BACHELOR, "Bachelor", "Bachelor"); - project = Project.builder() - .title("My project") - .projectType(projectType) - .startDate(LocalDate.now()) - .build(); - User user = new UserBuilder() - .setFirstName("Sten") - .setLastName("Sture") - .setEmail("sten@example.com") - .create(); + project = Project.builder().title("My project").projectType(projectType).startDate(LocalDate.now()).build(); + User user = new UserBuilder().setFirstName("Sten").setLastName("Sture").setEmail("sten@example.com").create(); setLoggedInAs(user); when(externalLinkService.findByProject(isA(Project.class))).thenReturn( Arrays.asList( diff --git a/view/src/test/java/se/su/dsv/scipro/user/AdminImportUserPageTest.java b/view/src/test/java/se/su/dsv/scipro/user/AdminImportUserPageTest.java index af7578f834..68720dec4f 100644 --- a/view/src/test/java/se/su/dsv/scipro/user/AdminImportUserPageTest.java +++ b/view/src/test/java/se/su/dsv/scipro/user/AdminImportUserPageTest.java @@ -14,20 +14,14 @@ public class AdminImportUserPageTest extends SciProTest { @Test public void search() { final String searchTerm = "199506"; - UserImportService.ImportableUser importableUser = fakeImportableUser( - searchTerm, - "john@example.com" - ); + UserImportService.ImportableUser importableUser = fakeImportableUser(searchTerm, "john@example.com"); tester.startPage(AdminImportUserPage.class); final FormTester formTester = tester.newFormTester("form"); formTester.setValue("searchTerm", searchTerm); formTester.submit(); - tester.assertLabel( - path("importCandidates", "0", "firstName"), - importableUser.getFirstName() - ); + tester.assertLabel(path("importCandidates", "0", "firstName"), importableUser.getFirstName()); } @Test @@ -47,10 +41,7 @@ public class AdminImportUserPageTest extends SciProTest { @Test public void import_person() { final String searchTerm = "199506"; - UserImportService.ImportableUser importableUser = fakeImportableUser( - searchTerm, - "john@example.com" - ); + UserImportService.ImportableUser importableUser = fakeImportableUser(searchTerm, "john@example.com"); tester.startPage(AdminImportUserPage.class); final FormTester formTester = tester.newFormTester("form"); @@ -73,9 +64,7 @@ public class AdminImportUserPageTest extends SciProTest { 42 ); - when(userImportService.search(searchTerm)).thenReturn( - Collections.singletonList(importableUser) - ); + when(userImportService.search(searchTerm)).thenReturn(Collections.singletonList(importableUser)); return importableUser; } } diff --git a/view/src/test/java/se/su/dsv/scipro/workerthreads/IdeaExportWorkerTest.java b/view/src/test/java/se/su/dsv/scipro/workerthreads/IdeaExportWorkerTest.java index f8b44b0941..32885ded60 100644 --- a/view/src/test/java/se/su/dsv/scipro/workerthreads/IdeaExportWorkerTest.java +++ b/view/src/test/java/se/su/dsv/scipro/workerthreads/IdeaExportWorkerTest.java @@ -121,11 +121,7 @@ public class IdeaExportWorkerTest { } private Idea prepareIdea() { - User student = User.builder() - .firstName("Kalle") - .lastName("Tester") - .emailAddress("kalle@dsv.su.se") - .build(); + User student = User.builder().firstName("Kalle").lastName("Tester").emailAddress("kalle@dsv.su.se").build(); DomainObjects.injectId(student, 234L); User supervisor = User.builder() .firstName("Henrik") diff --git a/view/src/test/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorkerTest.java b/view/src/test/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorkerTest.java index cd6920c785..bfcaef9895 100755 --- a/view/src/test/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorkerTest.java +++ b/view/src/test/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorkerTest.java @@ -62,9 +62,7 @@ public class NotificationCompilationWorkerTest { worker.deliveryConfiguration = deliveryConfiguration; worker.userProfileService = userProfileService; - when(systemSettingsService.getGeneralSystemSettingsInstance()).thenReturn( - new GeneralSystemSettings() - ); + when(systemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); doNothing().when(worker).beginTransaction(); doNothing().when(worker).commitTransaction(); diff --git a/war/src/main/java/se/su/dsv/scipro/war/MailConfig.java b/war/src/main/java/se/su/dsv/scipro/war/MailConfig.java index 5b4567e625..38e1fdcd00 100644 --- a/war/src/main/java/se/su/dsv/scipro/war/MailConfig.java +++ b/war/src/main/java/se/su/dsv/scipro/war/MailConfig.java @@ -22,19 +22,11 @@ public class MailConfig { } @Bean - public Mailer mailer( - CurrentProfile currentProfile, - Session session, - FileService fileDescriptionService - ) { + public Mailer mailer(CurrentProfile currentProfile, Session session, FileService fileDescriptionService) { return switch (currentProfile.getCurrentProfile()) { case DEV -> new PrintingMailer(); case PROD -> new Mail(session, fileDescriptionService); - case TEST -> new RedirectingMailer( - session, - "scipro-mailtest@dsv.su.se", - fileDescriptionService - ); + case TEST -> new RedirectingMailer(session, "scipro-mailtest@dsv.su.se", fileDescriptionService); }; } diff --git a/war/src/main/java/se/su/dsv/scipro/war/Main.java b/war/src/main/java/se/su/dsv/scipro/war/Main.java index 0230f66159..9669f121d6 100644 --- a/war/src/main/java/se/su/dsv/scipro/war/Main.java +++ b/war/src/main/java/se/su/dsv/scipro/war/Main.java @@ -60,9 +60,7 @@ public class Main extends SpringBootServletInitializer implements ServletContain @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - for (PluginConfiguration pluginConfiguration : ServiceLoader.load( - PluginConfiguration.class - )) { + for (PluginConfiguration pluginConfiguration : ServiceLoader.load(PluginConfiguration.class)) { builder.sources(pluginConfiguration.getClass()); } return builder.sources(Main.class); diff --git a/war/src/main/java/se/su/dsv/scipro/war/SpringManagedWorkerTransactions.java b/war/src/main/java/se/su/dsv/scipro/war/SpringManagedWorkerTransactions.java index cab14397d6..e7850528d2 100644 --- a/war/src/main/java/se/su/dsv/scipro/war/SpringManagedWorkerTransactions.java +++ b/war/src/main/java/se/su/dsv/scipro/war/SpringManagedWorkerTransactions.java @@ -28,9 +28,7 @@ public class SpringManagedWorkerTransactions implements WorkerTransactionManager if (this.activeTransaction != null) { throw new IllegalStateException("A transaction is already active"); } - this.activeTransaction = platformTransactionManager.getTransaction( - TransactionDefinition.withDefaults() - ); + this.activeTransaction = platformTransactionManager.getTransaction(TransactionDefinition.withDefaults()); } @Override diff --git a/war/src/main/java/se/su/dsv/scipro/war/WorkerConfig.java b/war/src/main/java/se/su/dsv/scipro/war/WorkerConfig.java index 9df909d308..4acdf186a7 100644 --- a/war/src/main/java/se/su/dsv/scipro/war/WorkerConfig.java +++ b/war/src/main/java/se/su/dsv/scipro/war/WorkerConfig.java @@ -85,9 +85,7 @@ public class WorkerConfig { Provider<PlagiarismSubmitter> plagiarismSubmitter, Provider<StatusPollingWorker> urkundPoller, Provider<RemoveFulfilledPartnerAdsWorker> removeFulfilledPartnerAds, - Provider< - GradeFinalSeminarParticipantReminderWorker - > gradeFinalSeminarParticipantReminderWorkerProvider + Provider<GradeFinalSeminarParticipantReminderWorker> gradeFinalSeminarParticipantReminderWorkerProvider ) { return new TemporaryWorkerScheduler( scheduler, @@ -138,12 +136,7 @@ public class WorkerConfig { UrkundService urkundService, FileService fileService ) { - return new PlagiarismSubmitter( - urkundSettings, - plagiarismRequestRepository, - urkundService, - fileService - ); + return new PlagiarismSubmitter(urkundSettings, plagiarismRequestRepository, urkundService, fileService); } @Bean @@ -153,9 +146,7 @@ public class WorkerConfig { @Bean @Scope("prototype") - public WorkerTransactionManager workerTransactionManager( - PlatformTransactionManager platformTransactionManager - ) { + public WorkerTransactionManager workerTransactionManager(PlatformTransactionManager platformTransactionManager) { return new SpringManagedWorkerTransactions(platformTransactionManager); } @@ -228,11 +219,7 @@ public class WorkerConfig { DaysService daysService, MailEventService mailEventService ) { - return new ReviewerDecisionReminderWorker( - myReviewService, - daysService, - mailEventService - ); + return new ReviewerDecisionReminderWorker(myReviewService, daysService, mailEventService); } @Bean @@ -242,12 +229,7 @@ public class WorkerConfig { Provider<UrkundSettings> urkundSettingsProvider, Sukat sukat ) { - return new StatusPollingWorker( - urkundSubmissionRepository, - urkundApi, - urkundSettingsProvider, - sukat - ); + return new StatusPollingWorker(urkundSubmissionRepository, urkundApi, urkundSettingsProvider, sukat); } @Bean diff --git a/war/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java b/war/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java index 484a758215..6422184dd1 100755 --- a/war/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java +++ b/war/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java @@ -29,10 +29,7 @@ public class SchedulerImpl implements Lifecycle, Scheduler { private final Set<Task> runningWorkers = Collections.synchronizedSet(new HashSet<>()); @Inject - public SchedulerImpl( - ScheduledExecutorService scheduledExecutorService, - EntityManagerFactory emf - ) { + public SchedulerImpl(ScheduledExecutorService scheduledExecutorService, EntityManagerFactory emf) { this.scheduledExecutorService = scheduledExecutorService; this.emf = emf; } @@ -42,11 +39,7 @@ public class SchedulerImpl implements Lifecycle, Scheduler { scheduledExecutorService.execute(tracked(task)); } - void addTask( - final String description, - final Provider<? extends Worker> worker, - final Schedule schedule - ) { + void addTask(final String description, final Provider<? extends Worker> worker, final Schedule schedule) { Task task = new Task(description, worker, schedule); Runnable runnable = tracked(task); tasks.add(task); @@ -77,8 +70,9 @@ public class SchedulerImpl implements Lifecycle, Scheduler { runningWorkers.remove(task); // Clean up the shared EntityManager - EntityManagerHolder emHolder = - (EntityManagerHolder) TransactionSynchronizationManager.unbindResource(emf); + EntityManagerHolder emHolder = (EntityManagerHolder) TransactionSynchronizationManager.unbindResource( + emf + ); EntityManagerFactoryUtils.closeEntityManager(emHolder.getEntityManager()); } }; diff --git a/war/src/test/java/se/su/dsv/scipro/workerthreads/SchedulerImplTest.java b/war/src/test/java/se/su/dsv/scipro/workerthreads/SchedulerImplTest.java index 9a174b7a54..b73fe65de5 100644 --- a/war/src/test/java/se/su/dsv/scipro/workerthreads/SchedulerImplTest.java +++ b/war/src/test/java/se/su/dsv/scipro/workerthreads/SchedulerImplTest.java @@ -39,12 +39,7 @@ public class SchedulerImplTest { long period = 1; TimeUnit timeUnit = TimeUnit.SECONDS; scheduler.schedule("My worker").runBy(() -> abstractWorker).every(period, timeUnit); - verify(scheduledExecutorService).scheduleAtFixedRate( - any(Runnable.class), - eq(period), - eq(period), - eq(timeUnit) - ); + verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(period), eq(period), eq(timeUnit)); } @Test