From 012c8d01a06a17bbf38589b71353c5036e7d5c82 Mon Sep 17 00:00:00 2001 From: Eduard Frankford <e.frankford@student.uibk.ac.at> Date: Wed, 29 Jun 2022 15:19:03 +0200 Subject: [PATCH] refactored jpa repos in extra folder --- .../at/ac/uibk/gitsearch/config/CacheConfiguration.java | 4 ++-- .../at/ac/uibk/gitsearch/config/DatabaseConfiguration.java | 2 +- .../gitsearch/repository/{ => jpa}/AuditEventConverter.java | 2 +- .../gitsearch/repository/{ => jpa}/AuthorityRepository.java | 2 +- .../repository/{ => jpa}/CustomAuditEventRepository.java | 6 +++--- .../gitsearch/repository/{ => jpa}/LikesRepository.java | 2 +- .../{ => jpa}/PersistenceAuditEventRepository.java | 2 +- .../repository/{ => jpa}/SavedSearchesRepository.java | 2 +- .../repository/{ => jpa}/StatisticsRepository.java | 2 +- .../uibk/gitsearch/repository/{ => jpa}/UserRepository.java | 2 +- .../repository/{ => jpa}/UserWatchListRepository.java | 2 +- .../repository/{ => jpa}/WatchListEntryRepository.java | 2 +- .../uibk/gitsearch/security/DomainUserDetailsService.java | 2 +- .../at/ac/uibk/gitsearch/service/AchievementService.java | 2 +- .../at/ac/uibk/gitsearch/service/AuditEventService.java | 4 ++-- .../at/ac/uibk/gitsearch/service/LikesQueryService.java | 2 +- .../java/at/ac/uibk/gitsearch/service/LikesService.java | 2 +- src/main/java/at/ac/uibk/gitsearch/service/MailService.java | 2 +- .../at/ac/uibk/gitsearch/service/SavedSearchesService.java | 2 +- src/main/java/at/ac/uibk/gitsearch/service/UserService.java | 4 ++-- .../uibk/gitsearch/service/UserWatchListQueryService.java | 2 +- .../at/ac/uibk/gitsearch/service/UserWatchListService.java | 2 +- .../at/ac/uibk/gitsearch/service/WatchListEntryService.java | 2 +- .../uibk/gitsearch/service/impl/StatisticsServiceImpl.java | 2 +- .../java/at/ac/uibk/gitsearch/web/rest/AccountResource.java | 2 +- .../ac/uibk/gitsearch/web/rest/SavedSearchesResource.java | 2 +- .../at/ac/uibk/gitsearch/web/rest/StatisticsResource.java | 4 ++-- .../java/at/ac/uibk/gitsearch/web/rest/UserResource.java | 2 +- .../gitsearch/repository/CustomAuditEventRepositoryIT.java | 5 ++++- .../uibk/gitsearch/security/DomainUserDetailsServiceIT.java | 2 +- .../at/ac/uibk/gitsearch/service/AuditEventServiceIT.java | 2 +- .../at/ac/uibk/gitsearch/service/InfoMailServiceIT.java | 4 ++-- .../java/at/ac/uibk/gitsearch/service/MailServiceIT.java | 2 +- .../java/at/ac/uibk/gitsearch/service/UserServiceIT.java | 2 +- .../ac/uibk/gitsearch/service/UserWatchListServiceIT.java | 2 +- .../at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java | 4 ++-- .../java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java | 2 +- .../java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java | 4 ++-- .../at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java | 2 +- .../ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java | 2 +- .../at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java | 2 +- .../at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java | 2 +- .../java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java | 2 +- .../ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java | 2 +- .../uibk/gitsearch/web/rest/WatchListEntryResourceIT.java | 2 +- 45 files changed, 57 insertions(+), 54 deletions(-) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/AuditEventConverter.java (98%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/AuthorityRepository.java (94%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/CustomAuditEventRepository.java (95%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/LikesRepository.java (93%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/PersistenceAuditEventRepository.java (94%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/SavedSearchesRepository.java (92%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/StatisticsRepository.java (96%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/UserRepository.java (97%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/UserWatchListRepository.java (97%) rename src/main/java/at/ac/uibk/gitsearch/repository/{ => jpa}/WatchListEntryRepository.java (95%) diff --git a/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java b/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java index 16b18a795..7a519688a 100644 --- a/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java +++ b/src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java @@ -45,8 +45,8 @@ public class CacheConfiguration { @Bean public JCacheManagerCustomizer cacheManagerCustomizer() { return cm -> { - createCache(cm, at.ac.uibk.gitsearch.repository.UserRepository.USERS_BY_LOGIN_CACHE); - createCache(cm, at.ac.uibk.gitsearch.repository.UserRepository.USERS_BY_EMAIL_CACHE); + createCache(cm, at.ac.uibk.gitsearch.repository.jpa.UserRepository.USERS_BY_LOGIN_CACHE); + createCache(cm, at.ac.uibk.gitsearch.repository.jpa.UserRepository.USERS_BY_EMAIL_CACHE); createCache(cm, EditorialPagesService.PAGES_CACHE); createCache(cm, MetaDataRepository.EXERCISE_BY_ID_CACHE); diff --git a/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java b/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java index c63bf657e..847521859 100644 --- a/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java +++ b/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java @@ -17,7 +17,7 @@ import tech.jhipster.config.h2.H2ConfigurationHelper; @Configuration @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement -@EnableJpaRepositories("at.ac.uibk.gitsearch.repository") +@EnableJpaRepositories("at.ac.uibk.gitsearch.repository.jpa") @EnableElasticsearchRepositories("at.ac.uibk.gitsearch.repository.search") public class DatabaseConfiguration { diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuditEventConverter.java similarity index 98% rename from src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuditEventConverter.java index d09c6def6..d515e24b0 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/AuditEventConverter.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuditEventConverter.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.PersistentAuditEvent; import java.util.ArrayList; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/AuthorityRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java similarity index 94% rename from src/main/java/at/ac/uibk/gitsearch/repository/AuthorityRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java index ed12bdedf..8aa9dc68c 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/AuthorityRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.Authority; import java.util.List; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/CustomAuditEventRepository.java similarity index 95% rename from src/main/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/CustomAuditEventRepository.java index 482f30aa2..47db67ab8 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/CustomAuditEventRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.config.Constants; import at.ac.uibk.gitsearch.domain.PersistentAuditEvent; @@ -20,12 +20,12 @@ import org.springframework.transaction.annotation.Transactional; @Repository public class CustomAuditEventRepository implements AuditEventRepository { - private static final String AUTHORIZATION_FAILURE = "AUTHORIZATION_FAILURE"; + static final String AUTHORIZATION_FAILURE = "AUTHORIZATION_FAILURE"; /** * Should be the same as in Liquibase migration. */ - protected static final int EVENT_DATA_COLUMN_MAX_LENGTH = 255; + public static final int EVENT_DATA_COLUMN_MAX_LENGTH = 255; private final PersistenceAuditEventRepository persistenceAuditEventRepository; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/LikesRepository.java similarity index 93% rename from src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/LikesRepository.java index 36a70a114..9f07a1496 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/LikesRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.Likes; import org.springframework.data.jpa.repository.*; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/PersistenceAuditEventRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/PersistenceAuditEventRepository.java similarity index 94% rename from src/main/java/at/ac/uibk/gitsearch/repository/PersistenceAuditEventRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/PersistenceAuditEventRepository.java index 5951bd528..a909e6c8b 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/PersistenceAuditEventRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/PersistenceAuditEventRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.PersistentAuditEvent; import java.time.Instant; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/SavedSearchesRepository.java similarity index 92% rename from src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/SavedSearchesRepository.java index bdba9f252..4f31cdda5 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/SavedSearchesRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.SavedSearches; import java.util.List; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/StatisticsRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/StatisticsRepository.java similarity index 96% rename from src/main/java/at/ac/uibk/gitsearch/repository/StatisticsRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/StatisticsRepository.java index 05b785847..eddc185cf 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/StatisticsRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/StatisticsRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.Statistics; import java.util.List; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/UserRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java similarity index 97% rename from src/main/java/at/ac/uibk/gitsearch/repository/UserRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java index c009a9845..33e601575 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/UserRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.User; import java.time.Instant; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/UserWatchListRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserWatchListRepository.java similarity index 97% rename from src/main/java/at/ac/uibk/gitsearch/repository/UserWatchListRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserWatchListRepository.java index 2bf0ae307..fea3a9541 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/UserWatchListRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserWatchListRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.User; import at.ac.uibk.gitsearch.domain.UserWatchList; diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/WatchListEntryRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/WatchListEntryRepository.java similarity index 95% rename from src/main/java/at/ac/uibk/gitsearch/repository/WatchListEntryRepository.java rename to src/main/java/at/ac/uibk/gitsearch/repository/jpa/WatchListEntryRepository.java index f77179812..d44e43000 100644 --- a/src/main/java/at/ac/uibk/gitsearch/repository/WatchListEntryRepository.java +++ b/src/main/java/at/ac/uibk/gitsearch/repository/jpa/WatchListEntryRepository.java @@ -1,4 +1,4 @@ -package at.ac.uibk.gitsearch.repository; +package at.ac.uibk.gitsearch.repository.jpa; import at.ac.uibk.gitsearch.domain.WatchListEntry; import java.util.List; diff --git a/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java b/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java index 9522b0455..73d12fa44 100644 --- a/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java +++ b/src/main/java/at/ac/uibk/gitsearch/security/DomainUserDetailsService.java @@ -1,7 +1,7 @@ package at.ac.uibk.gitsearch.security; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import java.util.*; import java.util.stream.Collectors; import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java b/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java index 14e3ea6f7..1c1184e26 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java @@ -1,6 +1,6 @@ package at.ac.uibk.gitsearch.service; -import at.ac.uibk.gitsearch.repository.StatisticsRepository; +import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository; import at.ac.uibk.gitsearch.service.dto.StatisticsDTO; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java b/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java index 70d5e5374..ca3c8928e 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/AuditEventService.java @@ -1,7 +1,7 @@ package at.ac.uibk.gitsearch.service; -import at.ac.uibk.gitsearch.repository.AuditEventConverter; -import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository; +import at.ac.uibk.gitsearch.repository.jpa.AuditEventConverter; +import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Optional; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java b/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java index bce2b67a4..93483cd42 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java @@ -3,7 +3,7 @@ package at.ac.uibk.gitsearch.service; // for static metamodels import at.ac.uibk.gitsearch.domain.Likes; import at.ac.uibk.gitsearch.domain.Likes_; -import at.ac.uibk.gitsearch.repository.LikesRepository; +import at.ac.uibk.gitsearch.repository.jpa.LikesRepository; import at.ac.uibk.gitsearch.service.dto.LikesCriteria; import java.util.List; import org.slf4j.Logger; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java b/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java index a0caeefc1..3ecad0503 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/LikesService.java @@ -1,7 +1,7 @@ package at.ac.uibk.gitsearch.service; import at.ac.uibk.gitsearch.domain.Likes; -import at.ac.uibk.gitsearch.repository.LikesRepository; +import at.ac.uibk.gitsearch.repository.jpa.LikesRepository; import java.util.List; import java.util.Optional; import org.slf4j.Logger; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/MailService.java b/src/main/java/at/ac/uibk/gitsearch/service/MailService.java index b8a5085d7..c12be8812 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/MailService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/MailService.java @@ -3,7 +3,7 @@ package at.ac.uibk.gitsearch.service; import at.ac.uibk.gitsearch.domain.User; import at.ac.uibk.gitsearch.domain.UserWatchList; import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import java.nio.charset.StandardCharsets; import java.time.Instant; import java.util.List; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java b/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java index 471445ed0..e473ad82a 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java @@ -1,7 +1,7 @@ package at.ac.uibk.gitsearch.service; import at.ac.uibk.gitsearch.domain.SavedSearches; -import at.ac.uibk.gitsearch.repository.SavedSearchesRepository; +import at.ac.uibk.gitsearch.repository.jpa.SavedSearchesRepository; import at.ac.uibk.gitsearch.repository.search.SavedSearchesSearchRepository; import at.ac.uibk.gitsearch.service.dto.SavedSearchesDTO; import at.ac.uibk.gitsearch.service.mapper.SavedSearchesMapper; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/UserService.java b/src/main/java/at/ac/uibk/gitsearch/service/UserService.java index bd4939117..02597c3b7 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/UserService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/UserService.java @@ -3,8 +3,8 @@ package at.ac.uibk.gitsearch.service; import at.ac.uibk.gitsearch.config.Constants; import at.ac.uibk.gitsearch.domain.Authority; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.AuthorityRepository; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.AuthorityRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.repository.search.UserSearchRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import at.ac.uibk.gitsearch.security.SecurityUtils; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java index f2d19697f..4144ce91e 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java @@ -2,7 +2,7 @@ package at.ac.uibk.gitsearch.service; import at.ac.uibk.gitsearch.domain.*; // for static metamodels import at.ac.uibk.gitsearch.domain.UserWatchList; -import at.ac.uibk.gitsearch.repository.UserWatchListRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository; import at.ac.uibk.gitsearch.service.dto.UserWatchListCriteria; import at.ac.uibk.gitsearch.service.dto.UserWatchListDTO; import at.ac.uibk.gitsearch.service.mapper.UserWatchListMapper; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java index d26b4149a..a03dc6942 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java @@ -3,7 +3,7 @@ package at.ac.uibk.gitsearch.service; import at.ac.uibk.gitsearch.domain.UserWatchList; import at.ac.uibk.gitsearch.domain.WatchListEntry; import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency; -import at.ac.uibk.gitsearch.repository.UserWatchListRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository; import at.ac.uibk.gitsearch.repository.search.MetaDataRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum; import at.ac.uibk.gitsearch.security.jwt.TokenProvider; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java b/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java index c6b9cbf98..a168d41e5 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/WatchListEntryService.java @@ -1,7 +1,7 @@ package at.ac.uibk.gitsearch.service; import at.ac.uibk.gitsearch.domain.WatchListEntry; -import at.ac.uibk.gitsearch.repository.WatchListEntryRepository; +import at.ac.uibk.gitsearch.repository.jpa.WatchListEntryRepository; import at.ac.uibk.gitsearch.repository.search.WatchListEntrySearchRepository; import at.ac.uibk.gitsearch.service.dto.WatchListEntryDTO; import at.ac.uibk.gitsearch.service.mapper.WatchListEntryMapper; diff --git a/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java b/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java index 4b32d1475..31b42bbff 100644 --- a/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/at/ac/uibk/gitsearch/service/impl/StatisticsServiceImpl.java @@ -1,7 +1,7 @@ package at.ac.uibk.gitsearch.service.impl; import at.ac.uibk.gitsearch.domain.Statistics; -import at.ac.uibk.gitsearch.repository.StatisticsRepository; +import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository; import at.ac.uibk.gitsearch.repository.search.StatisticsSearchRepository; import at.ac.uibk.gitsearch.service.StatisticsService; import at.ac.uibk.gitsearch.service.dto.StatisticsDTO; diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java index a045e047f..22da4ebbd 100644 --- a/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java +++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java @@ -1,7 +1,7 @@ package at.ac.uibk.gitsearch.web.rest; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.security.SecurityUtils; import at.ac.uibk.gitsearch.service.MailService; import at.ac.uibk.gitsearch.service.UserService; diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java index 5c468ed04..00c709199 100644 --- a/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java +++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResource.java @@ -1,6 +1,6 @@ package at.ac.uibk.gitsearch.web.rest; -import at.ac.uibk.gitsearch.repository.SavedSearchesRepository; +import at.ac.uibk.gitsearch.repository.jpa.SavedSearchesRepository; import at.ac.uibk.gitsearch.service.SavedSearchesService; import at.ac.uibk.gitsearch.service.dto.SavedSearchesDTO; import at.ac.uibk.gitsearch.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java index b07503cee..c96599a8d 100644 --- a/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java +++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java @@ -1,6 +1,6 @@ package at.ac.uibk.gitsearch.web.rest; -import at.ac.uibk.gitsearch.repository.StatisticsRepository; +import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository; import at.ac.uibk.gitsearch.service.SearchService; import at.ac.uibk.gitsearch.service.StatisticsService; import at.ac.uibk.gitsearch.service.dto.StatisticsDTO; @@ -146,7 +146,7 @@ public class StatisticsResource { /* getStatisticsByExerciseId is used to match the exerciseId of a Gitlab project with the database object for the statistics If a rest request for an exerciseId comes from the client and there is no object with a fitting exerciseId in the DB the server will create a new db entry with number of views - as 1 and downloads as 0 + as 1 and downloads as 0 */ @GetMapping("/statistics/exercise/**") diff --git a/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java b/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java index 13e58f327..2e63a8814 100644 --- a/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java +++ b/src/main/java/at/ac/uibk/gitsearch/web/rest/UserResource.java @@ -2,7 +2,7 @@ package at.ac.uibk.gitsearch.web.rest; import at.ac.uibk.gitsearch.config.Constants; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import at.ac.uibk.gitsearch.service.MailService; import at.ac.uibk.gitsearch.service.UserService; diff --git a/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java b/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java index f1a1fd19a..265ac337d 100644 --- a/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/repository/CustomAuditEventRepositoryIT.java @@ -1,11 +1,14 @@ package at.ac.uibk.gitsearch.repository; -import static at.ac.uibk.gitsearch.repository.CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH; +import static at.ac.uibk.gitsearch.repository.jpa.CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH; import static org.assertj.core.api.Assertions.assertThat; import at.ac.uibk.gitsearch.GitsearchApp; import at.ac.uibk.gitsearch.config.Constants; import at.ac.uibk.gitsearch.domain.PersistentAuditEvent; +import at.ac.uibk.gitsearch.repository.jpa.AuditEventConverter; +import at.ac.uibk.gitsearch.repository.jpa.CustomAuditEventRepository; +import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.HashMap; diff --git a/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java index 4d3820f91..1ebbda3f9 100644 --- a/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/security/DomainUserDetailsServiceIT.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import java.util.Locale; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java index ced22109f..078ac2887 100644 --- a/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/service/AuditEventServiceIT.java @@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat; import at.ac.uibk.gitsearch.GitsearchApp; import at.ac.uibk.gitsearch.domain.PersistentAuditEvent; -import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository; +import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository; import java.time.Instant; import java.time.temporal.ChronoUnit; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java index 637649fe6..3997494d2 100644 --- a/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java @@ -11,8 +11,8 @@ import at.ac.uibk.gitsearch.domain.User; import at.ac.uibk.gitsearch.domain.UserWatchList; import at.ac.uibk.gitsearch.domain.WatchListEntry; import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency; -import at.ac.uibk.gitsearch.repository.UserRepository; -import at.ac.uibk.gitsearch.repository.UserWatchListRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository; import at.ac.uibk.gitsearch.repository.search.MetaDataRepository; import at.ac.uibk.gitsearch.repository.search.testESService.ElasticSearchTestConfiguration; import at.ac.uibk.gitsearch.service.dto.AdminUserDTO; diff --git a/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java index 2f1ca6fd6..15e1b5745 100644 --- a/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/service/MailServiceIT.java @@ -7,7 +7,7 @@ import static org.mockito.Mockito.*; import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.config.Constants; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java index 2d531f550..bdefd44db 100644 --- a/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/service/UserServiceIT.java @@ -8,7 +8,7 @@ import static org.mockito.Mockito.when; import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.repository.search.UserSearchRepository; import java.time.Instant; import java.time.LocalDateTime; diff --git a/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java index 8667e952a..c1c8cde58 100644 --- a/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java @@ -7,7 +7,7 @@ import at.ac.uibk.gitsearch.domain.User; import at.ac.uibk.gitsearch.domain.UserWatchList; import at.ac.uibk.gitsearch.domain.WatchListEntry; import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency; -import at.ac.uibk.gitsearch.repository.UserWatchListRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository; import at.ac.uibk.gitsearch.repository.search.testESService.ElasticSearchTestConfiguration; import at.ac.uibk.gitsearch.service.dto.AdminUserDTO; import java.io.IOException; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java index 3bda149c5..a9e797b23 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java @@ -12,8 +12,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.config.Constants; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.AuthorityRepository; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.AuthorityRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import at.ac.uibk.gitsearch.service.UserService; import at.ac.uibk.gitsearch.service.dto.AdminUserDTO; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java index b634d4feb..669e81bbb 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java @@ -10,7 +10,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.GitsearchApp; import at.ac.uibk.gitsearch.domain.PersistentAuditEvent; -import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository; +import at.ac.uibk.gitsearch.repository.jpa.PersistenceAuditEventRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import java.time.Instant; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java index d0f36619d..fa00740df 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java @@ -17,8 +17,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.GitsearchApp; import at.ac.uibk.gitsearch.domain.Likes; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.LikesRepository; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.LikesRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.repository.search.LikesSearchRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import at.ac.uibk.gitsearch.service.LikesService; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java index 51ceeacdb..ec939297d 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/PublicUserResourceIT.java @@ -8,7 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.repository.search.UserSearchRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import javax.persistence.EntityManager; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java index e552daa1c..ab9994326 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java @@ -18,7 +18,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.domain.SavedSearches; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.SavedSearchesRepository; +import at.ac.uibk.gitsearch.repository.jpa.SavedSearchesRepository; import at.ac.uibk.gitsearch.repository.search.SavedSearchesSearchRepository; import at.ac.uibk.gitsearch.service.dto.SavedSearchesDTO; import at.ac.uibk.gitsearch.service.mapper.SavedSearchesMapper; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java index 482b266dd..bc1e71ce3 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java @@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.GitsearchApp; import at.ac.uibk.gitsearch.domain.Statistics; -import at.ac.uibk.gitsearch.repository.StatisticsRepository; +import at.ac.uibk.gitsearch.repository.jpa.StatisticsRepository; import at.ac.uibk.gitsearch.repository.search.StatisticsSearchRepository; import at.ac.uibk.gitsearch.repository.search.testESService.ElasticSearchTestConfiguration; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java index 279926f0d..cf18b9fdf 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserJWTControllerIT.java @@ -12,7 +12,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.web.rest.vm.LoginVM; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java index 2d06f80b2..1c34aae25 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserResourceIT.java @@ -14,7 +14,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.IntegrationTest; import at.ac.uibk.gitsearch.domain.Authority; import at.ac.uibk.gitsearch.domain.User; -import at.ac.uibk.gitsearch.repository.UserRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserRepository; import at.ac.uibk.gitsearch.repository.search.UserSearchRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import at.ac.uibk.gitsearch.service.dto.AdminUserDTO; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java index 4065d1fd3..14e49cc00 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java @@ -15,7 +15,7 @@ import at.ac.uibk.gitsearch.GitsearchApp; import at.ac.uibk.gitsearch.domain.User; import at.ac.uibk.gitsearch.domain.UserWatchList; import at.ac.uibk.gitsearch.domain.enumeration.CheckFrequency; -import at.ac.uibk.gitsearch.repository.UserWatchListRepository; +import at.ac.uibk.gitsearch.repository.jpa.UserWatchListRepository; import at.ac.uibk.gitsearch.security.AuthoritiesConstants; import at.ac.uibk.gitsearch.service.dto.UserWatchListDTO; import at.ac.uibk.gitsearch.service.mapper.UserWatchListMapper; diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java index ce4ab5411..9ff302cf4 100644 --- a/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java +++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java @@ -17,7 +17,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import at.ac.uibk.gitsearch.GitsearchApp; import at.ac.uibk.gitsearch.domain.UserWatchList; import at.ac.uibk.gitsearch.domain.WatchListEntry; -import at.ac.uibk.gitsearch.repository.WatchListEntryRepository; +import at.ac.uibk.gitsearch.repository.jpa.WatchListEntryRepository; import at.ac.uibk.gitsearch.repository.search.WatchListEntrySearchRepository; import at.ac.uibk.gitsearch.service.WatchListEntryService; import at.ac.uibk.gitsearch.service.dto.WatchListEntryDTO; -- GitLab