DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 4 Actions Projects 1 Wiki Activity

Allows admins to manage grading report templates #14

Merged
niat8586 merged 41 commits from 3482-new-grading-criteria into develop 2024-10-30 10:05:23 +01:00
Conversation 4 Commits 41 Files Changed 69 +161 -184
140 changed files with 161 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 42eb4d36d9 - Show all commits

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.activityplan; 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.Checklist;
import se.su.dsv.scipro.checklist.ChecklistTemplate; import se.su.dsv.scipro.checklist.ChecklistTemplate;
import se.su.dsv.scipro.file.ProjectFileUpload; import se.su.dsv.scipro.file.ProjectFileUpload;

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

@ -4,7 +4,7 @@ import com.google.common.eventbus.EventBus;
import com.google.inject.persist.Transactional; import com.google.inject.persist.Transactional;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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.Checklist;
import se.su.dsv.scipro.checklist.ChecklistAnswerEnum; import se.su.dsv.scipro.checklist.ChecklistAnswerEnum;
import se.su.dsv.scipro.checklist.ChecklistCategory; import se.su.dsv.scipro.checklist.ChecklistCategory;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.activityplan;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate; 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.AbstractServiceImpl;
import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.User;

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

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

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

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

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.checklist;
import com.google.inject.persist.Transactional; import com.google.inject.persist.Transactional;
import com.querydsl.core.types.dsl.BooleanExpression; 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.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl; import se.su.dsv.scipro.system.AbstractServiceImpl;

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

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

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

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

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.file;
import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.impl.JPAQuery; 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.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl; import se.su.dsv.scipro.system.AbstractServiceImpl;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.file; 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 se.su.dsv.scipro.project.Project;
import java.util.*; import java.util.*;

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

@ -1,7 +1,7 @@
package se.su.dsv.scipro.file; package se.su.dsv.scipro.file;
import com.google.inject.persist.Transactional; 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 se.su.dsv.scipro.project.Project;
import jakarta.inject.Inject; import jakarta.inject.Inject;

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

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

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

@ -1,7 +1,7 @@
package se.su.dsv.scipro.finalseminar; 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.project.Project;
import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.Either; import se.su.dsv.scipro.util.Either;

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

@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.BooleanExpression;
import jakarta.persistence.EntityManager; 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.FileReference;
import se.su.dsv.scipro.file.FileService; import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.misc.DaysService; import se.su.dsv.scipro.misc.DaysService;

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

@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate; import com.querydsl.core.types.Predicate;
import jakarta.persistence.EntityManager; 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.FileDescription;
import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.file.FileService; import se.su.dsv.scipro.file.FileService;

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

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

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

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

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

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

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

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

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

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

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.group;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression; 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.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl; import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.FilteredService; import se.su.dsv.scipro.system.FilteredService;

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

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

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.mail;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate; 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.AbstractServiceImpl;
import jakarta.inject.Inject; import jakarta.inject.Inject;

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

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

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

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

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match; 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.ProjectType;
import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.User;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match; 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.Status;
import se.su.dsv.scipro.match.Idea.Type; import se.su.dsv.scipro.match.Idea.Type;
import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.*;

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

@ -9,7 +9,7 @@ import com.querydsl.core.types.dsl.DateTimeExpression;
import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.JPAExpressions;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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.data.dataobjects.Member;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings; import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService; import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match; 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.GenericService;
import se.su.dsv.scipro.system.ResearchArea; import se.su.dsv.scipro.system.ResearchArea;

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

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

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match; 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 se.su.dsv.scipro.system.User;
import java.util.Set; import java.util.Set;

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

@ -8,7 +8,7 @@ import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.JPQLQuery; import com.querydsl.jpa.JPQLQuery;
import com.querydsl.jpa.impl.JPAQuery; 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 se.su.dsv.scipro.system.User;
import jakarta.inject.Inject; import jakarta.inject.Inject;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match; 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.GenericService;
public interface MatchService extends GenericService<Match, Long> { public interface MatchService extends GenericService<Match, Long> {

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match; 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 se.su.dsv.scipro.system.AbstractServiceImpl;
import jakarta.inject.Inject; import jakarta.inject.Inject;

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

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

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

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

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.milestones.service; 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.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate; import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.milestones.service; 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.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.springdata.SortOrderService; import se.su.dsv.scipro.springdata.SortOrderService;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.milestones.service; 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.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectStatus; import se.su.dsv.scipro.project.ProjectStatus;

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

@ -1,7 +1,7 @@
package se.su.dsv.scipro.milestones.service.impl; package se.su.dsv.scipro.milestones.service.impl;
import com.google.inject.persist.Transactional; 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.MilestonePhaseTemplate;
import se.su.dsv.scipro.milestones.dataobjects.QMilestonePhaseTemplate; import se.su.dsv.scipro.milestones.dataobjects.QMilestonePhaseTemplate;
import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService; import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;

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

@ -4,7 +4,7 @@ import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate; import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.impl.JPAQuery; 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.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate; import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.QMilestone; import se.su.dsv.scipro.milestones.dataobjects.QMilestone;

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

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

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

@ -3,7 +3,7 @@ package se.su.dsv.scipro.notifications;
import com.google.inject.persist.Transactional; import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate; 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.Notification;
import se.su.dsv.scipro.notifications.dataobject.NotificationEvent; import se.su.dsv.scipro.notifications.dataobject.NotificationEvent;
import se.su.dsv.scipro.notifications.dataobject.QNotification; import se.su.dsv.scipro.notifications.dataobject.QNotification;

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

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

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

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

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.peer; 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.project.Project;
import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.*;

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

@ -4,7 +4,7 @@ import com.google.common.eventbus.EventBus;
import com.google.inject.persist.Transactional; import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression; 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.FileReference;
import se.su.dsv.scipro.file.FileService; import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

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

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.peer; 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.project.Project;
import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.*;

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

@ -3,7 +3,7 @@ package se.su.dsv.scipro.peer;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate; import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression; 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.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl; import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.Language; import se.su.dsv.scipro.system.Language;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.plagiarism; 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 se.su.dsv.scipro.file.FileDescription;
import java.util.Optional; import java.util.Optional;

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

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

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

@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate; import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression; 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.data.dataobjects.Member;
import se.su.dsv.scipro.reusable.SciProUtilities; import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.AbstractServiceImpl; import se.su.dsv.scipro.system.AbstractServiceImpl;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.projectpartner; 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.match.ApplicationPeriod;
import se.su.dsv.scipro.system.GenericService; import se.su.dsv.scipro.system.GenericService;
import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectType;

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

@ -3,7 +3,7 @@ package se.su.dsv.scipro.projectpartner;
import com.google.inject.persist.Transactional; import com.google.inject.persist.Transactional;
import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.JPAExpressions; 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.ApplicationPeriod;
import se.su.dsv.scipro.match.QIdea; import se.su.dsv.scipro.match.QIdea;
import se.su.dsv.scipro.match.QIdeaParticipation; import se.su.dsv.scipro.match.QIdeaParticipation;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.report; 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.grading.GradingReportTemplateUpdate;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectType;

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

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

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.reviewing; 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.Project;
import se.su.dsv.scipro.project.ProjectStatus; import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.system.GenericService; import se.su.dsv.scipro.system.GenericService;

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

@ -7,7 +7,7 @@ import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.core.types.dsl.StringPath; import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.impl.JPAQuery; 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.finalseminar.QFinalSeminar;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectStatus; import se.su.dsv.scipro.project.ProjectStatus;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.reviewing; 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.forum.dataobjects.ReviewerThread;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -3,7 +3,7 @@ package se.su.dsv.scipro.springdata.serviceimpls;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.JPAExpressions; 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.ApplicationPeriod;
import se.su.dsv.scipro.match.QTarget; import se.su.dsv.scipro.match.QTarget;
import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.security.auth.roles.Roles;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.springdata.services; 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.match.ApplicationPeriod;
import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.system.*;

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.survey; 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> { public interface QuestionRepository extends JpaRepository<Question, Long> {
} }

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.survey; 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.project.Project;
import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.User;

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

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

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

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

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

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

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

@ -1,8 +1,6 @@
package se.su.dsv.scipro.system; package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional; 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.List;
import java.util.Optional; import java.util.Optional;

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

@ -6,10 +6,6 @@ import com.querydsl.core.types.dsl.EntityPathBase;
import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.core.types.dsl.StringPath; import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.impl.JPAQuery; 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.inject.Provider;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;

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

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

2
core/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java → core/src/main/java/se/su/dsv/scipro/system/JpaRepository.java
View File

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

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

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

2
core/src/main/java/org/springframework/data/domain/PageRequest.java → core/src/main/java/se/su/dsv/scipro/system/PageRequest.java
View File

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

2
core/src/main/java/org/springframework/data/domain/Pageable.java → core/src/main/java/se/su/dsv/scipro/system/Pageable.java
View File

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

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

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

3
core/src/main/java/org/springframework/data/querydsl/QueryDslPredicateExecutor.java → core/src/main/java/se/su/dsv/scipro/system/QueryDslPredicateExecutor.java
View File

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

2
core/src/main/java/org/springframework/data/domain/Sort.java → core/src/main/java/se/su/dsv/scipro/system/Sort.java
View File

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

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

@ -1,9 +1,6 @@
package se.su.dsv.scipro.system; package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional; 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 se.su.dsv.scipro.security.auth.roles.Roles;
import java.util.Collection; import java.util.Collection;

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

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

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

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

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

@ -1,6 +1,6 @@
package se.su.dsv.scipro.workerthreads; 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.FinalSeminar;
import se.su.dsv.scipro.finalseminar.FinalSeminarService; import se.su.dsv.scipro.finalseminar.FinalSeminarService;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings; import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;

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

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

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.checklist;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.project.Project;
import se.su.dsv.scipro.reusable.SciProUtilities; import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.DegreeType; import se.su.dsv.scipro.system.DegreeType;

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

@ -3,7 +3,7 @@ package se.su.dsv.scipro.finalseminar;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.FileDescription;
import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -5,7 +5,7 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher; import org.hamcrest.TypeSafeMatcher;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.FileReference;
import se.su.dsv.scipro.file.FileService; import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.file.ProjectFileUpload; import se.su.dsv.scipro.file.ProjectFileUpload;

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

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

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

@ -8,7 +8,7 @@ import org.hamcrest.core.Every;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.system.*;
import se.su.dsv.scipro.test.IntegrationTest; import se.su.dsv.scipro.test.IntegrationTest;

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

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

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.test.IntegrationTest; import se.su.dsv.scipro.test.IntegrationTest;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate; import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate; import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate; import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate; import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;

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

@ -4,7 +4,7 @@ import org.hamcrest.Description;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher; import org.hamcrest.TypeSafeMatcher;
import org.junit.jupiter.api.Test; 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.Notification;
import se.su.dsv.scipro.notifications.dataobject.ProjectEvent; import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.FileDescription;
import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.FileDescription;
import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.FileDescription;
import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -3,7 +3,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.FileDescription;
import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.project;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.DegreeType;
import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.Unit; import se.su.dsv.scipro.system.Unit;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.projectpartner;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.match.ApplicationPeriod;
import se.su.dsv.scipro.system.DegreeType; import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectType;

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

@ -2,7 +2,7 @@ package se.su.dsv.scipro.springdata.serviceimpls;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.security.auth.roles.Roles;
import se.su.dsv.scipro.springdata.services.SupervisorService; import se.su.dsv.scipro.springdata.services.SupervisorService;
import se.su.dsv.scipro.system.ResearchArea; import se.su.dsv.scipro.system.ResearchArea;

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

@ -2,7 +2,6 @@ package se.su.dsv.scipro.system;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.security.auth.roles.Roles;
import se.su.dsv.scipro.test.IntegrationTest; import se.su.dsv.scipro.test.IntegrationTest;

Some files were not shown because too many files have changed in this diff Show More