Merge branch 'develop' into 3482-new-grading-criteria

# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepo.java

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.activityplan;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.checklist.Checklist;
 import se.su.dsv.scipro.checklist.ChecklistTemplate;
 import se.su.dsv.scipro.file.ProjectFileUpload;

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

@@ -4,7 +4,7 @@ import com.google.common.eventbus.EventBus;
 import com.google.inject.persist.Transactional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.checklist.Checklist;
 import se.su.dsv.scipro.checklist.ChecklistAnswerEnum;
 import se.su.dsv.scipro.checklist.ChecklistCategory;

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

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.activityplan;
 
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.User;
 

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.checklist;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 
 
 @Transactional

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.checklist;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 
 
 @Transactional

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

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.checklist;
 
 import com.google.inject.persist.Transactional;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.file;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 
 
 @Transactional

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.file;
 
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.Pageable;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.project.Project;
 
 import java.util.*;

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

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.file;
 
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.file;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 
 import java.util.*;

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

@@ -1,7 +1,7 @@
 package se.su.dsv.scipro.file;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 
 import jakarta.inject.Inject;

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.finalseminar;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.system.ProjectType;
 import se.su.dsv.scipro.system.User;
 

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

@@ -1,7 +1,7 @@
 
 package se.su.dsv.scipro.finalseminar;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.*;
 import se.su.dsv.scipro.util.Either;

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

@@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import jakarta.persistence.EntityManager;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.file.FileService;
 import se.su.dsv.scipro.misc.DaysService;

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

@@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
 import jakarta.persistence.EntityManager;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.file.FileDescription;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.file.FileService;

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

@@ -1,7 +1,7 @@
 package se.su.dsv.scipro.forum;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.forum.dataobjects.ForumThread;
 
 public interface AbstractThreadRepository extends JpaRepository<ForumThread, Long>, QueryDslPredicateExecutor<ForumThread> {

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.forum;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.forum.dataobjects.ForumPost;
 import se.su.dsv.scipro.forum.dataobjects.ForumPostReadState;
 import se.su.dsv.scipro.forum.dataobjects.ForumPostReadStateId;

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.forum;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.forum.dataobjects.ForumPost;
 import se.su.dsv.scipro.forum.dataobjects.ForumThread;
 import se.su.dsv.scipro.forum.dataobjects.ProjectThread;

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.forum;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.forum.dataobjects.GroupThread;
 import se.su.dsv.scipro.group.Group;
 

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.forum;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.forum.dataobjects.ProjectThread;
 import se.su.dsv.scipro.project.Project;
 

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

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.group;
 
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.FilteredService;

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.integration.activityfinalseminar;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.finalseminar.FinalSeminar;
 
 import java.util.Optional;

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

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.mail;
 
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 
 import jakarta.inject.Inject;

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

@@ -3,8 +3,8 @@ package se.su.dsv.scipro.match;
 import com.google.inject.persist.Transactional;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.PageRequest;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.DegreeType;
 import se.su.dsv.scipro.system.ProjectType;

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

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.match;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 
 
 @Transactional

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.match;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.ProjectType;
 import se.su.dsv.scipro.system.User;
 

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.match;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.match.Idea.Status;
 import se.su.dsv.scipro.match.Idea.Type;
 import se.su.dsv.scipro.system.*;

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

@@ -9,7 +9,7 @@ import com.querydsl.core.types.dsl.DateTimeExpression;
 import com.querydsl.jpa.JPAExpressions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.data.dataobjects.Member;
 import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;
 import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.match;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.GenericService;
 import se.su.dsv.scipro.system.ResearchArea;
 

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

@@ -4,9 +4,9 @@ import com.google.inject.persist.Transactional;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.PageRequest;
+import se.su.dsv.scipro.system.Pageable;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.ResearchArea;
 

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.match;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.User;
 
 import java.util.Set;

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

@@ -8,7 +8,7 @@ import com.querydsl.core.types.dsl.StringPath;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.JPQLQuery;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.User;
 
 import jakarta.inject.Inject;

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.match;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.GenericService;
 
 public interface MatchService extends GenericService<Match, Long> {

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

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.match;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 
 import jakarta.inject.Inject;

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

@@ -2,8 +2,8 @@ package se.su.dsv.scipro.match;
 
 import com.google.inject.persist.Transactional;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.PageRequest;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.Program;
 import se.su.dsv.scipro.system.QProgram;

core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepository.java

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.milestones;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
 import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
 import se.su.dsv.scipro.system.ProjectType;

core/src/main/java/se/su/dsv/scipro/milestones/service/MileStoneService.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.milestones.service;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.milestones.dataobjects.Milestone;
 import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
 import se.su.dsv.scipro.project.Project;

core/src/main/java/se/su/dsv/scipro/milestones/service/MilestonePhaseTemplateService.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.milestones.service;
 
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
 import se.su.dsv.scipro.springdata.SortOrderService;
 

core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneStatisticsService.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.milestones.service;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.project.ProjectStatus;

core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java

@@ -1,7 +1,7 @@
 package se.su.dsv.scipro.milestones.service.impl;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
 import se.su.dsv.scipro.milestones.dataobjects.QMilestonePhaseTemplate;
 import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;

core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java

@@ -4,7 +4,7 @@ import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.milestones.dataobjects.Milestone;
 import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
 import se.su.dsv.scipro.milestones.dataobjects.QMilestone;

core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java

@@ -8,8 +8,8 @@ import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringPath;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.Pageable;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.milestones.dataobjects.Milestone;
 import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
 import se.su.dsv.scipro.milestones.dataobjects.QMilestone;

core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java

@@ -3,7 +3,7 @@ package se.su.dsv.scipro.notifications;
 import com.google.inject.persist.Transactional;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.notifications.dataobject.Notification;
 import se.su.dsv.scipro.notifications.dataobject.NotificationEvent;
 import se.su.dsv.scipro.notifications.dataobject.QNotification;

core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepo.java

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.peer;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 
 
 @Transactional

core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepository.java

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.peer;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 
 @Transactional
 public interface PeerRequestRepository extends JpaRepository<PeerRequest, Long>, QueryDslPredicateExecutor<PeerRequest> {

core/src/main/java/se/su/dsv/scipro/peer/PeerRequestService.java

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

core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java

@@ -4,7 +4,7 @@ import com.google.common.eventbus.EventBus;
 import com.google.inject.persist.Transactional;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.file.FileService;
 import se.su.dsv.scipro.project.Project;

core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepository.java

@@ -1,7 +1,7 @@
 package se.su.dsv.scipro.peer;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.system.ProjectType;
 import se.su.dsv.scipro.system.User;
 

core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java

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

core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java

@@ -3,7 +3,7 @@ package se.su.dsv.scipro.peer;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.AbstractServiceImpl;
 import se.su.dsv.scipro.system.Language;

core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismRequestRepository.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.plagiarism;
 
-import org.springframework.data.jpa.repository.JpaRepository;
+import se.su.dsv.scipro.system.JpaRepository;
 import se.su.dsv.scipro.file.FileDescription;
 
 import java.util.Optional;

core/src/main/java/se/su/dsv/scipro/project/ProjectRepo.java

@@ -1,8 +1,8 @@
 package se.su.dsv.scipro.project;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.system.User;
 
 import java.util.Collection;

core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java

@@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.data.dataobjects.Member;
 import se.su.dsv.scipro.reusable.SciProUtilities;
 import se.su.dsv.scipro.system.AbstractServiceImpl;

core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerService.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.projectpartner;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.match.ApplicationPeriod;
 import se.su.dsv.scipro.system.GenericService;
 import se.su.dsv.scipro.system.ProjectType;

core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImpl.java

@@ -3,7 +3,7 @@ package se.su.dsv.scipro.projectpartner;
 import com.google.inject.persist.Transactional;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.JPAExpressions;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.match.ApplicationPeriod;
 import se.su.dsv.scipro.match.QIdea;
 import se.su.dsv.scipro.match.QIdeaParticipation;

core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepo.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.report;
 
-import org.springframework.data.jpa.repository.JpaRepository;
+import se.su.dsv.scipro.system.JpaRepository;
 import se.su.dsv.scipro.grading.GradingReportTemplateUpdate;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.ProjectType;

core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepo.java

@@ -1,7 +1,7 @@
 package se.su.dsv.scipro.report;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import se.su.dsv.scipro.system.JpaRepository;
+import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.finalseminar.FinalSeminarOpposition;
 
 public interface OppositionReportRepo extends JpaRepository<OppositionReport, Long>, QueryDslPredicateExecutor<OppositionReport> {

core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsService.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.reviewing;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.project.ProjectStatus;
 import se.su.dsv.scipro.system.GenericService;

core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java

@@ -7,7 +7,7 @@ import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringPath;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.finalseminar.QFinalSeminar;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.project.ProjectStatus;

core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerThreadRepository.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.reviewing;
 
-import org.springframework.data.jpa.repository.JpaRepository;
+import se.su.dsv.scipro.system.JpaRepository;
 import se.su.dsv.scipro.forum.dataobjects.ReviewerThread;
 import se.su.dsv.scipro.project.Project;
 

core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java

@@ -3,7 +3,7 @@ package se.su.dsv.scipro.springdata.serviceimpls;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.JPAExpressions;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.match.ApplicationPeriod;
 import se.su.dsv.scipro.match.QTarget;
 import se.su.dsv.scipro.security.auth.roles.Roles;

core/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.springdata.services;
 
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.match.ApplicationPeriod;
 import se.su.dsv.scipro.system.*;
 

core/src/main/java/se/su/dsv/scipro/survey/QuestionRepository.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.survey;
 
-import org.springframework.data.jpa.repository.JpaRepository;
+import se.su.dsv.scipro.system.JpaRepository;
 
 public interface QuestionRepository extends JpaRepository<Question, Long> {
 }

core/src/main/java/se/su/dsv/scipro/survey/SurveyRepository.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.survey;
 
-import org.springframework.data.jpa.repository.JpaRepository;
+import se.su.dsv.scipro.system.JpaRepository;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.system.User;
 

core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java

@@ -6,8 +6,6 @@ import com.querydsl.core.types.dsl.EntityPathBase;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringPath;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 
 import jakarta.inject.Provider;
 import jakarta.persistence.EntityManager;

core/src/main/java/se/su/dsv/scipro/system/FilteredService.java

@@ -1,7 +1,5 @@
 package se.su.dsv.scipro.system;
 
-import org.springframework.data.domain.Pageable;
-
 import java.io.Serializable;
 import java.util.List;
 

core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepo.java

@@ -1,8 +1,6 @@
 package se.su.dsv.scipro.system;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 
 @Transactional
 public interface FooterAddressRepo extends JpaRepository<FooterAddress, Long>, QueryDslPredicateExecutor<FooterAddress> {

core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepo.java

@@ -1,8 +1,6 @@
 package se.su.dsv.scipro.system;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 
 import java.util.List;
 import java.util.Optional;

core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java

@@ -6,10 +6,6 @@ import com.querydsl.core.types.dsl.EntityPathBase;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringPath;
 import com.querydsl.jpa.impl.JPAQuery;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 
 import jakarta.inject.Provider;
 import jakarta.persistence.EntityManager;

core/src/main/java/se/su/dsv/scipro/system/GenericService.java

@@ -1,7 +1,6 @@
 package se.su.dsv.scipro.system;
 
 import com.querydsl.core.types.Predicate;
-import org.springframework.data.domain.Pageable;
 
 import java.io.Serializable;
 import java.util.List;

core/src/main/java/se/su/dsv/scipro/system/JpaRepository.java

@@ -1,4 +1,4 @@
-package org.springframework.data.jpa.repository;
+package se.su.dsv.scipro.system;
 
 import java.io.Serializable;
 import java.util.List;

core/src/main/java/se/su/dsv/scipro/system/LocalUserSearch.java

@@ -1,6 +1,5 @@
 package se.su.dsv.scipro.system;
 
-import org.springframework.data.domain.PageRequest;
 import se.su.dsv.scipro.security.auth.roles.Roles;
 
 import jakarta.inject.Inject;

core/src/main/java/se/su/dsv/scipro/system/PageRequest.java

@@ -1,4 +1,4 @@
-package org.springframework.data.domain;
+package se.su.dsv.scipro.system;
 
 import java.util.Objects;
 

core/src/main/java/se/su/dsv/scipro/system/Pageable.java

@@ -1,4 +1,4 @@
-package org.springframework.data.domain;
+package se.su.dsv.scipro.system;
 
 public interface Pageable {
     long getOffset();

core/src/main/java/se/su/dsv/scipro/system/PasswordRepo.java

@@ -1,8 +1,6 @@
 package se.su.dsv.scipro.system;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 
 
 @Transactional

core/src/main/java/se/su/dsv/scipro/system/QueryDslPredicateExecutor.java

@@ -1,7 +1,6 @@
-package org.springframework.data.querydsl;
+package se.su.dsv.scipro.system;
 
 import com.querydsl.core.types.Predicate;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 

core/src/main/java/se/su/dsv/scipro/system/Sort.java

@@ -1,4 +1,4 @@
-package org.springframework.data.domain;
+package se.su.dsv.scipro.system;
 
 import java.util.Objects;
 

core/src/main/java/se/su/dsv/scipro/system/UserRepo.java

@@ -1,9 +1,6 @@
 package se.su.dsv.scipro.system;
 
 import com.google.inject.persist.Transactional;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 import se.su.dsv.scipro.security.auth.roles.Roles;
 
 import java.util.Collection;

core/src/main/java/se/su/dsv/scipro/system/UserRepoImpl.java

@@ -1,7 +1,6 @@
 package se.su.dsv.scipro.system;
 
 import com.querydsl.jpa.JPAExpressions;
-import org.springframework.data.domain.Pageable;
 import se.su.dsv.scipro.security.auth.roles.Roles;
 
 import jakarta.inject.Inject;

core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java

@@ -2,7 +2,6 @@ package se.su.dsv.scipro.system;
 
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
-import org.springframework.data.domain.Pageable;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;

core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java

@@ -1,6 +1,6 @@
 package se.su.dsv.scipro.workerthreads;
 
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.finalseminar.FinalSeminar;
 import se.su.dsv.scipro.finalseminar.FinalSeminarService;
 import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;

core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java

@@ -4,8 +4,8 @@ import com.google.common.eventbus.EventBus;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.PageRequest;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.checklist.ChecklistTemplateService;
 import se.su.dsv.scipro.file.FileDescription;
 import se.su.dsv.scipro.file.FileReference;

core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.checklist;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.project.Project;
 import se.su.dsv.scipro.reusable.SciProUtilities;
 import se.su.dsv.scipro.system.DegreeType;

core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java

@@ -3,7 +3,7 @@ package se.su.dsv.scipro.finalseminar;
 import com.google.common.collect.Lists;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.file.FileDescription;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.project.Project;

core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java

@@ -5,7 +5,7 @@ import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.file.FileService;
 import se.su.dsv.scipro.file.ProjectFileUpload;

core/src/test/java/se/su/dsv/scipro/match/IdeaFacadeTest.java

@@ -6,8 +6,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+import se.su.dsv.scipro.system.PageRequest;
+import se.su.dsv.scipro.system.Pageable;
 import se.su.dsv.scipro.system.DegreeType;
 import se.su.dsv.scipro.system.ProjectType;
 import se.su.dsv.scipro.system.User;

core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java

@@ -8,7 +8,7 @@ import org.hamcrest.core.Every;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.system.*;
 import se.su.dsv.scipro.test.IntegrationTest;
 

core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java

@@ -6,8 +6,8 @@ import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.PageRequest;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.security.auth.roles.Roles;
 import se.su.dsv.scipro.system.DegreeType;
 import se.su.dsv.scipro.system.ProjectType;

core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.Sort;
+import se.su.dsv.scipro.system.Sort;
 import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
 import se.su.dsv.scipro.test.IntegrationTest;
 

core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.milestones.dataobjects.Milestone;
 import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
 import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;

core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.milestones.dataobjects.Milestone;
 import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
 import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;

core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java

@@ -4,7 +4,7 @@ import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.notifications.dataobject.Notification;
 import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
 import se.su.dsv.scipro.project.Project;

core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.file.FileDescription;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.project.Project;

core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.file.FileDescription;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.project.Project;

core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.file.FileDescription;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.project.Project;

core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java

@@ -3,7 +3,7 @@ package se.su.dsv.scipro.peer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.file.FileDescription;
 import se.su.dsv.scipro.file.FileReference;
 import se.su.dsv.scipro.project.Project;

core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.project;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.system.DegreeType;
 import se.su.dsv.scipro.system.ProjectType;
 import se.su.dsv.scipro.system.Unit;

core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.projectpartner;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.match.ApplicationPeriod;
 import se.su.dsv.scipro.system.DegreeType;
 import se.su.dsv.scipro.system.ProjectType;

core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImplTest.java

@@ -2,7 +2,7 @@ package se.su.dsv.scipro.springdata.serviceimpls;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
+import se.su.dsv.scipro.system.PageRequest;
 import se.su.dsv.scipro.security.auth.roles.Roles;
 import se.su.dsv.scipro.springdata.services.SupervisorService;
 import se.su.dsv.scipro.system.ResearchArea;

core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java

@@ -2,7 +2,6 @@ package se.su.dsv.scipro.system;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.domain.PageRequest;
 import se.su.dsv.scipro.security.auth.roles.Roles;
 import se.su.dsv.scipro.test.IntegrationTest;