This commit is contained in:
Andreas Svanberg 2022-12-06 16:54:10 +01:00
parent 92303a6345
commit dcad2c82b2
53 changed files with 42 additions and 102 deletions
core/src
daisy-integration/src
view/src

@ -55,7 +55,7 @@ public class FinalSeminarCreationSubscribers {
.stream()
.filter(subscriber -> onlyFailedOppositions(subscriber) || onlyFailedParticipations(subscriber))
.map(Author::getUser)
.collect(Collectors.toList());
.toList();
}
private boolean onlyFailedParticipations(Author subscriber) {

@ -1,6 +1,4 @@
package se.su.dsv.scipro.finalseminar;
import java.time.LocalDate;
public sealed interface SchedulingError permits MovingError, RoughDraftNotApproved {
}

@ -15,7 +15,6 @@ import se.su.dsv.scipro.util.Pair;
import javax.inject.Inject;
import javax.inject.Provider;
import java.util.*;
import java.util.stream.Collectors;
import static com.querydsl.core.types.dsl.Expressions.allOf;
@ -45,6 +44,6 @@ public class ForumPostRepositoryImpl extends GenericRepo<ForumPost, Long> implem
.map(tuple -> new Pair<>(
tuple.get(QProjectThread.projectThread),
tuple.get(QForumPost.forumPost)))
.collect(Collectors.toList());
.toList();
}
}

@ -70,7 +70,7 @@ public class SendForumMail {
List<User> recipients = Stream.concat(Stream.of(project.getHeadSupervisor()), project.getCoSupervisors().stream())
.filter(user -> !Objects.equals(event.getReply().getPostedBy(), user))
.filter(userProfileService::isReceiveForumMail)
.collect(Collectors.toList());
.toList();
Set<FileReference> attachments = event.getReply().getAttachments();
MailData data = new MailData(event.getProjectThread().getForumThread(), attachments);
@ -95,7 +95,7 @@ public class SendForumMail {
.flatMap(project -> Stream.concat(Stream.of(project.getHeadSupervisor()), project.getCoSupervisors().stream()))
.filter(user -> !Objects.equals(event.getReply().getPostedBy(), user))
.filter(userProfileService::isReceiveForumMail)
.collect(Collectors.toList());
.toList();
Set<FileReference> attachments = event.getReply().getAttachments();
MailData data = new MailData(event.getGroupThread().getForumThread(), attachments);

@ -105,7 +105,7 @@ public class ZipReporter implements Reporter {
.map(FinalSeminar::getDocument)
.filter(Objects::nonNull)
.map(FileReference::getFileDescription)
.collect(Collectors.toList());
.toList();
copyFiles(zipFileFS, finalSeminarDocuments);
final List<Node> personalInformation = new LinkedList<>(Arrays.asList(
@ -116,7 +116,7 @@ public class ZipReporter implements Reporter {
.stream()
.map(username ->
li(textL(username.getUsername())))
.collect(Collectors.toList()))
.toList())
),
dt("Created"), dd(text(dateString(user.getDateCreated()))),
dt("Program admissions"), dd(
@ -124,7 +124,7 @@ public class ZipReporter implements Reporter {
.stream()
.map(program ->
li(textL(program.getNameEn() + " (" + program.getCode() + ")")))
.collect(Collectors.toList())
.toList()
)
)
));
@ -148,7 +148,7 @@ public class ZipReporter implements Reporter {
h2(text("Authorships")),
ul(projects.stream()
.map(project -> authorshipReport(user, project))
.collect(Collectors.toList())
.toList()
)
));
@ -182,7 +182,7 @@ public class ZipReporter implements Reporter {
dt("Prerequisites"), dd(text(idea.getPrerequisites()))
))
)))
.collect(Collectors.toList());
.toList();
if (ideas.isEmpty()) {
return Collections.emptyList();
@ -206,7 +206,7 @@ public class ZipReporter implements Reporter {
div(reviewedProjects.stream()
.map(project -> reviewerReport(user, project))
.flatMap(Collection::stream)
.collect(Collectors.toList()))
.toList())
);
}
@ -231,7 +231,7 @@ public class ZipReporter implements Reporter {
dt("Feedback"), dd(text(Objects.requireNonNullElse(decision.getReason(), "-")))
))
)))
.collect(Collectors.toList());
.toList();
if (!decisions.isEmpty()) {
return List.of(
h4(text("Reviewer decisions")),
@ -256,7 +256,7 @@ public class ZipReporter implements Reporter {
div(projects.stream()
.map(project -> supervisorshipReport(user, project))
.flatMap(Collection::stream)
.collect(Collectors.toList()))
.toList())
);
}
@ -288,7 +288,7 @@ public class ZipReporter implements Reporter {
dt("Comment"), dd(text(Objects.requireNonNullElse(decision.getComment(), "-")))
))
)))
.collect(Collectors.toList());
.toList();
if (!decisions.isEmpty()) {
return List.of(
h4(text("Reviewer approvals requested")),
@ -317,7 +317,7 @@ public class ZipReporter implements Reporter {
.stream()
.filter(forumPost -> forumPost.getPostedBy().equals(user))
.map(forumPost -> li(forumPostToHtml(forumPost)))
.collect(Collectors.toList());
.toList();
if (!forumPosts.isEmpty()) {
return List.of(
h4(text("Reviewer interactions")),
@ -350,7 +350,7 @@ public class ZipReporter implements Reporter {
strong(text(String.format("%s (%s/%d points)", gc.getTitle(), Objects.requireNonNullElse(gc.getPoints(), "-"), gc.getMaxPoints()))),
p(text(gc.getFeedback()))
)))
.collect(Collectors.toList());
.toList();
list.add(ul(criteria));
return list;
}
@ -371,7 +371,7 @@ public class ZipReporter implements Reporter {
))
))
)
.collect(Collectors.toList());
.toList();
if (!ideas.isEmpty()) {
return Arrays.asList(
h2(text("Ideas")),
@ -398,7 +398,7 @@ public class ZipReporter implements Reporter {
.filter(post -> post.getPostedBy().equals(user))
.sorted(Comparator.comparing(ForumPost::getDateCreated))
.map(post -> li(forumPostToHtml(post)))
.collect(Collectors.toList());
.toList();
if (!posts.isEmpty()) {
return Arrays.asList(
h2(text("Group forum posts")),
@ -453,7 +453,7 @@ public class ZipReporter implements Reporter {
h4(text(heading)),
ul(oppositions.stream()
.map(opposition -> li(finalSeminarParticipantReport(opposition)))
.collect(Collectors.toList())
.toList()
)
);
}
@ -474,7 +474,7 @@ public class ZipReporter implements Reporter {
.filter(post -> post.getPostedBy().equals(user))
.sorted(Comparator.comparing(ForumPost::getDateCreated))
.map(post -> li(forumPostToHtml(post)))
.collect(Collectors.toList());
.toList();
if (!posts.isEmpty()) {
return Arrays.asList(
h4(text("Forum posts")),
@ -491,7 +491,7 @@ public class ZipReporter implements Reporter {
h4(text("Peer reviews")),
ul(peerReviews.stream()
.map(peerReview -> li(peerReviewReport(peerReview)))
.collect(Collectors.toList())
.toList()
)
);
}
@ -529,7 +529,7 @@ public class ZipReporter implements Reporter {
))
))
)
.collect(Collectors.toList())
.toList()
)
)
));
@ -542,7 +542,7 @@ public class ZipReporter implements Reporter {
h4(text("Peer requests")),
ul(peerRequests.stream()
.map(peerRequest -> li(peerRequestReport(peerRequest)))
.collect(Collectors.toList())
.toList()
)
);
}

@ -10,7 +10,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@Entity
@Table(name = "project_group")
@ -57,7 +56,7 @@ public class Group extends DomainObject {
return projects.stream()
.flatMap(project -> project.getMembers().stream())
.filter(member -> member.getType() != Member.Type.REVIEWER)
.collect(Collectors.toList());
.toList();
}
public Set<Project> getProjects() {

@ -82,7 +82,7 @@ public class ApplicationPeriodServiceImpl extends AbstractServiceImpl<Applicatio
return applicationPeriod.getProjectTypes()
.stream()
.filter(projectType -> projectType.getDegreeType() == student.getDegreeType())
.collect(Collectors.toList());
.toList();
}
}

@ -4,7 +4,7 @@ import se.su.dsv.scipro.system.LazyDeletableDomainObject;
import se.su.dsv.scipro.system.ResearchArea;
import jakarta.persistence.*;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;

@ -85,7 +85,7 @@ public class MatchFollowUpServiceImpl implements MatchFollowUpService {
.filter(unmet())
.skip(Ints.checkedCast(pageable.getOffset()))
.limit(Ints.checkedCast(pageable.getLimit()))
.collect(Collectors.toList());
.toList();
}
@Override

@ -1,7 +1,6 @@
package se.su.dsv.scipro.peer;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.checklist.ChecklistTemplate;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.*;

@ -11,7 +11,6 @@ import javax.inject.Inject;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
public class SurveyServiceImpl implements SurveyService {
@ -145,7 +144,7 @@ public class SurveyServiceImpl implements SurveyService {
answer.setQuestion(question);
return answer;
})
.collect(Collectors.toList());
.toList();
survey.setProject(project);
survey.setUser(author);
survey.setAnswers(answers);

@ -5,7 +5,6 @@ import javax.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
public class ResearchAreaServiceImpl extends AbstractServiceImpl<ResearchArea,Long> implements ResearchAreaService {
@Inject
@ -34,6 +33,6 @@ public class ResearchAreaServiceImpl extends AbstractServiceImpl<ResearchArea,Lo
return findAll(QResearchArea.researchArea.deleted.isFalse())
.stream()
.sorted(Comparator.comparing(ResearchArea::getTitle))
.collect(Collectors.toList());
.toList();
}
}

@ -1,16 +1,13 @@
package se.su.dsv.scipro.forum;
import com.google.common.eventbus.EventBus;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.AdditionalAnswers;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import se.su.dsv.scipro.forum.dataobjects.ForumPost;
import se.su.dsv.scipro.forum.dataobjects.ForumPostReadState;
import se.su.dsv.scipro.forum.dataobjects.ForumThread;

@ -20,7 +20,6 @@ import se.su.dsv.scipro.report.SupervisorGradingReportSubmittedEvent;
import se.su.dsv.scipro.system.User;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;

@ -8,7 +8,6 @@ import se.su.dsv.scipro.test.IntegrationTest;
import javax.inject.Inject;
import java.util.Collections;
import java.util.List;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;

@ -22,7 +22,6 @@ import se.su.dsv.scipro.system.UserService;
import javax.inject.Inject;
import jakarta.ws.rs.ClientErrorException;
import java.util.*;
import java.util.stream.Collectors;
/**
* Importer implementation, uses standard HTTP requests and Json-wrappers.
@ -55,7 +54,7 @@ public class ExternalImporterDaisyImpl implements ExternalImporter, UserImportSe
.stream()
.filter(person -> !person.isDeceased())
.map(this::toImportableUser)
.collect(Collectors.toList());
.toList();
}
private ImportableUser toImportableUser(Person person) {

@ -19,7 +19,6 @@ import se.su.dsv.scipro.util.Pair;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Named
@ -165,7 +164,7 @@ public class ImporterTransactionsImpl implements ImporterTransactions {
List<ResearchArea> researchAreas = client.getResearchAreas(person.getId())
.stream()
.filter(ResearchArea::isActive)
.collect(Collectors.toList());
.toList();
for (ResearchArea daisyResearchArea : researchAreas) {
se.su.dsv.scipro.system.ResearchArea researchArea =
researchAreaService.updateExternalResearchArea(daisyResearchArea.getId(), daisyResearchArea.getNameEn(), daisyResearchArea.isActive());

@ -10,7 +10,6 @@ import se.su.dsv.scipro.system.User;
import javax.inject.Inject;
import java.util.List;
import java.util.stream.Collectors;
class DaisyConsentService implements PublishingConsentService {
private static final PublishingConsent UNAVAILABLE = new PublishingConsent(null, List.of());
@ -41,7 +40,7 @@ class DaisyConsentService implements PublishingConsentService {
.stream()
.map(DaisyConsentService::fromDaisyLevel)
.sorted()
.collect(Collectors.toList());
.toList();
return new PublishingConsent(selected, available);
} catch (ProcessingException | WebApplicationException e) {
return UNAVAILABLE;

@ -15,7 +15,6 @@ import se.su.dsv.scipro.io.impl.ExternalExporterDaisyImpl;
import se.su.dsv.scipro.match.IdeaCreationJudge;
import se.su.dsv.scipro.system.UserImportService;
import se.su.dsv.scipro.system.UserSearchProvider;
import se.su.dsv.scipro.system.UserSearchService;
public class DaisyModule extends ServletModule {
@Override

@ -15,7 +15,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
public class DaisyUserSearchService implements UserSearchProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(DaisyUserSearchService.class);
@ -42,7 +41,7 @@ public class DaisyUserSearchService implements UserSearchProvider {
.map(person -> userService.findByExternalIdentifier(person.getId()))
.filter(Objects::nonNull)
.filter(user -> role.stream().anyMatch(user::hasRole))
.collect(Collectors.toList());
.toList();
}
catch (ProcessingException | WebApplicationException e) {
LOGGER.debug("Failed to search for users in Daisy", e);

@ -24,7 +24,6 @@ import javax.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.Year;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class UserImportWorker extends AbstractWorker {
@ -222,6 +221,6 @@ public class UserImportWorker extends AbstractWorker {
.limit(5)
.map(Year::getValue)
.flatMap(year -> Stream.of(Semester.spring(year), Semester.autumn(year)))
.collect(Collectors.toList());
.toList();
}
}

@ -13,14 +13,10 @@ import se.su.dsv.scipro.match.ProgramService;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.system.*;
import jakarta.ws.rs.core.Response;
import java.util.HashMap;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)

@ -1,6 +1,5 @@
package se.su.dsv.scipro.admin.panels;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.OnEventHeaderItem;

@ -6,7 +6,6 @@ import org.apache.wicket.markup.html.form.validation.AbstractFormValidator;
import org.apache.wicket.util.lang.Args;
import java.time.LocalDate;
import java.util.Date;
public class DatesValidator extends AbstractFormValidator {
private final FormComponent<LocalDate> firstDateComponent;

@ -19,7 +19,6 @@ import se.su.dsv.scipro.util.PageParameterKeys;
import javax.inject.Inject;
import java.util.List;
import java.util.stream.Collectors;
public class ProjectActiveParticipationListPanel extends GenericPanel<Project> {
@Inject
@ -51,7 +50,7 @@ public class ProjectActiveParticipationListPanel extends GenericPanel<Project> {
return seminars.getObject().stream()
.flatMap(input -> input.getActiveParticipations().stream())
.filter(input -> getModelObject().isParticipant(input.getUser()))
.collect(Collectors.toList());
.toList();
}
@Override

@ -18,7 +18,6 @@ import se.su.dsv.scipro.util.PageParameterKeys;
import javax.inject.Inject;
import java.util.List;
import java.util.stream.Collectors;
public class ProjectOppositionsListPanel extends GenericPanel<Project> {
@Inject
@ -59,7 +58,7 @@ public class ProjectOppositionsListPanel extends GenericPanel<Project> {
return seminars.getObject().stream()
.flatMap(input -> input.getOppositions().stream())
.filter(input -> getModelObject().isParticipant(input.getUser()))
.collect(Collectors.toList());
.toList();
}
@Override

@ -11,7 +11,6 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import se.su.dsv.scipro.file.FileUpload;
import se.su.dsv.scipro.files.WicketFileUpload;
import se.su.dsv.scipro.forum.Attachment;
import se.su.dsv.scipro.forum.Forum;

@ -14,7 +14,6 @@ import se.su.dsv.scipro.forum.ForumThread;
import se.su.dsv.scipro.forum.dataobjects.ForumPost;
import se.su.dsv.scipro.session.SciProSession;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

@ -36,7 +36,7 @@ public class ProjectCriteriaGradingReportPdf implements GradingReportPdf {
return gradingReport.getGradingCriteria()
.stream()
.filter(c -> c instanceof ProjectGradingCriterion)
.collect(Collectors.toList());
.toList();
}
@Override

@ -8,7 +8,6 @@ import se.su.dsv.scipro.mail.MailEvent;
import se.su.dsv.scipro.mail.MailEventService;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
import javax.inject.Inject;
import java.util.Collections;

@ -1,6 +1,5 @@
package se.su.dsv.scipro.match;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.EnumLabel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.basic.MultiLineLabel;
@ -19,7 +18,6 @@ import java.time.*;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;
public class ProjectIdeaDetailsPanel extends GenericPanel<Idea> {
private final IModel<User> currentUser;
@ -80,7 +78,7 @@ public class ProjectIdeaDetailsPanel extends GenericPanel<Idea> {
.stream()
.map(IdeaParticipation::getUser)
.filter(Predicate.not(currentUser.getObject()::equals))
.collect(Collectors.toList());
.toList();
}
@Override

@ -1,6 +1,5 @@
package se.su.dsv.scipro.notes;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnEventHeaderItem;

@ -2,7 +2,6 @@ package se.su.dsv.scipro.peer;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.html.panel.GenericPanel;
@ -23,7 +22,6 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeSettings;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
import javax.inject.Inject;
import java.util.Arrays;

@ -2,7 +2,6 @@ package se.su.dsv.scipro.project.panels;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
@ -18,7 +17,6 @@ import se.su.dsv.scipro.reflection.ReflectionService;
import se.su.dsv.scipro.session.SciProSession;
import javax.inject.Inject;
import java.io.Serializable;
public class ReflectionPanel extends GenericPanel<Project> {

@ -72,7 +72,7 @@ public class TimelinePanel extends Panel {
}
private Collection<Event> expandMultiple(final Collection<Decision> finalSeminarDecisions) {
return finalSeminarDecisions.stream().flatMap(input -> expand(input).stream()).collect(Collectors.toList());
return finalSeminarDecisions.stream().flatMap(input -> expand(input).stream()).toList();
}
private List<Event> expand(final Decision decision) {

@ -16,7 +16,6 @@ import se.su.dsv.scipro.system.User;
import javax.inject.Inject;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
public class SupervisorApplicationPeriodStatisticsPanel extends GenericPanel<User> {
@Inject
@ -35,7 +34,7 @@ public class SupervisorApplicationPeriodStatisticsPanel extends GenericPanel<Use
return new PeriodTypeTarget(period, projectType, target);
}))
.filter(ptt -> ptt.getTarget().getTarget() > 0)
.collect(Collectors.toList()));
.toList());
add(new ListView<>("targets", targets){
@Override

@ -19,7 +19,6 @@ import javax.inject.Inject;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
public class SupervisorIdeaStatisticsPanel extends Panel {
@ -49,7 +48,7 @@ public class SupervisorIdeaStatisticsPanel extends Panel {
return rowModel.map(idea -> idea.getIdeaParticipations()
.stream()
.map(IdeaParticipation::getUser)
.collect(Collectors.toList()));
.toList());
}
}
);

@ -11,7 +11,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.file.FileUpload;
import se.su.dsv.scipro.files.WicketFileUpload;
import se.su.dsv.scipro.project.Project;

@ -18,7 +18,6 @@ import javax.inject.Inject;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public class AdminImportUserPage extends AbstractAdminUsersPage {
@ -43,7 +42,7 @@ public class AdminImportUserPage extends AbstractAdminUsersPage {
List<ImportableUser> byPersonnummer = userImportServices.stream()
.map(uis -> uis.search(searchTermModel.getObject()))
.flatMap(List::stream)
.collect(Collectors.toList());
.toList();
importablePeopleModel.setObject(byPersonnummer);
}
});

@ -4,7 +4,6 @@ import org.apache.wicket.Page;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.PageTest;
import se.su.dsv.scipro.components.ModalWindowPlus;
import se.su.dsv.scipro.dataproviders.FilteredDataProvider;
@ -14,8 +13,6 @@ import java.util.List;
import static java.util.Arrays.asList;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
import static se.su.dsv.scipro.admin.pages.AdminMailLogPage.MAIL_EVENTS;
import static se.su.dsv.scipro.admin.pages.AdminMailLogPage.MAIL_MODAL;

@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.SciProTest;
import se.su.dsv.scipro.system.ProjectType;
import java.util.Arrays;
import java.util.Collections;
import static org.mockito.Mockito.when;

@ -8,7 +8,6 @@ import se.su.dsv.scipro.system.FooterAddress;
import java.util.Collections;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

@ -26,8 +26,6 @@ import java.util.Date;
import java.util.Optional;
import java.util.TreeSet;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)

@ -7,7 +7,6 @@ import se.su.dsv.scipro.system.ProjectModule;
import static org.hamcrest.core.StringContains.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
public class SupervisorFinalSeminarListingPageTest extends SciProTest {

@ -8,7 +8,6 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import java.util.Arrays;
import java.util.Collections;
import static org.mockito.ArgumentMatchers.any;

@ -3,13 +3,11 @@ package se.su.dsv.scipro.grading;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JasperCompileManager;
import net.sf.jasperreports.engine.JasperFillManager;
import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.report.GradingCriterion;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;

@ -7,7 +7,6 @@ import se.su.dsv.scipro.SciProTest;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.test.ObjectMother;
import java.util.Arrays;
import java.util.Collections;
public class AdminIdeaStatusStatisticsPageTest extends SciProTest {

@ -12,7 +12,6 @@ import org.mockito.Mockito;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.SciProTest;
import se.su.dsv.scipro.components.ExportableDataPanel;
import se.su.dsv.scipro.data.enums.DateStyle;
import se.su.dsv.scipro.test.DomainObjects;
import java.util.Collections;

@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.hasItem;
@ -203,7 +202,7 @@ public class ProjectIdeaSubmissionPanelTest extends SciProTest {
final Iterable<String> renderedMessages = model.getObject().stream()
.map(input -> input.getMessage() instanceof ValidationErrorFeedback
? ((ValidationErrorFeedback) input.getMessage()).getMessage().toString()
: input.getMessage().toString()).collect(Collectors.toList());
: input.getMessage().toString()).toList();
for (String message : messages) {
assertThat(renderedMessages, hasItem(equalTo(message)));
}

@ -7,7 +7,6 @@ import se.su.dsv.scipro.SciProTest;
import se.su.dsv.scipro.nonworkperiod.NonWorkDayPeriod;
import java.time.LocalDate;
import java.util.Date;
public class NonWorkDaysCRUDPanelTest extends SciProTest {

@ -5,8 +5,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.junit.jupiter.api.BeforeEach;
import se.su.dsv.scipro.PageTest;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.supervisor.pages.SupervisorPageTest;
import se.su.dsv.scipro.test.ObjectMother;
import se.su.dsv.scipro.util.PageParameterKeys;
import static org.mockito.ArgumentMatchers.anyLong;

@ -6,7 +6,6 @@ import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.SciProTest;
import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;

@ -6,14 +6,12 @@ import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import se.su.dsv.scipro.SciProTest;
import se.su.dsv.scipro.profile.UserLabel;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.ObjectMother;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import static se.su.dsv.scipro.statistics.AdminMultipleAuthorsStatisticsPage.AUTHOR_LIST;
import static se.su.dsv.scipro.statistics.AdminMultipleAuthorsStatisticsPage.PROJECTS;