From 734298c4ccfdde9f788b52f4bab75f48d0997448 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 16:42:20 +0200 Subject: [PATCH 01/70] move all user-related classes into fairdatapoint.user package --- .../api/controller/metadata/GenericController.java | 2 +- .../fairdatapoint/api/dto/member/MemberDTO.java | 2 +- .../api/dto/search/SearchSavedQueryDTO.java | 2 +- .../fairdatateam/fairdatapoint/config/AclConfig.java | 2 +- .../migration/development/user/UserMigration.java | 2 +- .../migration/development/user/data/UserFixtures.java | 4 ++-- .../migration/production/Migration_0001_Init.java | 2 +- .../fairdatapoint/service/apikey/ApiKeyService.java | 4 ++-- .../fairdatapoint/service/jwt/JwtService.java | 4 ++-- .../fairdatapoint/service/member/MemberMapper.java | 4 ++-- .../fairdatapoint/service/member/MemberService.java | 6 +++--- .../service/membership/PermissionService.java | 2 +- .../metadata/common/AbstractMetadataService.java | 2 +- .../metadata/generic/GenericMetadataService.java | 2 +- .../fairdatapoint/service/reset/FactoryDefaults.java | 4 ++-- .../fairdatapoint/service/reset/ResetService.java | 1 + .../service/search/query/SearchSavedQueryMapper.java | 4 ++-- .../service/search/query/SearchSavedQueryService.java | 4 ++-- .../service/security/CurrentUserProvider.java | 4 ++-- .../service/security/MongoUserDetailsService.java | 4 ++-- .../fairdatapoint/{entity => }/user/User.java | 2 +- .../{api/controller => }/user/UserController.java | 7 ++----- .../fairdatapoint/{service => }/user/UserMapper.java | 5 ++--- .../{entity => }/user/UserPermission.java | 2 +- .../mongo/repository => user}/UserRepository.java | 3 +-- .../fairdatapoint/{entity => }/user/UserRole.java | 2 +- .../fairdatapoint/{service => }/user/UserService.java | 6 ++---- .../{service => }/user/UserValidator.java | 4 +--- .../{api/dto/user => user/dto}/UserChangeDTO.java | 4 ++-- .../{api/dto/user => user/dto}/UserCreateDTO.java | 4 ++-- .../{api/dto/user => user/dto}/UserDTO.java | 4 ++-- .../{api/dto/user => user/dto}/UserPasswordDTO.java | 2 +- .../dto/user => user/dto}/UserProfileChangeDTO.java | 2 +- .../{api/dto/user => user/dto}/UserSimpleDTO.java | 2 +- .../fairdatapoint/acceptance/token/List_POST.java | 4 +--- .../fairdatapoint/acceptance/user/Common.java | 10 +++++----- .../fairdatapoint/acceptance/user/Current_GET.java | 4 ++-- .../acceptance/user/Detail_Current_PUT.java | 4 ++-- .../acceptance/user/Detail_Current_Password_PUT.java | 6 +++--- .../fairdatapoint/acceptance/user/Detail_DELETE.java | 2 +- .../fairdatapoint/acceptance/user/Detail_GET.java | 4 ++-- .../fairdatapoint/acceptance/user/Detail_PUT.java | 8 ++++---- .../acceptance/user/Detail_Password_PUT.java | 6 +++--- .../fairdatapoint/acceptance/user/List_GET.java | 2 +- .../fairdatapoint/acceptance/user/List_POST.java | 6 +++--- 45 files changed, 78 insertions(+), 88 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/user/User.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/user/UserController.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/user/UserMapper.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/user/UserPermission.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => user}/UserRepository.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/user/UserRole.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/user/UserService.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/user/UserValidator.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/user => user/dto}/UserChangeDTO.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/user => user/dto}/UserCreateDTO.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/user => user/dto}/UserDTO.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/user => user/dto}/UserPasswordDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/user => user/dto}/UserProfileChangeDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/user => user/dto}/UserSimpleDTO.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java index 954045fec..1d1ccd168 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java @@ -32,7 +32,7 @@ import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java index fb25f2440..99c6b6d4a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java @@ -25,7 +25,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserSimpleDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserSimpleDTO; @Data @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java index 5b15ef74b..775b5395b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java @@ -27,7 +27,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java index d4271af85..2f141d921 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.config; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java index dd1dd602e..73869d52a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.database.common.migration.Migration; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; +import org.fairdatateam.fairdatapoint.user.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java index f33d3b3f4..06506b24f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.User; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java index 342f7b681..a637ec88e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java @@ -74,7 +74,7 @@ private Document createUser(String uuid, String firstName, String lastName, Stri user.append("email", email); user.append("passwordHash", "$2a$10$t2foZfp7cZFQo2u/33ZqTu2WNitBqYd2EY2tQO0/rBUdf8QfsAxyW"); user.append("role", role); - user.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.user.User"); + user.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.users.User"); return user; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java index 7ccc0162d..2687582be 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java @@ -27,8 +27,8 @@ import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.User; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.apache.commons.lang3.RandomStringUtils; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java index 0969084ec..c64c7abe7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java @@ -25,9 +25,9 @@ import io.jsonwebtoken.*; import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; +import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java index e1477ec45..ed247aa7d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java @@ -24,9 +24,9 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.entity.membership.Membership; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.service.membership.MembershipMapper; -import org.fairdatateam.fairdatapoint.service.user.UserMapper; +import org.fairdatateam.fairdatapoint.user.UserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java index 97971e0f2..26857b35d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java @@ -24,12 +24,12 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; +import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.User; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.membership.PermissionService; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java index bcad51986..22fdb3215 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.service.membership; import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; -import org.fairdatateam.fairdatapoint.entity.user.UserPermission; +import org.fairdatateam.fairdatapoint.user.UserPermission; import org.springframework.security.acls.model.Permission; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java index bd4e92b00..9d0d77269 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter; import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java index 0b7975d1b..51c01bf65 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java index 4303bb5eb..34e2890be 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java @@ -30,8 +30,8 @@ import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; import org.fairdatateam.fairdatapoint.entity.schema.SemVer; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.User; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.vocabulary.DATACITE; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java index 7afd99597..283e9c026 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java @@ -38,6 +38,7 @@ import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.RepositoryConnection; import org.eclipse.rdf4j.repository.RepositoryException; +import org.fairdatateam.fairdatapoint.user.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java index d3f9c43a7..3a0048612 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java @@ -24,9 +24,9 @@ import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.springframework.stereotype.Component; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java index 266112681..27eec9054 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java @@ -28,8 +28,8 @@ import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.User; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java b/src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java index 5b6989c36..7f549f155 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.service.security; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.UserRepository; +import org.fairdatateam.fairdatapoint.user.User; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java index aea55fc01..5e29546cb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.service.security; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; +import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/user/User.java b/src/main/java/org/fairdatateam/fairdatapoint/user/User.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/user/User.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/User.java index 846f8c95f..59a0b10c2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/user/User.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/User.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.user; +package org.fairdatateam.fairdatapoint.user; import lombok.*; import org.bson.types.ObjectId; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/user/UserController.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/user/UserController.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java index 7e992a405..b0d46b785 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/user/UserController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java @@ -20,17 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.user; +package org.fairdatateam.fairdatapoint.user; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.user.*; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.user.User; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; -import org.fairdatateam.fairdatapoint.service.user.UserMapper; -import org.fairdatateam.fairdatapoint.service.user.UserService; +import org.fairdatateam.fairdatapoint.user.dto.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserMapper.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/user/UserMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/UserMapper.java index 4c67cbb51..e83b917f1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserMapper.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.user; +package org.fairdatateam.fairdatapoint.user; -import org.fairdatateam.fairdatapoint.api.dto.user.*; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserPermission.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserPermission.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserPermission.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/UserPermission.java index e35bbb7ff..73a65b13a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserPermission.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserPermission.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.user; +package org.fairdatateam.fairdatapoint.user; import org.springframework.security.acls.domain.BasePermission; import org.springframework.security.acls.model.Permission; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/UserRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserRepository.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/UserRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/UserRepository.java index 28380b3d7..862b87a54 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/UserRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.user; -import org.fairdatateam.fairdatapoint.entity.user.User; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserRole.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserRole.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserRole.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/UserRole.java index 3d5aad5f6..03167f93d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserRole.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserRole.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.user; +package org.fairdatateam.fairdatapoint.user; public enum UserRole { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserService.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserService.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/user/UserService.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/UserService.java index b37799f84..8d1048df8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserService.java @@ -20,13 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.user; +package org.fairdatateam.fairdatapoint.user; -import org.fairdatateam.fairdatapoint.api.dto.user.*; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; -import org.fairdatateam.fairdatapoint.entity.user.User; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.user.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/service/user/UserValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java index d8a488057..5fbafc9f1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java @@ -20,11 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.user; +package org.fairdatateam.fairdatapoint.user; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.user.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserChangeDTO.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserChangeDTO.java index 3858a999b..06e1d3bf2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserChangeDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.user; +package org.fairdatateam.fairdatapoint.user.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -28,7 +28,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.UserRole; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserCreateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserCreateDTO.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserCreateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserCreateDTO.java index 49fa62c36..bfd2547b5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserCreateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserCreateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.user; +package org.fairdatateam.fairdatapoint.user.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -28,7 +28,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.UserRole; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserDTO.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserDTO.java index 268a89b4c..29234e7c9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserDTO.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.user; +package org.fairdatateam.fairdatapoint.user.dto; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.UserRole; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserPasswordDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserPasswordDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserPasswordDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserPasswordDTO.java index edb2c9f13..3386af766 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserPasswordDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserPasswordDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.user; +package org.fairdatateam.fairdatapoint.user.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserProfileChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserProfileChangeDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserProfileChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserProfileChangeDTO.java index 091cc6639..6534d0f43 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserProfileChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserProfileChangeDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.user; +package org.fairdatateam.fairdatapoint.user.dto; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserSimpleDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserSimpleDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserSimpleDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserSimpleDTO.java index d1c05f8dd..5ca5ec689 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserSimpleDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/dto/UserSimpleDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.user; +package org.fairdatateam.fairdatapoint.user.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java index e03f229f6..769dad621 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java @@ -23,12 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.token; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.acceptance.user.Common; import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO; import org.fairdatateam.fairdatapoint.api.dto.auth.TokenDTO; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Common.java index 966353a56..8b96258ec 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Common.java @@ -22,11 +22,11 @@ */ package org.fairdatateam.fairdatapoint.acceptance.user; -import org.fairdatateam.fairdatapoint.api.dto.user.UserChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserCreateDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserProfileChangeDTO; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.dto.UserChangeDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserCreateDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserProfileChangeDTO; +import org.fairdatateam.fairdatapoint.user.User; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java index e46fc6d9f..168a43410 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java index 1438f7475..a0ec5184c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserProfileChangeDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserProfileChangeDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java index 56c0e92c2..fd2a68534 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserPasswordDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java index c6bff5454..1ead8b905 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java index 0ec766e1a..f28bdfc72 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java index ad4ffc22a..a86a6e04f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java @@ -24,11 +24,11 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserChangeDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +import org.fairdatateam.fairdatapoint.user.User; +import org.fairdatateam.fairdatapoint.user.UserRole; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java index 8939eca0c..c5ebca181 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserPasswordDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java index 97ac0a8db..d1767cf30 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java index 38293af12..b1a528522 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java @@ -24,10 +24,10 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserCreateDTO; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserCreateDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; From 579cf3d8badfdf570aca89b376c6bfc8d8fffe07 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 17:31:46 +0200 Subject: [PATCH 02/70] move all index-related classes into fairdatapoint.index package --- .../exception/ExceptionControllerAdvice.java | 2 +- .../index/entry/IndexEntryMigration.java | 2 +- .../index/entry/data/IndexEntryFixtures.java | 8 ++-- ...gration_0019_SetIndexEntryPermitValue.java | 2 +- .../mongo/repository/EventRepository.java | 6 +-- .../mongo/repository/WebhookRepository.java | 2 +- .../Rdf_Migration_0004_Cleanup_Index.java | 4 +- .../harvester => index}/HarvesterService.java | 2 +- .../index/IndexAdminController.java | 12 +++--- .../index/IndexEntryController.java | 23 ++++++----- .../IndexEntryRepository.java | 8 ++-- .../common => index}/IndexFeatureAspect.java | 4 +- .../index/IndexPingController.java | 12 +++--- .../index/IndexSettingsController.java | 8 ++-- .../IndexSettingsRepository.java | 4 +- .../entry => index}/RepositoryMetadata.java | 2 +- .../RequiredEnabledIndexFeature.java | 2 +- .../{entity => }/index/entry/IndexEntry.java | 5 ++- .../index/entry/IndexEntryMapper.java | 15 ++++---- .../index/entry/IndexEntryPermit.java | 2 +- .../index/entry/IndexEntryService.java | 24 ++++++------ .../index/entry/IndexEntryState.java | 2 +- .../entry/dto}/IndexEntryDTO.java | 4 +- .../entry/dto}/IndexEntryDetailDTO.java | 8 ++-- .../entry/dto}/IndexEntryInfoDTO.java | 2 +- .../entry/dto}/IndexEntryStateDTO.java | 2 +- .../entry/dto}/IndexEntryUpdateDTO.java | 4 +- .../index/event/AdminTrigger.java | 2 +- .../{entity => }/index/event/Event.java | 6 ++- .../index/event/EventMapper.java | 8 ++-- .../index/event/EventService.java | 38 +++++++++---------- .../{entity => }/index/event/EventType.java | 2 +- .../index/event/IncomingPing.java | 4 +- .../index/event/IncomingPingUtils.java | 12 +++--- .../index/event/MetadataRetrieval.java | 6 +-- .../index/event/MetadataRetrievalUtils.java | 20 +++++----- .../event => index/event/dto}/EventDTO.java | 4 +- .../ping => index/event/dto}/PingDTO.java | 2 +- .../exception/AbstractIndexException.java | 2 +- .../IncorrectPingFormatException.java | 2 +- .../index/exception/PingDeniedException.java | 2 +- .../index/exception/RateLimitException.java | 2 +- .../{entity => }/index/http/Exchange.java | 2 +- .../index/http/ExchangeDirection.java | 2 +- .../index/http/ExchangeState.java | 2 +- .../{entity => }/index/http/Request.java | 2 +- .../{entity => }/index/http/Response.java | 2 +- .../index/settings/IndexSettings.java | 2 +- .../index/settings/IndexSettingsMapper.java | 16 ++++---- .../index/settings/IndexSettingsPing.java | 2 +- .../settings/IndexSettingsRetrieval.java | 2 +- .../index/settings/IndexSettingsService.java | 18 ++++----- .../settings/dto}/IndexSettingsDTO.java | 2 +- .../settings/dto}/IndexSettingsPingDTO.java | 2 +- .../dto}/IndexSettingsRetrievalDTO.java | 2 +- .../settings/dto}/IndexSettingsUpdateDTO.java | 2 +- .../fairdatateam/fairdatapoint/index/todo.md | 6 +++ .../{entity => }/index/webhook/Webhook.java | 2 +- .../index/webhook/WebhookEvent.java | 2 +- .../index/webhook/WebhookMapper.java | 9 +---- .../index/webhook/WebhookPayloadDTO.java | 3 +- .../event => index/webhook}/WebhookPing.java | 2 +- .../index/webhook/WebhookService.java | 13 +++---- .../webhook}/WebhookTrigger.java | 6 +-- .../index/webhook/WebhookUtils.java | 12 +++--- .../index/admin/List_TriggerAll_POST.java | 9 ++--- .../index/admin/List_Trigger_POST.java | 12 +++--- .../acceptance/index/entry/List_All_GET.java | 8 ++-- .../acceptance/index/entry/List_GET.java | 8 ++-- .../acceptance/index/entry/List_Info_GET.java | 6 +-- .../acceptance/index/ping/List_POST.java | 8 ++-- .../index/settings/List_DELETE.java | 10 ++--- .../acceptance/index/settings/List_GET.java | 10 ++--- .../acceptance/index/settings/List_PUT.java | 16 ++++---- .../index/harvester/HarvesterServiceTest.java | 1 + .../utils/TestIndexEntryFixtures.java | 6 +-- 76 files changed, 241 insertions(+), 249 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{service/index/harvester => index}/HarvesterService.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/index/IndexAdminController.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/index/IndexEntryController.java (84%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => index}/IndexEntryRepository.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/index/common => index}/IndexFeatureAspect.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/index/IndexPingController.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/index/IndexSettingsController.java (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => index}/IndexSettingsRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity/index/entry => index}/RepositoryMetadata.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/index/common => index}/RequiredEnabledIndexFeature.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/entry/IndexEntry.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/entry/IndexEntryMapper.java (85%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/entry/IndexEntryPermit.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/entry/IndexEntryService.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/entry/IndexEntryState.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/entry => index/entry/dto}/IndexEntryDTO.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/entry => index/entry/dto}/IndexEntryDetailDTO.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/entry => index/entry/dto}/IndexEntryInfoDTO.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/entry => index/entry/dto}/IndexEntryStateDTO.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/entry => index/entry/dto}/IndexEntryUpdateDTO.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/event/AdminTrigger.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/event/Event.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/event/EventMapper.java (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/event/EventService.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/event/EventType.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/event/IncomingPing.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/event/IncomingPingUtils.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/event/MetadataRetrieval.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/event/MetadataRetrievalUtils.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/event => index/event/dto}/EventDTO.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/ping => index/event/dto}/PingDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/exception/AbstractIndexException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/exception/IncorrectPingFormatException.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/exception/PingDeniedException.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/exception/RateLimitException.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/http/Exchange.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/http/ExchangeDirection.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/http/ExchangeState.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/http/Request.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/http/Response.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/settings/IndexSettings.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/settings/IndexSettingsMapper.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/settings/IndexSettingsPing.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/settings/IndexSettingsRetrieval.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/settings/IndexSettingsService.java (83%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/settings => index/settings/dto}/IndexSettingsDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/settings => index/settings/dto}/IndexSettingsPingDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/settings => index/settings/dto}/IndexSettingsRetrievalDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/index/settings => index/settings/dto}/IndexSettingsUpdateDTO.java (96%) create mode 100644 src/main/java/org/fairdatateam/fairdatapoint/index/todo.md rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/webhook/Webhook.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/index/webhook/WebhookEvent.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/webhook/WebhookMapper.java (84%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => }/index/webhook/WebhookPayloadDTO.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity/index/event => index/webhook}/WebhookPing.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/webhook/WebhookService.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity/index/event => index/webhook}/WebhookTrigger.java (84%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/index/webhook/WebhookUtils.java (90%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java index b08811f2f..e42a3c6cc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java @@ -34,7 +34,7 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.entity.exception.*; -import org.fairdatateam.fairdatapoint.entity.index.exception.AbstractIndexException; +import org.fairdatateam.fairdatapoint.index.exception.AbstractIndexException; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java index 01b4d8c34..f321f3cc9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.database.common.migration.Migration; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.data.IndexEntryFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java index bb53d980d..913bf1098 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java @@ -22,10 +22,10 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.data; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState; -import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; +import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0019_SetIndexEntryPermitValue.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0019_SetIndexEntryPermitValue.java index 601fe3814..ebeef85f1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0019_SetIndexEntryPermitValue.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0019_SetIndexEntryPermitValue.java @@ -29,7 +29,7 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.bson.Document; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java index 56ec457c3..f1d66335e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.repository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.event.EventType; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.EventType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java index 326a3af45..760b13fbf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.repository; -import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook; +import org.fairdatateam.fairdatapoint.index.webhook.Webhook; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java index e0eced977..edf238f93 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java @@ -24,10 +24,10 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.eclipse.rdf4j.model.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java index 1a64d738a..790f3b981 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.harvester; +package org.fairdatateam.fairdatapoint.index; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexAdminController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexAdminController.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java index 2eca9326c..d2c7b0fca 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexAdminController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java @@ -20,20 +20,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.index; +package org.fairdatateam.fairdatapoint.index; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.service.UtilityService; -import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService; -import org.fairdatateam.fairdatapoint.service.index.event.EventService; -import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; +import org.fairdatateam.fairdatapoint.index.event.EventService; +import org.fairdatateam.fairdatapoint.index.webhook.WebhookService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java similarity index 84% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java index aaab95743..bf212cbab 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java @@ -20,22 +20,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.index; +package org.fairdatateam.fairdatapoint.index; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryUpdateDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDetailDTO; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryUpdateDTO; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService; -import org.fairdatateam.fairdatapoint.service.index.event.EventService; -import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService; -import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; +import org.fairdatateam.fairdatapoint.index.event.EventService; +import org.fairdatateam.fairdatapoint.index.webhook.WebhookService; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexEntryRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexEntryRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java index d400611a3..5f7739b6c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexEntryRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java @@ -20,11 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.index; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/IndexFeatureAspect.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/common/IndexFeatureAspect.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java index 09fdafac6..48c41a72e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/IndexFeatureAspect.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.common; +package org.fairdatateam.fairdatapoint.index; import lombok.SneakyThrows; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; @@ -39,7 +39,7 @@ public class IndexFeatureAspect { private InstanceProperties instanceProperties; @SneakyThrows - @Around("@annotation(org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature)") + @Around("@annotation(org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature)") public Object logExecutionTime(ProceedingJoinPoint joinPoint) { if (!instanceProperties.isIndex()) { throw new FeatureDisabledException("Index functionality is turn off"); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexPingController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexPingController.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java index 763ed6b96..3a8ce6aa6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexPingController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.index; +package org.fairdatateam.fairdatapoint.index; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -31,13 +31,13 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.service.UtilityService; -import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService; -import org.fairdatateam.fairdatapoint.service.index.event.EventService; -import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; +import org.fairdatateam.fairdatapoint.index.event.EventService; +import org.fairdatateam.fairdatapoint.index.webhook.WebhookService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexSettingsController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsController.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexSettingsController.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsController.java index e109be41c..95362da3f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexSettingsController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsController.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.index; +package org.fairdatateam.fairdatapoint.index; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java index 9f338225f..d924bb715 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.index; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/RepositoryMetadata.java b/src/main/java/org/fairdatateam/fairdatapoint/index/RepositoryMetadata.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/RepositoryMetadata.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/RepositoryMetadata.java index 9f8d69568..21bfc2e36 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/RepositoryMetadata.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/RepositoryMetadata.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.entry; +package org.fairdatateam.fairdatapoint.index; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java b/src/main/java/org/fairdatateam/fairdatapoint/index/RequiredEnabledIndexFeature.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/RequiredEnabledIndexFeature.java index 9cf925cfd..3456886cd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/RequiredEnabledIndexFeature.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.common; +package org.fairdatateam.fairdatapoint.index; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntry.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntry.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntry.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntry.java index 0db928046..167c23528 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntry.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntry.java @@ -20,10 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.entry; +package org.fairdatateam.fairdatapoint.index.entity.entry; import lombok.*; import org.bson.types.ObjectId; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; +import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryMapper.java similarity index 85% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryMapper.java index 00f815c34..644c60cf9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryMapper.java @@ -20,15 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.entry; +package org.fairdatateam.fairdatapoint.index.entry; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.service.index.event.EventMapper; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDetailDTO; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryStateDTO; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.EventMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryPermit.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryPermit.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryPermit.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryPermit.java index 1ce35126d..0ec83cafa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryPermit.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryPermit.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.entry; +package org.fairdatateam.fairdatapoint.index.entry; public enum IndexEntryPermit { PENDING, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryService.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index a8d55d70a..eac2f5056 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -20,24 +20,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.entry; +package org.fairdatateam.fairdatapoint.index.entry; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.*; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature; -import org.fairdatateam.fairdatapoint.service.index.event.EventService; -import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService; -import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.entry.dto.*; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; +import org.fairdatateam.fairdatapoint.index.event.EventService; +import org.fairdatateam.fairdatapoint.index.HarvesterService; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.TreeModel; @@ -54,7 +52,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import static org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO.*; +import static org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryStateDTO.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Slf4j diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryState.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryState.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryState.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryState.java index febb2b77e..5c1f4514b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryState.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryState.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.entry; +package org.fairdatateam.fairdatapoint.index.entry; public enum IndexEntryState { Unknown, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryDTO.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryDTO.java index 53011d5c8..4ef141875 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryDTO.java @@ -20,14 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.entry; +package org.fairdatateam.fairdatapoint.index.entry.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.hibernate.validator.constraints.URL; @NoArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryDetailDTO.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryDetailDTO.java index d61780167..650814e5a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryDetailDTO.java @@ -20,16 +20,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.entry; +package org.fairdatateam.fairdatapoint.index.entry.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.api.dto.index.event.EventDTO; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata; +import org.fairdatateam.fairdatapoint.index.event.dto.EventDTO; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; import org.hibernate.validator.constraints.URL; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryInfoDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryInfoDTO.java index e43a91acd..da1629a88 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryInfoDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.entry; +package org.fairdatateam.fairdatapoint.index.entry.dto; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryStateDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryStateDTO.java index 7e373e1bc..9bb5101ec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryStateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.entry; +package org.fairdatateam.fairdatapoint.index.entry.dto; public enum IndexEntryStateDTO { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryUpdateDTO.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryUpdateDTO.java index f4ced16a7..2650a1755 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/dto/IndexEntryUpdateDTO.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.entry; +package org.fairdatateam.fairdatapoint.index.entry.dto; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/AdminTrigger.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/AdminTrigger.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/AdminTrigger.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/AdminTrigger.java index 70a8c53d1..39eb1ad74 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/AdminTrigger.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/AdminTrigger.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.event; +package org.fairdatateam.fairdatapoint.index.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/Event.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/Event.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/Event.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/Event.java index 261fc46a4..8ceabf4a1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/Event.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/Event.java @@ -20,14 +20,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.event; +package org.fairdatateam.fairdatapoint.index.event; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.bson.types.ObjectId; +import org.fairdatateam.fairdatapoint.index.webhook.WebhookPing; +import org.fairdatateam.fairdatapoint.index.webhook.WebhookTrigger; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.DBRef; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventMapper.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/EventMapper.java index 38dbe2ef3..14ae5a90a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventMapper.java @@ -20,11 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.event; +package org.fairdatateam.fairdatapoint.index.event; -import org.fairdatateam.fairdatapoint.api.dto.index.event.EventDTO; -import org.fairdatateam.fairdatapoint.entity.index.event.AdminTrigger; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.AdminTrigger; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.dto.EventDTO; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventService.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java index 17d87b175..a1d9c15b3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java @@ -20,32 +20,32 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.event; +package org.fairdatateam.fairdatapoint.index.event; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState; -import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.event.EventType; -import org.fairdatateam.fairdatapoint.entity.index.exception.IncorrectPingFormatException; -import org.fairdatateam.fairdatapoint.entity.index.exception.PingDeniedException; -import org.fairdatateam.fairdatapoint.entity.index.exception.RateLimitException; -import org.fairdatateam.fairdatapoint.entity.index.http.Exchange; -import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeState; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; +import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.EventType; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +import org.fairdatateam.fairdatapoint.index.exception.IncorrectPingFormatException; +import org.fairdatateam.fairdatapoint.index.exception.PingDeniedException; +import org.fairdatateam.fairdatapoint.index.exception.RateLimitException; +import org.fairdatateam.fairdatapoint.index.http.Exchange; +import org.fairdatateam.fairdatapoint.index.http.ExchangeState; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.fairdatateam.fairdatapoint.service.UtilityService; -import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature; -import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService; -import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService; -import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService; +import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; +import org.fairdatateam.fairdatapoint.index.webhook.WebhookService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/EventType.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventType.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/EventType.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/EventType.java index c4c68df8e..838cd5652 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/EventType.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventType.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.event; +package org.fairdatateam.fairdatapoint.index.event; public enum EventType { AdminTrigger, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/IncomingPing.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPing.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/IncomingPing.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPing.java index 84eb22bdb..3b6a4d814 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/IncomingPing.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPing.java @@ -20,12 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.event; +package org.fairdatateam.fairdatapoint.index.event; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.fairdatateam.fairdatapoint.entity.index.http.Exchange; +import org.fairdatateam.fairdatapoint.index.http.Exchange; @Data @NoArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/IncomingPingUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPingUtils.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/event/IncomingPingUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPingUtils.java index 32de551b8..297aee034 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/IncomingPingUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPingUtils.java @@ -20,14 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.event; +package org.fairdatateam.fairdatapoint.index.event; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.event.IncomingPing; -import org.fairdatateam.fairdatapoint.entity.index.http.Exchange; -import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeDirection; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.IncomingPing; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +import org.fairdatateam.fairdatapoint.index.http.Exchange; +import org.fairdatateam.fairdatapoint.index.http.ExchangeDirection; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import tools.jackson.core.JacksonException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/MetadataRetrieval.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrieval.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/MetadataRetrieval.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrieval.java index b863f70f8..b9b3df0c9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/MetadataRetrieval.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrieval.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.event; +package org.fairdatateam.fairdatapoint.index.event; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata; -import org.fairdatateam.fairdatapoint.entity.index.http.Exchange; +import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; +import org.fairdatateam.fairdatapoint.index.http.Exchange; @Data @NoArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/MetadataRetrievalUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrievalUtils.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/event/MetadataRetrievalUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrievalUtils.java index 5b1394a66..7ecdedcd3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/MetadataRetrievalUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrievalUtils.java @@ -20,16 +20,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.event; - -import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.event.EventType; -import org.fairdatateam.fairdatapoint.entity.index.event.MetadataRetrieval; -import org.fairdatateam.fairdatapoint.entity.index.http.Exchange; -import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeDirection; -import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeState; -import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService; +package org.fairdatateam.fairdatapoint.index.event; + +import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.EventType; +import org.fairdatateam.fairdatapoint.index.event.MetadataRetrieval; +import org.fairdatateam.fairdatapoint.index.http.Exchange; +import org.fairdatateam.fairdatapoint.index.http.ExchangeDirection; +import org.fairdatateam.fairdatapoint.index.http.ExchangeState; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; import org.fairdatateam.fairdatapoint.vocabulary.FDP; import org.fairdatateam.fairdatapoint.vocabulary.R3D; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/event/EventDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/dto/EventDTO.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/event/EventDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/dto/EventDTO.java index 1c2b3e514..261eefc95 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/event/EventDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/dto/EventDTO.java @@ -20,14 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.event; +package org.fairdatateam.fairdatapoint.index.event.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.index.event.EventType; +import org.fairdatateam.fairdatapoint.index.event.EventType; import java.util.UUID; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/ping/PingDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/dto/PingDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/ping/PingDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/dto/PingDTO.java index 867ef3111..2464ce2c3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/ping/PingDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/dto/PingDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.ping; +package org.fairdatateam.fairdatapoint.index.event.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/AbstractIndexException.java b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/AbstractIndexException.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java index 6d2ad165a..775dca235 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/AbstractIndexException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.exception; +package org.fairdatateam.fairdatapoint.index.exception; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/IncorrectPingFormatException.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/exception/IncorrectPingFormatException.java index 7db225452..ea60859c9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/IncorrectPingFormatException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.exception; +package org.fairdatateam.fairdatapoint.index.exception; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/PingDeniedException.java b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/PingDeniedException.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/PingDeniedException.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/exception/PingDeniedException.java index 0d6d15b86..76b08c8fc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/PingDeniedException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/PingDeniedException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.exception; +package org.fairdatateam.fairdatapoint.index.exception; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/RateLimitException.java b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/RateLimitException.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/RateLimitException.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/exception/RateLimitException.java index a4d9ee1d0..57107dd6a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/RateLimitException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/RateLimitException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.exception; +package org.fairdatateam.fairdatapoint.index.exception; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Exchange.java b/src/main/java/org/fairdatateam/fairdatapoint/index/http/Exchange.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Exchange.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/http/Exchange.java index 26064e36d..6b42db037 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Exchange.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/http/Exchange.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.http; +package org.fairdatateam.fairdatapoint.index.http; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeDirection.java b/src/main/java/org/fairdatateam/fairdatapoint/index/http/ExchangeDirection.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeDirection.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/http/ExchangeDirection.java index 0b026795d..531543b10 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeDirection.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/http/ExchangeDirection.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.http; +package org.fairdatateam.fairdatapoint.index.http; public enum ExchangeDirection { INCOMING, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeState.java b/src/main/java/org/fairdatateam/fairdatapoint/index/http/ExchangeState.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeState.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/http/ExchangeState.java index 2de5dd4de..40069012b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeState.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/http/ExchangeState.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.http; +package org.fairdatateam.fairdatapoint.index.http; public enum ExchangeState { Prepared, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Request.java b/src/main/java/org/fairdatateam/fairdatapoint/index/http/Request.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Request.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/http/Request.java index 74d707c7b..66785b628 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Request.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/http/Request.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.http; +package org.fairdatateam.fairdatapoint.index.http; import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Response.java b/src/main/java/org/fairdatateam/fairdatapoint/index/http/Response.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Response.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/http/Response.java index fdc4739d1..54191a9ba 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Response.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/http/Response.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.http; +package org.fairdatateam.fairdatapoint.index.http; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettings.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettings.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettings.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettings.java index 933957977..4496ba8fe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettings.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettings.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.settings; +package org.fairdatateam.fairdatapoint.index.entity.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java index 2cafde052..deccbd6f8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java @@ -20,15 +20,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.settings; +package org.fairdatateam.fairdatapoint.index.settings; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsPingDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsRetrievalDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.springframework.stereotype.Service; import java.time.Duration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsPing.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsPing.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsPing.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsPing.java index 0d307769b..a01bbba1a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsPing.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsPing.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.settings; +package org.fairdatateam.fairdatapoint.index.entity.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRetrieval.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRetrieval.java index ba9f085be..0d9598a2e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRetrieval.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.settings; +package org.fairdatateam.fairdatapoint.index.entity.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java similarity index 83% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsService.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java index 76d35ed84..75c18b9b6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java @@ -20,18 +20,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.settings; +package org.fairdatateam.fairdatapoint.index.settings; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval; -import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature; +import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsDTO.java index d461058aa..3c17c6627 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.settings; +package org.fairdatateam.fairdatapoint.index.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java index bb0d95801..bbb871f20 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.settings; +package org.fairdatateam.fairdatapoint.index.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java index 5ee204649..b31a6900e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.settings; +package org.fairdatateam.fairdatapoint.index.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsUpdateDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsUpdateDTO.java index 1117cf7bf..f2deb7af7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsUpdateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.settings; +package org.fairdatateam.fairdatapoint.index.settings.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/todo.md b/src/main/java/org/fairdatateam/fairdatapoint/index/todo.md new file mode 100644 index 000000000..7f4ac01ae --- /dev/null +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/todo.md @@ -0,0 +1,6 @@ +# todo + +- [ ] clean up index file structure +- [ ] consistent index class names +- [ ] clearly separate index-server and index-client functionality, + for example, receiving pings vs sending pings diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/Webhook.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/Webhook.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java index c490a0ef6..3b356413c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/Webhook.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.webhook; +package org.fairdatateam.fairdatapoint.index.webhook; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/WebhookEvent.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookEvent.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/WebhookEvent.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookEvent.java index a2193320c..1ebdb9f5b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/WebhookEvent.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookEvent.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.webhook; +package org.fairdatateam.fairdatapoint.index.webhook; public enum WebhookEvent { NewEntry, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookMapper.java similarity index 84% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookMapper.java index a1a2fe5a8..fddd1cef8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookMapper.java @@ -20,14 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.webhook; +package org.fairdatateam.fairdatapoint.index.webhook; -import org.fairdatateam.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.event.WebhookPing; -import org.fairdatateam.fairdatapoint.entity.index.event.WebhookTrigger; -import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook; -import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent; +import org.fairdatateam.fairdatapoint.index.event.Event; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookPayloadDTO.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookPayloadDTO.java index 150b0c9e6..05a0bd064 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookPayloadDTO.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.index.webhook; +package org.fairdatateam.fairdatapoint.index.webhook; import lombok.Data; import lombok.NoArgsConstructor; -import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent; @Data @NoArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookPing.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookPing.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookPing.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookPing.java index 201e17d93..d7bb9b809 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookPing.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookPing.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.event; +package org.fairdatateam.fairdatapoint.index.webhook; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookService.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java index 6c0326a17..86cd539ab 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java @@ -20,21 +20,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.webhook; +package org.fairdatateam.fairdatapoint.index.webhook; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; import org.fairdatateam.fairdatapoint.database.mongo.repository.WebhookRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval; -import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook; -import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.fairdatateam.fairdatapoint.service.UtilityService; -import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature; -import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService; +import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.security.core.Authentication; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookTrigger.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookTrigger.java similarity index 84% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookTrigger.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookTrigger.java index 10a8ea304..cddaf2f15 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookTrigger.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookTrigger.java @@ -20,14 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.index.event; +package org.fairdatateam.fairdatapoint.index.webhook; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.fairdatateam.fairdatapoint.entity.index.http.Exchange; -import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook; -import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent; +import org.fairdatateam.fairdatapoint.index.http.Exchange; import org.springframework.data.mongodb.core.mapping.DBRef; @Data diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookUtils.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookUtils.java index 67e109791..d8858a7a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookUtils.java @@ -20,14 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.webhook; +package org.fairdatateam.fairdatapoint.index.webhook; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.http.Exchange; -import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeDirection; -import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeState; -import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook; -import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.http.Exchange; +import org.fairdatateam.fairdatapoint.index.http.ExchangeDirection; +import org.fairdatateam.fairdatapoint.index.http.ExchangeState; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java index 105120493..3f6c1a3d5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java @@ -23,13 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.index.admin; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.event.EventType; -import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.EventType; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 5433d0554..040555ec2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.index.admin; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.event.Event; -import org.fairdatateam.fairdatapoint.entity.index.event.EventType; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.event.Event; +import org.fairdatateam.fairdatapoint.index.event.EventType; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index 42b9e1ac8..068707f18 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.index.entry; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index b378a7525..eaf46f0d7 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.index.entry; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.utils.CustomPageImpl; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java index 7f4580b66..0006d80f3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.index.entry; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java index 5dca9395a..940926fb9 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.index.ping; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java index 733d7dff5..87468abaf 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.index.settings; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; +import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java index 2b5ae3fab..132b57a38 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.index.settings; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; +import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java index 77848b8c2..689730d9d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java @@ -23,14 +23,14 @@ package org.fairdatateam.fairdatapoint.acceptance.index.settings; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO; -import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsPingDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsRetrievalDTO; +import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; +import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index cf63cbb9e..9114e0c0c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -28,6 +28,7 @@ import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.index.HarvesterService; import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java index a0d9009dc..ef2fe5d89 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.utils; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState; +import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import java.time.Instant; import java.util.ArrayList; From 4e2d0796a661edb3afe98a64e14c1ed125c0119d Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 17:40:59 +0200 Subject: [PATCH 03/70] move all search-related classes into fairdatapoint.search package --- .../api/controller/metadata/GenericController.java | 2 +- .../api/dto/settings/SettingsSearchDTO.java | 2 +- .../migration/development/MigrationRunner.java | 2 +- .../search/SearchSavedQueryFixtures.java | 6 +++--- .../development/settings/data/SettingsFixtures.java | 2 +- .../entity/settings/SettingsSearchFilter.java | 2 +- .../controller => }/search/SearchController.java | 5 ++--- .../{service => }/search/SearchFilterCache.java | 3 +-- .../search/SearchFilterCacheContainer.java | 2 +- .../{entity => }/search/SearchFilterType.java | 2 +- .../{entity => }/search/SearchFilterValue.java | 2 +- .../{service => }/search/SearchMapper.java | 10 +++++----- .../{entity => }/search/SearchResult.java | 2 +- .../{entity => }/search/SearchResultRelation.java | 2 +- .../{entity => }/search/SearchSavedQuery.java | 4 ++-- .../search/SearchSavedQueryController.java | 10 ++++------ .../query => search}/SearchSavedQueryMapper.java | 7 +++---- .../SearchSavedQueryRepository.java | 3 +-- .../query => search}/SearchSavedQueryService.java | 9 +++------ .../{entity => }/search/SearchSavedQueryType.java | 2 +- .../{service => }/search/SearchService.java | 8 ++------ .../search/SparqlProxyCleaningService.java | 2 +- .../search/SparqlProxyController.java | 2 +- .../search/SparqlQueryValidator.java | 2 +- .../dto/search => search/dto}/SearchFilterDTO.java | 4 ++-- .../search => search/dto}/SearchFilterItemDTO.java | 2 +- .../dto/search => search/dto}/SearchQueryDTO.java | 2 +- .../dto}/SearchQueryTemplateDTO.java | 2 +- .../dto}/SearchQueryVariablesDTO.java | 2 +- .../dto/search => search/dto}/SearchResultDTO.java | 4 ++-- .../dto}/SearchSavedQueryChangeDTO.java | 4 ++-- .../search => search/dto}/SearchSavedQueryDTO.java | 4 ++-- .../service/settings/SettingsMapper.java | 6 +++--- .../service/settings/SettingsService.java | 2 +- .../acceptance/search/Filters_GET.java | 4 +--- .../fairdatapoint/acceptance/search/List_POST.java | 4 ++-- .../acceptance/search/query/List_GET.java | 2 +- .../acceptance/search/query/List_POST.java | 4 ++-- .../search/query/saved/Detail_DELETE.java | 9 ++------- .../acceptance/search/query/saved/Detail_GET.java | 7 +++---- .../acceptance/search/query/saved/Detail_PUT.java | 12 ++++++------ .../acceptance/search/query/saved/List_GET.java | 6 +++--- .../acceptance/search/query/saved/List_POST.java | 13 +++++-------- .../sparql/SparqlProxyCleaningServiceTest.java | 2 +- .../search/sparql/SparqlProxyControllerTest.java | 6 +++--- .../search/sparql/SparqlQueryValidatorTest.java | 2 +- .../service/search/SearchServiceTest.java | 5 +++-- 47 files changed, 89 insertions(+), 112 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/search/SearchController.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/search/SearchFilterCache.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/search/SearchFilterCacheContainer.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/search/SearchFilterType.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/search/SearchFilterValue.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/search/SearchMapper.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/search/SearchResult.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/search/SearchResultRelation.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/search/SearchSavedQuery.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/search/SearchSavedQueryController.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/search/query => search}/SearchSavedQueryMapper.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => search}/SearchSavedQueryRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/search/query => search}/SearchSavedQueryService.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/search/SearchSavedQueryType.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/search/SearchService.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/search/SparqlProxyCleaningService.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/search/SparqlProxyController.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/search/SparqlQueryValidator.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchFilterDTO.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchFilterItemDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchQueryDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchQueryTemplateDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchQueryVariablesDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchResultDTO.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchSavedQueryChangeDTO.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/search => search/dto}/SearchSavedQueryDTO.java (93%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java index 1d1ccd168..aef281392 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java @@ -40,7 +40,7 @@ import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; -import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache; +import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java index fad52a8bb..4bb9a2650 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java @@ -25,7 +25,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java index 05041619e..f632ed3c1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java @@ -36,7 +36,7 @@ import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.UserMigration; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache; +import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java index 2fcf379e9..2648a553b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.search; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; +import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java index 43006a8d4..c9df8f2fd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.data; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType; +import org.fairdatateam.fairdatapoint.search.SearchFilterType; import org.fairdatateam.fairdatapoint.entity.settings.Settings; import org.fairdatateam.fairdatapoint.entity.settings.SettingsAutocompleteSource; import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java index 69bdd3ad9..43586e93b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.entity.settings; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType; +import org.fairdatateam.fairdatapoint.search.SearchFilterType; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchController.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java index bf5867b68..913d3abf2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java @@ -20,13 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.search; +package org.fairdatateam.fairdatapoint.search; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.search.*; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.service.search.SearchService; +import org.fairdatateam.fairdatapoint.search.dto.*; import org.eclipse.rdf4j.query.MalformedQueryException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchFilterCache.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchFilterCache.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java index 410f57553..ba4390c22 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchFilterCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.search; +package org.fairdatateam.fairdatapoint.search; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterCacheContainer; import org.fairdatateam.fairdatapoint.service.label.LabelService; import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterCacheContainer.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCacheContainer.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterCacheContainer.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCacheContainer.java index f47d940ba..8513e4bf8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterCacheContainer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCacheContainer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.search; +package org.fairdatateam.fairdatapoint.search; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterType.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterType.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterType.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterType.java index de1308f70..c305b4d2e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterType.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterType.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.search; +package org.fairdatateam.fairdatapoint.search; public enum SearchFilterType { IRI, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterValue.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterValue.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterValue.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterValue.java index a984cdad5..d9fc9ec30 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterValue.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterValue.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.search; +package org.fairdatateam.fairdatapoint.search; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchMapper.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchMapper.java index 68dcd601c..d1268ea0b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchMapper.java @@ -20,16 +20,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.search; +package org.fairdatateam.fairdatapoint.search; import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.query.BindingSet; -import org.fairdatateam.fairdatapoint.api.dto.search.*; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue; -import org.fairdatateam.fairdatapoint.entity.search.SearchResult; -import org.fairdatateam.fairdatapoint.entity.search.SearchResultRelation; import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilterItem; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryTemplateDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchResultDTO; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResult.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchResult.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResult.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchResult.java index 68abee5d4..42eb9f4b5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResult.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchResult.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.search; +package org.fairdatateam.fairdatapoint.search; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResultRelation.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchResultRelation.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResultRelation.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchResultRelation.java index 3ed67e411..35bbc03e8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResultRelation.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchResultRelation.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.search; +package org.fairdatateam.fairdatapoint.search; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQuery.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQuery.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQuery.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQuery.java index 31d9e7d44..af0d27380 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQuery.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQuery.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.search; +package org.fairdatateam.fairdatapoint.search; import lombok.*; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchSavedQueryController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchSavedQueryController.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java index ef2ed3c89..3f6a09f5d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchSavedQueryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java @@ -20,17 +20,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.search; +package org.fairdatateam.fairdatapoint.search; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchResultDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchResultDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.search.SearchService; -import org.fairdatateam.fairdatapoint.service.search.query.SearchSavedQueryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryMapper.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryMapper.java index 3a0048612..fde044b7e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryMapper.java @@ -20,12 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.search.query; +package org.fairdatateam.fairdatapoint.search; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; import org.fairdatateam.fairdatapoint.user.UserRole; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryRepository.java index daf47657c..46bd8e662 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.search; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java index 27eec9054..53ccf67b9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java @@ -20,14 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.search.query; +package org.fairdatateam.fairdatapoint.search; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQueryType.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryType.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQueryType.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryType.java index d4435a39f..2d2cdae68 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQueryType.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryType.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.search; +package org.fairdatateam.fairdatapoint.search; public enum SearchSavedQueryType { PUBLIC, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index 25728bfed..e0148a8a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -20,18 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.search; +package org.fairdatateam.fairdatapoint.search; -import org.fairdatateam.fairdatapoint.api.dto.search.*; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterCacheContainer; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue; -import org.fairdatateam.fairdatapoint.entity.search.SearchResult; import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; +import org.fairdatateam.fairdatapoint.search.dto.*; import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; import org.fairdatateam.fairdatapoint.service.settings.SettingsService; import org.apache.commons.lang.text.StrSubstitutor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlProxyCleaningService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyCleaningService.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlProxyCleaningService.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyCleaningService.java index dee590258..b8d656204 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlProxyCleaningService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyCleaningService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.search; +package org.fairdatateam.fairdatapoint.search; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlProxyController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlProxyController.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java index eddb51d13..2482e5173 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlProxyController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.search; +package org.fairdatateam.fairdatapoint.search; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlQueryValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlQueryValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java index 6da523b98..5c28e9049 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SparqlQueryValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.search; +package org.fairdatateam.fairdatapoint.search; import lombok.extern.slf4j.Slf4j; import org.eclipse.rdf4j.query.MalformedQueryException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java index dec8a99de..8caa0d2ae 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.*; import org.fairdatateam.fairdatapoint.api.validator.ValidIri; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType; +import org.fairdatateam.fairdatapoint.search.SearchFilterType; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterItemDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java index 8d396ec5f..2a3008f99 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import lombok.*; import org.fairdatateam.fairdatapoint.api.validator.ValidIri; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryDTO.java index d527e2153..262842599 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryTemplateDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryTemplateDTO.java index 5d4eb061a..012524f09 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryTemplateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryVariablesDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryVariablesDTO.java index f3f1d1a31..399f60d19 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchQueryVariablesDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchResultDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchResultDTO.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchResultDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchResultDTO.java index 525b0ccea..585a9d054 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchResultDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchResultDTO.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.search.SearchResultRelation; +import org.fairdatateam.fairdatapoint.search.SearchResultRelation; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchSavedQueryChangeDTO.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchSavedQueryChangeDTO.java index ec6632172..c59ced574 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchSavedQueryChangeDTO.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchSavedQueryDTO.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchSavedQueryDTO.java index 775b5395b..4318e024d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchSavedQueryDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.search; +package org.fairdatateam.fairdatapoint.search.dto; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.Valid; @@ -28,7 +28,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java index 70e2c8c2d..3d2c31bfc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java @@ -22,14 +22,14 @@ */ package org.fairdatateam.fairdatapoint.service.settings; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterItemDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; import org.fairdatateam.fairdatapoint.api.dto.settings.*; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.config.properties.PingProperties; import org.fairdatateam.fairdatapoint.config.properties.RepositoryProperties; import org.fairdatateam.fairdatapoint.entity.settings.*; -import org.fairdatateam.fairdatapoint.service.search.SearchMapper; +import org.fairdatateam.fairdatapoint.search.SearchMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java index d895b12ff..9bbd7754a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; import org.fairdatateam.fairdatapoint.entity.settings.Settings; import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; -import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache; +import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java index c3910afc4..84d960833 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java @@ -23,9 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchResultDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/List_POST.java index 68ac49053..c53bfced4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/List_POST.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.search; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchResultDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchResultDTO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_GET.java index 2c46bcde0..73b17c1ca 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryTemplateDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryTemplateDTO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_POST.java index 2eeae0019..55cd80f5f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_POST.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchResultDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchResultDTO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java index da3452670..e8cf5838c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java @@ -23,14 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query.saved; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; +import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java index 19f41b7bd..87f594095 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query.saved; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; +import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +37,6 @@ import org.springframework.http.ResponseEntity; import java.net.URI; -import java.util.List; import java.util.Objects; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java index 54cdb1764..64702bc1e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query.saved; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; +import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java index f7ceadb2e..2a759f07b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query.saved; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; +import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java index 259ff3942..204bc5ff8 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java @@ -23,13 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query.saved; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -41,7 +39,6 @@ import org.springframework.http.ResponseEntity; import java.net.URI; -import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyCleaningServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyCleaningServiceTest.java index 4e9932c8b..7023460c5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyCleaningServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyCleaningServiceTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search.sparql; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.api.controller.search.SparqlProxyCleaningService; +import org.fairdatateam.fairdatapoint.search.SparqlProxyCleaningService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java index f7a3a5321..494b233c4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search.sparql; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.api.controller.search.SparqlProxyController; +import org.fairdatateam.fairdatapoint.search.SparqlProxyController; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -46,8 +46,8 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.fairdatateam.fairdatapoint.api.controller.search.SparqlProxyController.*; -import static org.fairdatateam.fairdatapoint.api.controller.search.SparqlQueryValidator.MESSAGE_INVALID_QUERY; +import static org.fairdatateam.fairdatapoint.search.SparqlProxyController.*; +import static org.fairdatateam.fairdatapoint.search.SparqlQueryValidator.MESSAGE_INVALID_QUERY; import static org.hamcrest.Matchers.startsWith; import static org.springframework.test.web.client.match.MockRestRequestMatchers.*; import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java index 915d8d768..483aac320 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search.sparql; -import org.fairdatateam.fairdatapoint.api.controller.search.SparqlQueryValidator; +import org.fairdatateam.fairdatapoint.search.SparqlQueryValidator; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java index 32c1e100b..41af1e31a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java @@ -26,8 +26,9 @@ import org.eclipse.rdf4j.model.Model; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue; -import org.fairdatateam.fairdatapoint.entity.search.SearchResult; +import org.fairdatateam.fairdatapoint.search.SearchFilterValue; +import org.fairdatateam.fairdatapoint.search.SearchResult; +import org.fairdatateam.fairdatapoint.search.SearchService; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; From b125c4d4145eed0e0ff38569123a6d3751eaebeb Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 17:54:09 +0200 Subject: [PATCH 04/70] move all settings-related classes into fairdatapoint.settings package except for index-specific settings, which have always been treated separately and were already in the new fairdatapoint.index package --- .../fairdatapoint/config/MongoConfig.java | 2 +- .../migration/development/MigrationRunner.java | 2 +- .../development/settings/SettingsMigration.java | 2 +- .../settings/data/SettingsFixtures.java | 8 ++++---- .../production/Migration_0013_ComplexSearch.java | 2 +- .../Migration_0014_FormsAutocomplete.java | 2 +- .../fairdatapoint/search/SearchFilterCache.java | 2 +- .../fairdatapoint/search/SearchMapper.java | 4 ++-- .../fairdatapoint/search/SearchService.java | 4 ++-- .../service/config/ConfigService.java | 4 ++-- .../autocomplete/FormsAutocompleteService.java | 4 ++-- .../retrieval/RdfEntitiesSparqlRetriever.java | 4 ++-- .../metadata/metric/MetricsMetadataService.java | 4 ++-- .../fairdatapoint/service/ping/PingService.java | 4 ++-- .../fairdatapoint/service/reset/ResetService.java | 2 +- .../{entity => }/settings/Settings.java | 2 +- .../settings/SettingsAutocompleteSource.java | 2 +- .../{service => }/settings/SettingsCache.java | 4 +--- .../settings/SettingsController.java | 7 +++---- .../{entity => }/settings/SettingsForms.java | 2 +- .../settings/SettingsFormsAutocomplete.java | 2 +- .../{service => }/settings/SettingsMapper.java | 5 ++--- .../settings/SettingsMetricsEntry.java | 2 +- .../{entity => }/settings/SettingsPing.java | 2 +- .../SettingsRepository.java | 3 +-- .../settings/SettingsSearchFilter.java | 2 +- .../settings/SettingsSearchFilterItem.java | 2 +- .../{service => }/settings/SettingsService.java | 9 +++------ .../dto}/SettingsAutocompleteSourceDTO.java | 2 +- .../dto/settings => settings/dto}/SettingsDTO.java | 4 ++-- .../dto}/SettingsFormsAutocompleteDTO.java | 2 +- .../dto}/SettingsFormsDTO.java | 2 +- .../settings => settings/dto}/SettingsPingDTO.java | 2 +- .../dto}/SettingsPingUpdateDTO.java | 2 +- .../dto}/SettingsRepositoryDTO.java | 2 +- .../dto}/SettingsSearchDTO.java | 2 +- .../dto}/SettingsUpdateDTO.java | 4 ++-- .../acceptance/search/Filters_GET.java | 2 +- .../acceptance/settings/List_DELETE.java | 6 ++---- .../acceptance/settings/List_GET.java | 13 ++++++------- .../acceptance/settings/List_PUT.java | 14 ++++++-------- .../metric/MetricsMetadataServiceTest.java | 2 -- 42 files changed, 69 insertions(+), 84 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/Settings.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/SettingsAutocompleteSource.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/settings/SettingsCache.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/settings/SettingsController.java (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/SettingsForms.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/SettingsFormsAutocomplete.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/settings/SettingsMapper.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/SettingsMetricsEntry.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/SettingsPing.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => settings}/SettingsRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/SettingsSearchFilter.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/settings/SettingsSearchFilterItem.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/settings/SettingsService.java (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsAutocompleteSourceDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsDTO.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsFormsAutocompleteDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsFormsDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsPingDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsPingUpdateDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsRepositoryDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsSearchDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/settings => settings/dto}/SettingsUpdateDTO.java (92%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java index d1c4392dd..78b0dae16 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java @@ -28,7 +28,7 @@ import io.mongock.runner.springboot.base.MongockInitializingBeanRunner; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java index f632ed3c1..efd8e61b8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java @@ -37,7 +37,7 @@ import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java index b510a98fe..3472acbf1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.data.SettingsFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; +import org.fairdatateam.fairdatapoint.settings.SettingsRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java index c9df8f2fd..7c89764d4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.data; import org.fairdatateam.fairdatapoint.search.SearchFilterType; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsAutocompleteSource; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilterItem; +import org.fairdatateam.fairdatapoint.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.SettingsAutocompleteSource; +import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilter; +import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilterItem; import java.util.Collections; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java index a8d713e88..de3744417 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java @@ -29,7 +29,7 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.bson.Document; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java index 2a0fa4230..3e51cf5f4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java @@ -29,7 +29,7 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.bson.Document; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java index ba4390c22..03f6f0064 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java @@ -25,7 +25,7 @@ import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.service.label.LabelService; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchMapper.java index d1268ea0b..d534b385a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchMapper.java @@ -24,8 +24,8 @@ import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.query.BindingSet; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilterItem; +import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilter; +import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilterItem; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchQueryTemplateDTO; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index e0148a8a0..f699cc740 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -26,10 +26,10 @@ import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; +import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilter; import org.fairdatateam.fairdatapoint.search.dto.*; import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.apache.commons.lang.text.StrSubstitutor; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java index 57df4ddd9..f32e687c2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java @@ -24,9 +24,9 @@ import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java index 41c603251..0276c5db5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java @@ -25,11 +25,11 @@ import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO; import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO; import org.fairdatateam.fairdatapoint.entity.forms.RdfEntityCacheContainer; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesNamespaceRetriever; import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesRetriever; import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesSparqlRetriever; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java index 498171a15..2aae63e72 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval; import org.fairdatateam.fairdatapoint.entity.forms.RdfEntitySourceType; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsAutocompleteSource; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.SettingsAutocompleteSource; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.eclipse.rdf4j.query.TupleQuery; import org.eclipse.rdf4j.query.TupleQueryResult; import org.eclipse.rdf4j.repository.Repository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java index 05212ce57..c753aa871 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java @@ -29,8 +29,8 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.entity.metadata.Metric; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.apache.commons.codec.digest.DigestUtils; import org.eclipse.rdf4j.model.IRI; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java index 1ee7c5148..f8d714ed4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java @@ -25,8 +25,8 @@ import lombok.extern.log4j.Log4j2; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.config.properties.PingProperties; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java index 283e9c026..44bc56aa8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java @@ -31,7 +31,7 @@ import org.fairdatateam.fairdatapoint.service.metadata.generic.GenericMetadataService; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.bson.Document; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Statement; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/Settings.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/Settings.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/Settings.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/Settings.java index 8204960bb..ed2fd7c3a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/Settings.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/Settings.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsAutocompleteSource.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsAutocompleteSource.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsAutocompleteSource.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsAutocompleteSource.java index 26c31d537..9158a442d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsAutocompleteSource.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsAutocompleteSource.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsCache.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsCache.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.java index 7cab86ea6..f3023f644 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.java @@ -20,11 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.settings; +package org.fairdatateam.fairdatapoint.settings; import jakarta.annotation.PostConstruct; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/settings/SettingsController.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsController.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/settings/SettingsController.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsController.java index 6dc8b32e0..57b668ae6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/settings/SettingsController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsController.java @@ -20,13 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.settings; +package org.fairdatateam.fairdatapoint.settings; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO; -import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.settings.dto.SettingsDTO; +import org.fairdatateam.fairdatapoint.settings.dto.SettingsUpdateDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsForms.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsForms.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsForms.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsForms.java index 24306968c..bfde3e51e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsForms.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsForms.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsFormsAutocomplete.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsFormsAutocomplete.java index dbab59b2a..1587320a1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsFormsAutocomplete.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java index 3d2c31bfc..8b2e90e52 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java @@ -20,16 +20,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.settings; +package org.fairdatateam.fairdatapoint.settings; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; -import org.fairdatateam.fairdatapoint.api.dto.settings.*; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.config.properties.PingProperties; import org.fairdatateam.fairdatapoint.config.properties.RepositoryProperties; -import org.fairdatateam.fairdatapoint.entity.settings.*; import org.fairdatateam.fairdatapoint.search.SearchMapper; +import org.fairdatateam.fairdatapoint.settings.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsMetricsEntry.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMetricsEntry.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsMetricsEntry.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMetricsEntry.java index b21dccc42..58a2d8fc7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsMetricsEntry.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMetricsEntry.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsPing.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsPing.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsPing.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsPing.java index 5abcc8bd7..f33fc5459 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsPing.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsPing.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SettingsRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SettingsRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsRepository.java index 542ff618a..221ae3c94 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SettingsRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.settings; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilter.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilter.java index 43586e93b..1371102e4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilter.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import lombok.*; import org.fairdatateam.fairdatapoint.search.SearchFilterType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilterItem.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilterItem.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilterItem.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilterItem.java index 046491d92..b827dd560 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilterItem.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilterItem.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.settings; +package org.fairdatateam.fairdatapoint.settings; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsService.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsService.java index 9bbd7754a..6fc73cebe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsService.java @@ -20,13 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.settings; +package org.fairdatateam.fairdatapoint.settings; -import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO; -import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter; +import org.fairdatateam.fairdatapoint.settings.dto.SettingsDTO; +import org.fairdatateam.fairdatapoint.settings.dto.SettingsUpdateDTO; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java index e1c7f3128..05b0b71df 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsDTO.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsDTO.java index ad4d5e7b0..fffa46860 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsDTO.java @@ -20,11 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry; +import org.fairdatateam.fairdatapoint.settings.SettingsMetricsEntry; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsFormsAutocompleteDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsFormsAutocompleteDTO.java index 6dafd5a2f..7888960e3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsFormsAutocompleteDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsFormsDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsFormsDTO.java index 3eede2412..0056b4c0a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsFormsDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsPingDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsPingDTO.java index ca7d26e11..fe3982532 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsPingDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsPingUpdateDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsPingUpdateDTO.java index 05723cd02..78440ba7e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsPingUpdateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsRepositoryDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsRepositoryDTO.java index d969f3120..e355ce4f0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsRepositoryDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsSearchDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsSearchDTO.java index 4bb9a2650..5d460f8a1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsSearchDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsUpdateDTO.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsUpdateDTO.java index d66896a51..1d939d783 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsUpdateDTO.java @@ -20,11 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.settings; +package org.fairdatateam.fairdatapoint.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry; +import org.fairdatateam.fairdatapoint.settings.SettingsMetricsEntry; import java.util.List; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java index 84d960833..95f515c94 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; +import org.fairdatateam.fairdatapoint.settings.SettingsRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_DELETE.java index adbdc190e..22208d202 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_DELETE.java @@ -23,10 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.settings; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; -import org.fairdatateam.fairdatapoint.entity.settings.*; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; +import org.fairdatateam.fairdatapoint.settings.*; +import org.fairdatateam.fairdatapoint.settings.dto.SettingsDTO; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_GET.java index 6602d0f0d..00c3acaff 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_GET.java @@ -23,13 +23,12 @@ package org.fairdatateam.fairdatapoint.acceptance.settings; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsPing; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; -import org.junit.jupiter.api.AfterAll; +import org.fairdatateam.fairdatapoint.settings.dto.SettingsDTO; +import org.fairdatateam.fairdatapoint.settings.SettingsRepository; +import org.fairdatateam.fairdatapoint.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.SettingsMetricsEntry; +import org.fairdatateam.fairdatapoint.settings.SettingsPing; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_PUT.java index 51c554ec9..9321b89a8 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_PUT.java @@ -23,14 +23,12 @@ package org.fairdatateam.fairdatapoint.acceptance.settings; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.settings.*; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsFormsAutocomplete; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry; -import org.fairdatateam.fairdatapoint.entity.settings.SettingsPing; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; -import org.junit.jupiter.api.AfterAll; +import org.fairdatateam.fairdatapoint.settings.SettingsRepository; +import org.fairdatateam.fairdatapoint.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.SettingsMetricsEntry; +import org.fairdatateam.fairdatapoint.settings.SettingsPing; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; +import org.fairdatateam.fairdatapoint.settings.dto.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java index 54ca9b936..25fcf6a1b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java @@ -28,9 +28,7 @@ package org.fairdatateam.fairdatapoint.service.metadata.metric; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository; import org.fairdatateam.fairdatapoint.entity.metadata.Metric; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; import org.eclipse.rdf4j.model.IRI; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; From f2936cf47f0cc279a56819d0e4de65aab98ea8cd Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 18:06:19 +0200 Subject: [PATCH 05/70] move all resource-related classes into fairdatapoint.resource package --- .../api/controller/metadata/GenericController.java | 6 +++--- .../api/controller/metadata/GenericMetaController.java | 4 ++-- .../fairdatapoint/api/dto/config/BootstrapConfigDTO.java | 2 +- .../fairdatateam/fairdatapoint/config/MongoConfig.java | 4 ++-- .../mongo/migration/development/MigrationRunner.java | 4 ++-- .../development/resource/ResourceDefinitionMigration.java | 6 +++--- .../resource/data/ResourceDefinitionFixtures.java | 2 +- .../production/Migration_0002_CustomMetamodel.java | 2 +- .../production/Migration_0004_ResourceDefinition.java | 4 ++-- .../production/Migration_0009_ShapeTargetClasses.java | 4 ++-- .../migration/production/Migration_0011_ComplyFDPO.java | 6 +++--- .../production/Migration_0012_MetadataSchemas.java | 4 ++-- .../development/metadata/RdfMetadataMigration.java | 2 +- .../{entity => }/resource/ResourceDefinition.java | 2 +- .../{service => }/resource/ResourceDefinitionCache.java | 4 +--- .../{entity => }/resource/ResourceDefinitionChild.java | 2 +- .../resource/ResourceDefinitionChildListView.java | 2 +- .../resource/ResourceDefinitionChildListViewMetadata.java | 2 +- .../resource/ResourceDefinitionController.java | 7 +++---- .../{entity => }/resource/ResourceDefinitionLink.java | 2 +- .../{service => }/resource/ResourceDefinitionMapper.java | 7 +++---- .../ResourceDefinitionRepository.java | 3 +-- .../{service => }/resource/ResourceDefinitionService.java | 8 +++----- .../resource/ResourceDefinitionTargetClassesCache.java | 4 +--- .../resource/ResourceDefinitionValidator.java | 5 +---- .../dto}/ResourceDefinitionChangeDTO.java | 6 +++--- .../resource => resource/dto}/ResourceDefinitionDTO.java | 6 +++--- .../fairdatapoint/service/config/ConfigService.java | 2 +- .../fairdatapoint/service/dashboard/DashboardService.java | 8 ++++---- .../service/membership/MembershipService.java | 2 +- .../service/metadata/catalog/CatalogMetadataService.java | 2 +- .../service/metadata/common/AbstractMetadataService.java | 8 ++++---- .../service/metadata/common/MetadataService.java | 2 +- .../service/metadata/enhance/MetadataEnhancer.java | 8 ++++---- .../service/metadata/generic/GenericMetadataService.java | 2 +- .../service/metadata/state/MetadataStateService.java | 4 ++-- .../service/metadata/validator/MetadataValidator.java | 4 ++-- .../fairdatapoint/service/openapi/OpenApiGenerator.java | 2 +- .../fairdatapoint/service/openapi/OpenApiService.java | 4 ++-- .../fairdatapoint/service/openapi/OpenApiTagsUtils.java | 2 +- .../fairdatapoint/service/profile/ProfileService.java | 4 ++-- .../fairdatapoint/service/reset/FactoryDefaults.java | 2 +- .../fairdatapoint/service/reset/ResetService.java | 7 ++++--- .../service/schema/MetadataSchemaService.java | 2 +- .../service/schema/MetadataSchemaValidator.java | 4 ++-- .../fairdatateam/fairdatapoint/util/ResourceReader.java | 4 ++++ .../fairdatapoint/acceptance/resource/Detail_DELETE.java | 2 +- .../fairdatapoint/acceptance/resource/Detail_GET.java | 2 +- .../fairdatapoint/acceptance/resource/Detail_PUT.java | 8 ++++---- .../fairdatapoint/acceptance/resource/List_GET.java | 2 +- .../fairdatapoint/acceptance/resource/List_POST.java | 6 +++--- .../service/index/harvester/HarvesterServiceTest.java | 4 ++-- .../metadata/generic/GenericMetadataServiceTest.java | 2 +- .../service/resource/ResourceDefinitionCacheTest.java | 5 +++-- .../service/resource/ResourceDefinitionValidatorTest.java | 4 +--- .../fairdatapoint/utils/TestRdfMetadataFixtures.java | 2 +- 56 files changed, 106 insertions(+), 114 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/resource/ResourceDefinition.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/resource/ResourceDefinitionCache.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/resource/ResourceDefinitionChild.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/resource/ResourceDefinitionChildListView.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/resource/ResourceDefinitionChildListViewMetadata.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/resource/ResourceDefinitionController.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/resource/ResourceDefinitionLink.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/resource/ResourceDefinitionMapper.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => resource}/ResourceDefinitionRepository.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/resource/ResourceDefinitionService.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/resource/ResourceDefinitionTargetClassesCache.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/resource/ResourceDefinitionValidator.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/resource => resource/dto}/ResourceDefinitionChangeDTO.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/resource => resource/dto}/ResourceDefinitionDTO.java (89%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java index aef281392..d756e396d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java @@ -30,15 +30,15 @@ import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory; import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java index 38d2b859b..198cc07bf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java @@ -31,13 +31,13 @@ import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory; import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.DCTERMS; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java index 6ff2c0e7a..ea5bbe278 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.api.dto.config; import lombok.*; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java index 78b0dae16..fbde3d4cf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java @@ -26,8 +26,8 @@ import io.mongock.driver.mongodb.springdata.v4.SpringDataMongoV4Driver; import io.mongock.runner.springboot.MongockSpringboot; import io.mongock.runner.springboot.base.MongockInitializingBeanRunner; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java index efd8e61b8..7dfe7312e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java @@ -34,8 +34,8 @@ import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.MetadataSchemaMigration; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.SettingsMigration; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.UserMigration; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java index a5991e3a1..859def34e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java @@ -24,9 +24,9 @@ import org.fairdatateam.fairdatapoint.database.common.migration.Migration; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java index a80f057e8..9e8ae05f6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data; -import org.fairdatateam.fairdatapoint.entity.resource.*; +import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.vocabulary.FDP; import org.eclipse.rdf4j.model.vocabulary.DCAT; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java index 20d96b13d..0652c6c61 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java @@ -133,7 +133,7 @@ private Document createDefinition(String uuid, String name, String prefix, Strin definition.append("child", child); definition.append("parentResourceDefinitionUuid", parentUuid); definition.append("childResourceDefinitionUuid", childUuid); - definition.append("_class", "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition"); + definition.append("_class", "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"); return definition; } } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java index 8ee8c41c5..5e4b5d995 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java @@ -27,7 +27,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.bson.BasicBSONObject; import org.bson.Document; @@ -176,7 +176,7 @@ private Document createDefinition(String uuid, String name, String prefix, List< definition.append("targetClassUris", classes); definition.append("children", children); definition.append("externalLinks", links); - definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition"); + definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"); return definition; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java index b10aeb361..58053bb3c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java @@ -29,8 +29,8 @@ import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java index ef65709aa..db99745b4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java @@ -27,8 +27,8 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.vocabulary.FDP; import org.bson.Document; @@ -132,7 +132,7 @@ private Document fdpResourceDefinition() { // External Links definition.append("externalLinks", List.of()); - definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition"); + definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"); return definition; } } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java index 7a6f61f3f..156269afb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java @@ -30,8 +30,8 @@ import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; import org.fairdatateam.fairdatapoint.entity.schema.SemVer; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.bson.Document; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java index 7ebafc3e8..2234c4b1a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinition.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinition.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinition.java index a2d9ae97f..af53cd3ea 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinition.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.resource; +package org.fairdatateam.fairdatapoint.resource; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCache.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCache.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCache.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCache.java index f96ae31f9..47c977f35 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCache.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.annotation.PostConstruct; import lombok.Getter; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChild.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChild.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java index 0808546b9..c048b9246 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChild.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java index 8c2ade290..9f3bb87d6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java index 5d54efaf9..ce7dff738 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.constraints.NotBlank; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/resource/ResourceDefinitionController.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/resource/ResourceDefinitionController.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java index 0315798b4..2d9628c09 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/resource/ResourceDefinitionController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java @@ -20,14 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.resource; +package org.fairdatateam.fairdatapoint.resource; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionLink.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionLink.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java index 2054b8c82..bbbbb309e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionLink.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.constraints.NotBlank; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionMapper.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionMapper.java index 4845b0159..89ca75d2c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionMapper.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.resource; +package org.fairdatateam.fairdatapoint.resource; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionRepository.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionRepository.java index 34c59ce2d..36826f9ea 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.resource; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionService.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionService.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java index 118ea9e31..dc24a9df2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java @@ -20,13 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.resource; +package org.fairdatateam.fairdatapoint.resource; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.membership.MembershipService; import org.fairdatateam.fairdatapoint.service.openapi.OpenApiService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java index 85f134dd1..17a9f0a4f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.annotation.PostConstruct; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java index 4edbd186a..f12f590c5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java @@ -20,12 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.resource; +package org.fairdatateam.fairdatapoint.resource; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.validation.BindException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/dto/ResourceDefinitionChangeDTO.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/dto/ResourceDefinitionChangeDTO.java index e7351e33a..97bd4a73e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/dto/ResourceDefinitionChangeDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.resource; +package org.fairdatateam.fairdatapoint.resource.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; @@ -29,8 +29,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionLink; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionLink; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/dto/ResourceDefinitionDTO.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/resource/dto/ResourceDefinitionDTO.java index 0f6cb6388..a13dbacb3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/dto/ResourceDefinitionDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.resource; +package org.fairdatateam.fairdatapoint.resource.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; @@ -29,8 +29,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionLink; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionLink; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java index f32e687c2..4b5b750f7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.settings.Settings; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java index 7356120ad..ace33eef2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java @@ -26,14 +26,14 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java index 2e7487fd1..c548e55d4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository; import org.fairdatateam.fairdatapoint.entity.membership.Membership; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java index 0dca6c1b8..6b981feab 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java @@ -25,7 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.database.rdf.repository.CatalogMetadataRepository; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java index 9d0d77269..1a93b0f45 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java @@ -28,16 +28,16 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; import org.fairdatateam.fairdatapoint.service.metadata.validator.MetadataValidator; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.fairdatateam.fairdatapoint.vocabulary.FDP; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java index 44a06e92f..6c6be4a44 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.service.metadata.common; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java index e37654749..014baddb0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.service.metadata.enhance; import org.fairdatateam.fairdatapoint.entity.metadata.Identifier; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.service.actuator.AppInfoContributor; import org.fairdatateam.fairdatapoint.service.metadata.metric.MetricsMetadataService; import org.fairdatateam.fairdatapoint.service.profile.ProfileService; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; import org.fairdatateam.fairdatapoint.vocabulary.DATACITE; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java index 51c01bf65..308f644df 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java index de04da710..2bd515b02 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java @@ -28,8 +28,8 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.service.metadata.validator.MetadataStateValidator; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java index 334ccacd8..368ae3569 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java @@ -25,10 +25,10 @@ import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepository; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.rdf.ShaclValidator; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java index 17cd6fd12..e397b9f8e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java @@ -39,7 +39,7 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO; import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.springframework.http.HttpStatus; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java index 9d6844824..266028dd0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java @@ -26,8 +26,8 @@ import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.Paths; import lombok.extern.log4j.Log4j2; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java index 8eae8beb5..2f8a9a8b0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.service.openapi; import io.swagger.v3.oas.models.tags.Tag; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java index 2b969c2ad..a0f20ddf2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.service.profile; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java index 34e2890be..1169418af 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java @@ -26,10 +26,10 @@ import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.entity.resource.*; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java index 44bc56aa8..c855c9b6e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java @@ -26,11 +26,12 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.api.dto.reset.ResetDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.*; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.metadata.generic.GenericMetadataService; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.bson.Document; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java index 21d1f7ebe..1c027960a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java @@ -33,7 +33,7 @@ import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; import org.fairdatateam.fairdatapoint.entity.schema.SemVer; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java index c6f4f781c..eda75d20e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java @@ -26,9 +26,9 @@ import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java b/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java index 23eea69c2..6aa306ead 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java @@ -37,6 +37,10 @@ import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; +/** + * Loads Spring Resources. + * Beware: This has nothing to do with the concept of an FDP "Resource". + */ public class ResourceReader { public static String loadResource(String name) { diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java index 55c0650c1..c6e35468c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java index 5f5f89007..0d814d1d0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java index 00dc58572..7e2f15b6f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionMapper; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java index 621301d33..1669c5c0e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java index 3b3714761..196ddd542 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionMapper; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index 9114e0c0c..f0fcfdd5f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -27,10 +27,10 @@ import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactoryImpl; import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.index.HarvesterService; import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.vocabulary.FDP; import org.eclipse.rdf4j.model.Model; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java index 009b73aea..2ca68dad3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; import org.fairdatateam.fairdatapoint.utils.AuthHelper; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java index 024550ff2..3fa8b3d19 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java @@ -24,8 +24,9 @@ import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java index 905737408..87e5a114e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java @@ -23,10 +23,8 @@ package org.fairdatateam.fairdatapoint.service.resource; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; +import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java index e206cf097..6c5107390 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; From 2611f04105d61a43a633af991ec5cab5c5464348 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 18:27:32 +0200 Subject: [PATCH 06/70] move all metadata-related classes into fairdatapoint.metadata package and rename database.rdf.repository.MetadataRepository to metadata.MetadataRdfRepository and same for corresponding MetadataRepositoryException to remove ambiguity with respect to database.mongo.repository.MetadataRepository --- .../dashboard/DashboardController.java | 2 +- .../exception/ExceptionControllerAdvice.java | 2 +- .../api/dto/dashboard/DashboardItemDTO.java | 2 +- .../development/acl/AclMigration.java | 2 +- .../metadata/MetadataMigration.java | 2 +- .../metadata/data/MetadataFixtures.java | 4 +-- .../Migration_0002_CustomMetamodel.java | 2 +- .../fairdatapoint/index/HarvesterService.java | 12 +++---- .../index/IndexAdminController.java | 4 +-- .../index/IndexEntryController.java | 8 ++--- .../index/IndexPingController.java | 4 +-- .../index/entry/IndexEntryService.java | 12 +++---- .../AbstractMetadataRdfRepository.java} | 36 +++++++++---------- .../AbstractMetadataService.java | 26 +++++--------- .../{entity => }/metadata/AccessRights.java | 2 +- .../{entity => }/metadata/Agent.java | 2 +- .../{entity => }/metadata/Authorization.java | 2 +- .../CatalogMetadataRdfRepository.java} | 8 ++--- .../CatalogMetadataService.java | 12 +++---- .../metadata/GenericController.java | 15 ++------ .../metadata/GenericMemberController.java | 8 ++--- .../metadata/GenericMetaController.java | 19 ++++------ .../GenericMetadataRdfRepository.java} | 16 ++++----- .../GenericMetadataService.java | 7 ++-- .../{entity => }/metadata/Identifier.java | 2 +- .../{entity => }/metadata/Metadata.java | 2 +- .../{config => metadata}/MetadataConfig.java | 2 +- .../MetadataEnhancer.java | 8 ++--- .../{entity => }/metadata/MetadataGetter.java | 2 +- .../MetadataRdfRepository.java} | 20 +++++------ .../MetadataRdfRepositoryException.java} | 6 ++-- .../MetadataRepository.java | 3 +- .../common => metadata}/MetadataService.java | 3 +- .../MetadataServiceException.java | 2 +- .../MetadataServiceFactory.java | 3 +- .../{entity => }/metadata/MetadataSetter.java | 2 +- .../{entity => }/metadata/MetadataState.java | 2 +- .../MetadataStateService.java | 10 ++---- .../MetadataStateValidator.java | 6 ++-- .../MetadataValidator.java | 13 +++---- .../{entity => }/metadata/Metric.java | 2 +- .../MetricsMetadataService.java | 3 +- .../metadata => metadata/dto}/MetaDTO.java | 2 +- .../dto}/MetaPathDTO.java | 2 +- .../dto}/MetaStateChangeDTO.java | 4 +-- .../dto}/MetaStateDTO.java | 4 +-- .../RdfDevelopmentMigrationRunner.java | 4 +-- .../metadata/RdfMetadataMigration.java | 24 ++++++------- .../metadata/data/RdfMetadataFixtures.java | 4 +-- .../metadata/factory/MetadataFactory.java | 2 +- .../metadata/factory/MetadataFactoryImpl.java | 6 ++-- .../production/Rdf_Migration_0001_Init.java | 2 +- .../Rdf_Migration_0002_Metadata_Draft.java | 8 ++--- .../production/Rdf_Migration_0003_FDPO.java | 2 +- .../Rdf_Migration_0004_Cleanup_Index.java | 10 +++--- ...Rdf_Migration_0005_FixMetadataVersion.java | 2 +- .../search/SearchController.java | 6 ++-- .../search/SearchSavedQueryController.java | 4 +-- .../fairdatapoint/search/SearchService.java | 24 ++++++------- .../service/dashboard/DashboardService.java | 10 +++--- .../service/openapi/OpenApiGenerator.java | 4 +-- .../service/reset/FactoryDefaults.java | 4 +-- .../service/reset/ResetService.java | 5 +-- .../fairdatapoint/util/RdfIOUtil.java | 2 +- .../fairdatapoint/WebIntegrationTest.java | 2 +- .../acceptance/dashboard/List_GET.java | 2 +- .../acceptance/metadata/Common.java | 6 ++-- .../metadata/catalog/Detail_PUT.java | 4 +-- .../metadata/catalog/List_POST.java | 2 +- .../metadata/catalog/meta/List_GET.java | 4 +-- .../metadata/catalog/meta/List_State_PUT.java | 8 ++--- .../metadata/dataset/Detail_PUT.java | 4 +-- .../metadata/dataset/meta/List_GET.java | 4 +-- .../metadata/dataset/meta/List_State_PUT.java | 8 ++--- .../metadata/distribution/Detail_PUT.java | 4 +-- .../metadata/distribution/meta/List_GET.java | 4 +-- .../distribution/meta/List_State_PUT.java | 8 ++--- .../metadata/repository/Detail_PUT.java | 4 +-- .../metadata/repository/meta/List_GET.java | 4 +-- .../repository/meta/List_State_PUT.java | 8 ++--- .../CatalogMetadataRepositoryTest.java | 8 +++-- .../GenericMetadataRepositoryTest.java | 17 +++++---- .../repository/MetadataRepositoryTest.java | 8 +++-- .../index/harvester/HarvesterServiceTest.java | 18 +++++----- .../CatalogMetadataServiceMockTest.java | 13 +++---- .../generic/GenericMetadataServiceTest.java | 6 ++-- .../metric/MetricsMetadataServiceTest.java | 3 +- .../service/search/SearchServiceTest.java | 8 ++--- .../utils/TestRdfMetadataFixtures.java | 8 ++--- 89 files changed, 281 insertions(+), 319 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf/repository/AbstractMetadataRepository.java => metadata/AbstractMetadataRdfRepository.java} (82%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/common => metadata}/AbstractMetadataService.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/AccessRights.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/Agent.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/Authorization.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf/repository/CatalogMetadataRepository.java => metadata/CatalogMetadataRdfRepository.java} (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/catalog => metadata}/CatalogMetadataService.java (80%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/metadata/GenericController.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/metadata/GenericMemberController.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/metadata/GenericMetaController.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf/repository/GenericMetadataRepository.java => metadata/GenericMetadataRdfRepository.java} (81%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/generic => metadata}/GenericMetadataService.java (86%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/Identifier.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/Metadata.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{config => metadata}/MetadataConfig.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/enhance => metadata}/MetadataEnhancer.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/MetadataGetter.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf/repository/MetadataRepository.java => metadata/MetadataRdfRepository.java} (77%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf/repository/MetadataRepositoryException.java => metadata/MetadataRdfRepositoryException.java} (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => metadata}/MetadataRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/common => metadata}/MetadataService.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/exception => metadata}/MetadataServiceException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/factory => metadata}/MetadataServiceFactory.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/MetadataSetter.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/MetadataState.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/state => metadata}/MetadataStateService.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/validator => metadata}/MetadataStateValidator.java (86%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/validator => metadata}/MetadataValidator.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/metadata/Metric.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/metadata/metric => metadata}/MetricsMetadataService.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/metadata => metadata/dto}/MetaDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/metadata => metadata/dto}/MetaPathDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/metadata => metadata/dto}/MetaStateChangeDTO.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/metadata => metadata/dto}/MetaStateDTO.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/development/RdfDevelopmentMigrationRunner.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/development/metadata/RdfMetadataMigration.java (85%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/development/metadata/data/RdfMetadataFixtures.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/development/metadata/factory/MetadataFactory.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/development/metadata/factory/MetadataFactoryImpl.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/production/Rdf_Migration_0001_Init.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/production/Rdf_Migration_0002_Metadata_Draft.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/production/Rdf_Migration_0003_FDPO.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/production/Rdf_Migration_0004_Cleanup_Index.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/rdf => metadata}/migration/production/Rdf_Migration_0005_FixMetadataVersion.java (97%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java index 0f113528b..e6fd3e49b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java @@ -26,7 +26,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.service.dashboard.DashboardService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; +import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java index e42a3c6cc..4bc06cf13 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java @@ -35,7 +35,7 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.entity.exception.*; import org.fairdatateam.fairdatapoint.index.exception.AbstractIndexException; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; +import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.query.MalformedQueryException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java index f8327c659..da93c6e15 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java @@ -27,7 +27,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java index d09a325bc..af3b97c3b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.database.common.migration.Migration; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java index e2c4da1c2..37a934ae3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata; import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java index b06c49018..17857bdd4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java index 0652c6c61..4d5b90ccd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java @@ -53,7 +53,7 @@ public void run(MongoDatabase database) { private void updateAcl(MongoDatabase database) { final MongoCollection aclCol = database.getCollection("ACL"); aclCol.updateMany( - new Document(), combine(set("className", "org.fairdatateam.fairdatapoint.entity.metadata.Metadata")) + new Document(), combine(set("className", "org.fairdatateam.fairdatapoint.metadata.Metadata")) ); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java index 790f3b981..7b0b6b9d3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.index; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; @@ -43,7 +43,7 @@ import java.util.*; import static java.util.Optional.ofNullable; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getChildren; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getChildren; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRdfContentType; import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read; import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.readFile; @@ -58,17 +58,17 @@ public class HarvesterService { private static final String DEFAULT_NAVIGATION_SHACL = "defaultNavigationShacl.ttl"; @Autowired - private GenericMetadataRepository genericMetadataRepository; + private GenericMetadataRdfRepository genericMetadataRepository; @Autowired private RestTemplate restTemplate; - public void deleteHarvestedData(String clientUrl) throws MetadataRepositoryException { + public void deleteHarvestedData(String clientUrl) throws MetadataRdfRepositoryException { genericMetadataRepository.remove(i(clientUrl)); } @Async - public void harvest(String clientUrl) throws MetadataRepositoryException { + public void harvest(String clientUrl) throws MetadataRdfRepositoryException { log.info("Start harvesting '{}'", clientUrl); // 0. Remove previously harvested metadata diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java index d2c7b0fca..a45d4decd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java @@ -28,7 +28,7 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.service.UtilityService; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; @@ -66,7 +66,7 @@ public class IndexAdminController { public void triggerMetadataRetrieve( @RequestBody @Valid PingDTO reqDto, HttpServletRequest request - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { log.info("Received ping trigger request from {}", utilityService.getRemoteAddr(request)); final Event event = eventService.acceptAdminTrigger(request, reqDto); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java index bf212cbab..8d5eb091d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java @@ -29,7 +29,7 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryUpdateDTO; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; @@ -87,7 +87,7 @@ public Optional updateEntry( @PathVariable final String uuid, @RequestBody IndexEntryUpdateDTO reqDto, HttpServletRequest request - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { final Optional resDto = service.updateEntry(uuid, reqDto); if (resDto.isPresent()) { final String clientUrl = resDto.get().getClientUrl(); @@ -105,13 +105,13 @@ public Optional updateEntry( } @GetMapping(path = "/{uuid}/data", produces = "!application/json") - public Model getEntryData(@PathVariable final String uuid) throws MetadataRepositoryException { + public Model getEntryData(@PathVariable final String uuid) throws MetadataRdfRepositoryException { return service.getEntryHarvestedData(uuid); } @DeleteMapping("/{uuid}") @ResponseStatus(HttpStatus.NO_CONTENT) - public void deleteEntry(@PathVariable final String uuid) throws MetadataRepositoryException { + public void deleteEntry(@PathVariable final String uuid) throws MetadataRdfRepositoryException { service.deleteEntry(uuid); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java index 3a8ce6aa6..9feafe1ee 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java @@ -32,7 +32,7 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.service.UtilityService; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; @@ -95,7 +95,7 @@ public class IndexPingController { public ResponseEntity receivePing( @RequestBody @Valid PingDTO reqDto, HttpServletRequest request - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { log.info("Received ping from {}", utilityService.getRemoteAddr(request)); final Event event = eventService.acceptIncomingPing(reqDto, request); log.info("Triggering metadata retrieval for {}", event.getRelatedTo().getClientUrl()); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index eac2f5056..269fc2059 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -25,8 +25,8 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; @@ -77,7 +77,7 @@ public class IndexEntryService { private IndexEntryMapper mapper; @Autowired - private GenericMetadataRepository genericMetadataRepository; + private GenericMetadataRdfRepository genericMetadataRepository; @Autowired private HarvesterService harvesterService; @@ -251,7 +251,7 @@ public IndexEntry storeEntry(@Valid PingDTO pingDTO) { @RequiredEnabledIndexFeature @PreAuthorize("hasRole('ADMIN')") - public void deleteEntry(String uuid) throws MetadataRepositoryException { + public void deleteEntry(String uuid) throws MetadataRdfRepositoryException { final IndexEntry entry = repository.findByUuid(uuid) .orElseThrow(() -> new ResourceNotFoundException(MSG_NOT_FOUND)); harvesterService.deleteHarvestedData(entry.getClientUrl()); @@ -259,7 +259,7 @@ public void deleteEntry(String uuid) throws MetadataRepositoryException { } @Async - public void harvest(String clientUrl) throws MetadataRepositoryException { + public void harvest(String clientUrl) throws MetadataRdfRepositoryException { log.info("Checking index entry for '{}'", clientUrl); final Optional indexEntry = getEntryByClientUrl(clientUrl); if (indexEntry.isEmpty() || indexEntry.get().getPermit() != IndexEntryPermit.ACCEPTED) { @@ -275,7 +275,7 @@ private Instant getValidThreshold() { } @RequiredEnabledIndexFeature - public Model getEntryHarvestedData(String uuid) throws MetadataRepositoryException { + public Model getEntryHarvestedData(String uuid) throws MetadataRdfRepositoryException { final IndexEntry entry = repository .findByUuid(uuid) .orElseThrow(() -> new ResourceNotFoundException(MSG_NOT_FOUND)); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/AbstractMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataRdfRepository.java similarity index 82% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/AbstractMetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataRdfRepository.java index 1fa0303e2..a31db382d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/AbstractMetadataRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataRdfRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; +package org.fairdatateam.fairdatapoint.metadata; import lombok.extern.slf4j.Slf4j; import org.eclipse.rdf4j.common.iteration.Iterations; @@ -38,7 +38,7 @@ import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadResource; @Slf4j -public abstract class AbstractMetadataRepository implements MetadataRepository { +public abstract class AbstractMetadataRdfRepository implements MetadataRdfRepository { private static final String FIND_CHILD_TITLES = "/sparql/findChildTitles.sparql"; @@ -57,22 +57,22 @@ public abstract class AbstractMetadataRepository implements MetadataRepository { /** * Constructor (autowired) */ - public AbstractMetadataRepository(Repository repository) { + public AbstractMetadataRdfRepository(Repository repository) { this.repository = repository; } - public List find(IRI context) throws MetadataRepositoryException { + public List find(IRI context) throws MetadataRdfRepositoryException { try (RepositoryConnection conn = repository.getConnection()) { return Iterations.asList( conn.getStatements(null, null, null, context) ); } catch (RepositoryException exception) { - throw new MetadataRepositoryException(MSG_ERROR_RESOURCE + exception.getMessage()); + throw new MetadataRdfRepositoryException(MSG_ERROR_RESOURCE + exception.getMessage()); } } - public Map findChildTitles(IRI parent, IRI relation) throws MetadataRepositoryException { + public Map findChildTitles(IRI parent, IRI relation) throws MetadataRdfRepositoryException { final Map titles = new HashMap<>(); final List results = runSparqlQueryFromFile( FIND_CHILD_TITLES, Map.of("parent", parent, "relation", relation) @@ -86,44 +86,44 @@ public Map findChildTitles(IRI parent, IRI relation) throws Meta } public boolean checkExistence(Resource subject, IRI predicate, Value object) - throws MetadataRepositoryException { + throws MetadataRdfRepositoryException { try (RepositoryConnection conn = repository.getConnection()) { return conn.hasStatement(subject, predicate, object, false); } catch (RepositoryException exception) { - throw new MetadataRepositoryException(MSG_ERROR_EXISTS + exception.getMessage()); + throw new MetadataRdfRepositoryException(MSG_ERROR_EXISTS + exception.getMessage()); } } - public void save(List statements, IRI context) throws MetadataRepositoryException { + public void save(List statements, IRI context) throws MetadataRdfRepositoryException { try (RepositoryConnection conn = repository.getConnection()) { conn.add(statements, context); } catch (RepositoryException exception) { - throw new MetadataRepositoryException(MSG_ERROR_SAVE + exception.getMessage()); + throw new MetadataRdfRepositoryException(MSG_ERROR_SAVE + exception.getMessage()); } } - public void removeAll() throws MetadataRepositoryException { + public void removeAll() throws MetadataRdfRepositoryException { try (RepositoryConnection conn = repository.getConnection()) { conn.clear(); } catch (RepositoryException exception) { - throw new MetadataRepositoryException(MSG_ERROR_REMOVE_ALL + exception.getMessage()); + throw new MetadataRdfRepositoryException(MSG_ERROR_REMOVE_ALL + exception.getMessage()); } } - public void remove(IRI uri) throws MetadataRepositoryException { + public void remove(IRI uri) throws MetadataRdfRepositoryException { removeStatement(null, null, null, uri); } public void removeStatement(Resource subject, IRI predicate, Value object, IRI context) - throws MetadataRepositoryException { + throws MetadataRdfRepositoryException { try (RepositoryConnection conn = repository.getConnection()) { conn.remove(subject, predicate, object, context); } catch (RepositoryException exception) { - throw new MetadataRepositoryException(MSG_ERROR_REMOVE); + throw new MetadataRdfRepositoryException(MSG_ERROR_REMOVE); } } @@ -136,7 +136,7 @@ public void removeStatement(Resource subject, IRI predicate, Value object, IRI c */ public List runSparqlQuery( String queryString, @Nullable Map bindings - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { try (RepositoryConnection conn = repository.getConnection()) { final TupleQuery query = conn.prepareTupleQuery(queryString); if (bindings != null) { @@ -146,7 +146,7 @@ public List runSparqlQuery( return QueryResults.asList(query.evaluate()); } catch (RepositoryException exception) { - throw new MetadataRepositoryException(MSG_ERROR_URI + exception.getMessage()); + throw new MetadataRdfRepositoryException(MSG_ERROR_URI + exception.getMessage()); } } @@ -158,7 +158,7 @@ public List runSparqlQuery( */ public List runSparqlQueryFromFile( String queryFilePath, @Nullable Map bindings - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { final String queryString = loadResource(queryFilePath); return runSparqlQuery(queryString, bindings); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataService.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataService.java index 1a93b0f45..c789f782c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataService.java @@ -20,22 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.common; +package org.fairdatateam.fairdatapoint.metadata; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; -import org.fairdatateam.fairdatapoint.service.metadata.validator.MetadataValidator; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; @@ -52,8 +44,8 @@ import java.util.stream.Collectors; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getChildren; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getChildren; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; import static org.fairdatateam.fairdatapoint.util.ThrowingFunction.suppress; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*; @@ -61,7 +53,7 @@ public abstract class AbstractMetadataService implements MetadataService { @Autowired - private GenericMetadataRepository metadataRepository; + private GenericMetadataRdfRepository metadataRepository; @Autowired private MemberService memberService; @@ -100,7 +92,7 @@ public Model retrieve(IRI uri) throws MetadataServiceException, ResourceNotFound metadata.addAll(statements); return metadata; } - catch (MetadataRepositoryException exception) { + catch (MetadataRdfRepositoryException exception) { throw new MetadataServiceException(exception.getMessage()); } } @@ -127,7 +119,7 @@ public Model store( addState(uri); return metadata; } - catch (MetadataRepositoryException exception) { + catch (MetadataRdfRepositoryException exception) { throw new MetadataServiceException(exception.getMessage()); } } @@ -152,7 +144,7 @@ public Model update( updateParent(metadata, uri, resourceDefinition); return metadata; } - catch (MetadataRepositoryException | MetadataServiceException exception) { + catch (MetadataRdfRepositoryException | MetadataServiceException exception) { throw new MetadataServiceException(exception.getMessage()); } } @@ -193,7 +185,7 @@ public void delete(IRI uri, ResourceDefinition rd) throws MetadataServiceExcepti // Delete itself metadataRepository.remove(uri); } - catch (MetadataRepositoryException | MetadataServiceException exception) { + catch (MetadataRdfRepositoryException | MetadataServiceException exception) { throw new MetadataServiceException(exception.getMessage()); } } @@ -218,7 +210,7 @@ protected void updateParent( statements.add(s(parent, FDP.METADATAMODIFIED, l(OffsetDateTime.now()))); metadataRepository.save(statements, parent); } - catch (MetadataRepositoryException exception) { + catch (MetadataRdfRepositoryException exception) { throw new MetadataServiceException("Problem with updating parent timestamp"); } final Model parentMetadata = retrieve(parent); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/AccessRights.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/AccessRights.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/AccessRights.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/AccessRights.java index c18c2e0c4..0a2e7bc28 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/AccessRights.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/AccessRights.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Agent.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Agent.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Agent.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/Agent.java index 223bf11b2..52b11af96 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Agent.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Agent.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Authorization.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Authorization.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Authorization.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/Authorization.java index 9556df014..9db181f57 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Authorization.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Authorization.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataRdfRepository.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataRdfRepository.java index 479fcc6d4..bc636ec61 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataRdfRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; +package org.fairdatateam.fairdatapoint.metadata; import jakarta.annotation.PostConstruct; import org.eclipse.rdf4j.model.IRI; @@ -37,7 +37,7 @@ import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service -public class CatalogMetadataRepository extends AbstractMetadataRepository { +public class CatalogMetadataRdfRepository extends AbstractMetadataRdfRepository { private static final String GET_DATASET_THEMES_FOR_CATALOG = "/sparql/getDatasetThemesForCatalog.sparql"; @@ -46,7 +46,7 @@ public class CatalogMetadataRepository extends AbstractMetadataRepository { /** * Constructor (autowired) */ - public CatalogMetadataRepository(ConcurrentMapCacheManager cacheManager, Repository repository) { + public CatalogMetadataRdfRepository(ConcurrentMapCacheManager cacheManager, Repository repository) { super(repository); this.cacheManager = cacheManager; } @@ -56,7 +56,7 @@ public void init() { cacheManager.setCacheNames(List.of(CATALOG_THEMES_CACHE)); } - public List getDatasetThemesForCatalog(IRI uri) throws MetadataRepositoryException { + public List getDatasetThemesForCatalog(IRI uri) throws MetadataRdfRepositoryException { List result = cache().get(uri.toString(), List.class); if (result != null) { return result; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataService.java similarity index 80% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataService.java index 6b981feab..1d0978a43 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataService.java @@ -20,14 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.catalog; +package org.fairdatateam.fairdatapoint.metadata; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.database.rdf.repository.CatalogMetadataRepository; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; @@ -36,14 +32,14 @@ import javax.annotation.Nonnull; import java.util.List; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.setThemeTaxonomies; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.setThemeTaxonomies; @Service("catalogMetadataService") @Slf4j public class CatalogMetadataService extends AbstractMetadataService { @Autowired - private CatalogMetadataRepository metadataRepository; + private CatalogMetadataRdfRepository metadataRepository; @Override public Model retrieve(@Nonnull IRI uri) throws MetadataServiceException { @@ -52,7 +48,7 @@ public Model retrieve(@Nonnull IRI uri) throws MetadataServiceException { final List themes = metadataRepository.getDatasetThemesForCatalog(uri); setThemeTaxonomies(catalog, uri, themes); } - catch (MetadataRepositoryException exception) { + catch (MetadataRdfRepositoryException exception) { log.error("Error retrieving the metadata"); throw new MetadataServiceException(exception.getMessage()); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java index d756e396d..758bc7b58 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java @@ -20,24 +20,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.metadata; +package org.fairdatateam.fairdatapoint.metadata; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; -import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory; -import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; @@ -99,7 +90,7 @@ public class GenericController { private CurrentUserProvider currentUserProvider; @Autowired - private GenericMetadataRepository metadataRepository; + private GenericMetadataRdfRepository metadataRepository; @Autowired private SearchFilterCache searchFilterCache; @@ -334,7 +325,7 @@ public ResponseEntity getMetaDataChildren( @PathVariable final String childPrefix, @RequestParam(defaultValue = "0") final int page, @RequestParam(defaultValue = "10") final int size - ) throws MetadataServiceException, MetadataRepositoryException { + ) throws MetadataServiceException, MetadataRdfRepositoryException { // 1. Init final Model resultRdf = new LinkedHashModel(); final String urlPrefix = oUrlPrefix.orElse(""); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMemberController.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMemberController.java index ca817fe6e..d33f31b0b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMemberController.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.metadata; +package org.fairdatateam.fairdatapoint.metadata; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,11 +28,7 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +40,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getMetadataIdentifier; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; @Tag(name = "Authentication and Authorization") diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetaController.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetaController.java index 198cc07bf..b9e2eff03 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetaController.java @@ -20,23 +20,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.metadata; +package org.fairdatateam.fairdatapoint.metadata; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaPathDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaPathDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory; -import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -49,8 +44,8 @@ import java.util.Map; import java.util.Optional; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getMetadataIdentifier; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataRdfRepository.java similarity index 81% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataRdfRepository.java index 9d3399e45..29695eaf7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataRdfRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; +package org.fairdatateam.fairdatapoint.metadata; import org.eclipse.rdf4j.model.*; import org.eclipse.rdf4j.model.impl.LinkedHashModel; @@ -31,41 +31,41 @@ import java.util.List; import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; @Service -public class GenericMetadataRepository extends AbstractMetadataRepository { +public class GenericMetadataRdfRepository extends AbstractMetadataRdfRepository { private final ConcurrentMapCacheManager cacheManager; /** * Constructor (autowired) */ - public GenericMetadataRepository(ConcurrentMapCacheManager cacheManager, Repository repository) { + public GenericMetadataRdfRepository(ConcurrentMapCacheManager cacheManager, Repository repository) { super(repository); this.cacheManager = cacheManager; } @Override - public void save(List statements, IRI context) throws MetadataRepositoryException { + public void save(List statements, IRI context) throws MetadataRdfRepositoryException { super.save(statements, context); clearCatalogCache(context); } @Override - public void remove(IRI uri) throws MetadataRepositoryException { + public void remove(IRI uri) throws MetadataRdfRepositoryException { clearCatalogCache(uri); super.remove(uri); } @Override public void removeStatement(Resource subject, IRI predicate, Value object, IRI context) - throws MetadataRepositoryException { + throws MetadataRdfRepositoryException { clearCatalogCache(context); super.removeStatement(subject, predicate, object, context); } - private void clearCatalogCache(IRI uri) throws MetadataRepositoryException { + private void clearCatalogCache(IRI uri) throws MetadataRdfRepositoryException { final Model metadata = new LinkedHashModel(); metadata.addAll(find(uri)); final IRI parent = getParent(metadata); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataService.java similarity index 86% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataService.java index 308f644df..090d81923 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataService.java @@ -20,15 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.generic; +package org.fairdatateam.fairdatapoint.metadata; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.security.acls.domain.BasePermission; @@ -36,7 +33,7 @@ import java.util.Optional; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; @Service("genericMetadataService") public class GenericMetadataService extends AbstractMetadataService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Identifier.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Identifier.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Identifier.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/Identifier.java index 63e1fc34d..fff02483b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Identifier.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Identifier.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metadata.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metadata.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metadata.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/Metadata.java index b70d816d8..3eec36c62 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metadata.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metadata.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import lombok.*; import org.bson.types.ObjectId; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataConfig.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataConfig.java index 3c3806013..82fc9bfa6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.metadata; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataEnhancer.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataEnhancer.java index 014baddb0..725dfe40f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataEnhancer.java @@ -20,13 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.enhance; +package org.fairdatateam.fairdatapoint.metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.Identifier; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.service.actuator.AppInfoContributor; -import org.fairdatateam.fairdatapoint.service.metadata.metric.MetricsMetadataService; import org.fairdatateam.fairdatapoint.service.profile.ProfileService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; @@ -46,8 +44,8 @@ import java.util.stream.Collectors; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.*; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.RdfUtil.containsObject; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataGetter.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataGetter.java index de21249f9..77bbfea65 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataGetter.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepository.java similarity index 77% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepository.java index b5e824fa4..6cfdede26 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepository.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; +package org.fairdatateam.fairdatapoint.metadata; import org.eclipse.rdf4j.model.*; import org.eclipse.rdf4j.query.BindingSet; @@ -33,24 +33,24 @@ import java.util.List; import java.util.Map; -public interface MetadataRepository { +public interface MetadataRdfRepository { - List find(IRI context) throws MetadataRepositoryException; + List find(IRI context) throws MetadataRdfRepositoryException; Map findChildTitles(IRI parent, IRI relation) - throws MetadataRepositoryException; + throws MetadataRdfRepositoryException; boolean checkExistence(Resource subject, IRI predicate, Value object) - throws MetadataRepositoryException; + throws MetadataRdfRepositoryException; - void save(List statements, IRI context) throws MetadataRepositoryException; + void save(List statements, IRI context) throws MetadataRdfRepositoryException; - void removeAll() throws MetadataRepositoryException; + void removeAll() throws MetadataRdfRepositoryException; - void remove(IRI uri) throws MetadataRepositoryException; + void remove(IRI uri) throws MetadataRdfRepositoryException; void removeStatement(Resource subject, IRI predicate, Value object, IRI context) - throws MetadataRepositoryException; + throws MetadataRdfRepositoryException; - List runSparqlQuery(String queryString, Map bindings) throws MetadataRepositoryException; + List runSparqlQuery(String queryString, Map bindings) throws MetadataRdfRepositoryException; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryException.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepositoryException.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryException.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepositoryException.java index 41d8240b9..6e28b14cb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepositoryException.java @@ -25,11 +25,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; +package org.fairdatateam.fairdatapoint.metadata; -public class MetadataRepositoryException extends Exception { +public class MetadataRdfRepositoryException extends Exception { - public MetadataRepositoryException(String msg) { + public MetadataRdfRepositoryException(String msg) { super(msg); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRepository.java index 3b765d817..2ff50a69d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataService.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataService.java index 6c6be4a44..6523405f7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataService.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.common; +package org.fairdatateam.fairdatapoint.metadata; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/exception/MetadataServiceException.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/exception/MetadataServiceException.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceException.java index 9a1c786e1..3c126130c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/exception/MetadataServiceException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceException.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.service.metadata.exception; +package org.fairdatateam.fairdatapoint.metadata; /** * @author Rajaram Kaliyaperumal diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceFactory.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceFactory.java index 2a7b243be..55c972ce2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceFactory.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.factory; +package org.fairdatateam.fairdatapoint.metadata; -import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataSetter.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataSetter.java index eb223c169..94946a5ba 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataSetter.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataState.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataState.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataState.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataState.java index 3a3f0fc51..87713b7f5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataState.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataState.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; public enum MetadataState { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateService.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateService.java index 2bd515b02..410bc0739 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateService.java @@ -20,17 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.state; +package org.fairdatateam.fairdatapoint.metadata; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.service.metadata.validator.MetadataStateValidator; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateValidator.java similarity index 86% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateValidator.java index 96ce9e06b..106b0892d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateValidator.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.validator; +package org.fairdatateam.fairdatapoint.metadata; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java index 368ae3569..600596d39 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java @@ -20,13 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.validator; +package org.fairdatateam.fairdatapoint.metadata; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepository; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; import org.fairdatateam.fairdatapoint.service.rdf.ShaclValidator; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; @@ -38,15 +35,15 @@ import org.springframework.stereotype.Service; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service public class MetadataValidator { @Autowired - @Qualifier("genericMetadataRepository") - private MetadataRepository metadataRepository; + @Qualifier("genericMetadataRdfRepository") + private MetadataRdfRepository metadataRepository; @Autowired private ShaclValidator shaclValidator; @@ -95,7 +92,7 @@ private void validateParent(Model metadata, ResourceDefinition definition) throw } } } - catch (MetadataRepositoryException exception) { + catch (MetadataRdfRepositoryException exception) { throw new MetadataServiceException(exception.getMessage()); } } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metric.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metric.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metric.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/Metric.java index 2a552961b..6591452ad 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metric.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metric.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.entity.metadata; +package org.fairdatateam.fairdatapoint.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetricsMetadataService.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/MetricsMetadataService.java index c753aa871..2003d9dcc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetricsMetadataService.java @@ -25,10 +25,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.service.metadata.metric; +package org.fairdatateam.fairdatapoint.metadata; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.entity.metadata.Metric; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaDTO.java index 3dac86b3a..9ed929ada 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.metadata; +package org.fairdatateam.fairdatapoint.metadata.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaPathDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaPathDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaPathDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaPathDTO.java index e648f1d2f..adba70f2c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaPathDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaPathDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.metadata; +package org.fairdatateam.fairdatapoint.metadata.dto; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateChangeDTO.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateChangeDTO.java index c70ee6b90..ca8e9fd17 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateChangeDTO.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.metadata; +package org.fairdatateam.fairdatapoint.metadata.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateDTO.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateDTO.java index 48ef27dad..1bb5bd26f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateDTO.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.metadata; +package org.fairdatateam.fairdatapoint.metadata.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import java.util.Map; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/RdfDevelopmentMigrationRunner.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/RdfDevelopmentMigrationRunner.java index 832f5cce9..48a437d1c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/RdfDevelopmentMigrationRunner.java @@ -20,11 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.development; +package org.fairdatateam.fairdatapoint.metadata.migration.development; import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.RdfMetadataMigration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/RdfMetadataMigration.java similarity index 85% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/RdfMetadataMigration.java index 2234c4b1a..2d2924a15 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/RdfMetadataMigration.java @@ -20,20 +20,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata; +package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.database.common.migration.Migration; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data.RdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; +import org.fairdatateam.fairdatapoint.metadata.MetadataService; +import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.metadata.MetadataStateService; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -43,14 +43,14 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service public class RdfMetadataMigration implements Migration { @Autowired - private GenericMetadataRepository metadataRepository; + private GenericMetadataRdfRepository metadataRepository; @Autowired private RdfMetadataFixtures rdfMetadataFixtures; @@ -92,7 +92,7 @@ public void runMigration() { // 3. Load metadata fixtures importDefaultFixtures(persistentUrl); } - catch (MetadataServiceException | MetadataRepositoryException exception) { + catch (MetadataServiceException | MetadataRdfRepositoryException exception) { exception.printStackTrace(); } } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/data/RdfMetadataFixtures.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/data/RdfMetadataFixtures.java index a7c927910..ded35f0a3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/data/RdfMetadataFixtures.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data; +package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory.MetadataFactory; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactory.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactory.java index ef4bdcfd3..fc6a1d480 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactory.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory; +package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactoryImpl.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactoryImpl.java index ff9c67457..f6c4bb184 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactoryImpl.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory; +package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory; -import org.fairdatateam.fairdatapoint.entity.metadata.Agent; +import org.fairdatateam.fairdatapoint.metadata.Agent; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -33,7 +33,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0001_Init.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0001_Init.java index 00f2cb32c..da577dfed 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0001_Init.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.production; +package org.fairdatateam.fairdatapoint.metadata.migration.production; import com.mongodb.client.MongoCollection; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0002_Metadata_Draft.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0002_Metadata_Draft.java index 9b63a921e..e269a29ec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0002_Metadata_Draft.java @@ -20,12 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.production; +package org.fairdatateam.fairdatapoint.metadata.migration.production; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.eclipse.rdf4j.model.Resource; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0003_FDPO.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0003_FDPO.java index 78d6b6fa5..879633046 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0003_FDPO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.production; +package org.fairdatateam.fairdatapoint.metadata.migration.production; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0004_Cleanup_Index.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0004_Cleanup_Index.java index edf238f93..462006756 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0004_Cleanup_Index.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.production; +package org.fairdatateam.fairdatapoint.metadata.migration.production; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; @@ -51,7 +51,7 @@ public class Rdf_Migration_0004_Cleanup_Index implements RdfProductionMigration private Repository repository; @Autowired - private GenericMetadataRepository genericMetadataRepository; + private GenericMetadataRdfRepository genericMetadataRepository; @Autowired private String persistentUrl; @@ -100,7 +100,7 @@ public void cleanupHarvestedRecordsFrom(IndexEntry entry) { try { genericMetadataRepository.remove(i(contextId)); } - catch (MetadataRepositoryException exception) { + catch (MetadataRdfRepositoryException exception) { throw new RuntimeException(exception); } }); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0005_FixMetadataVersion.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java rename to src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0005_FixMetadataVersion.java index 2d0966490..23d3b1d4f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0005_FixMetadataVersion.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.migration.production; +package org.fairdatateam.fairdatapoint.metadata.migration.production; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java index 913d3abf2..e6c6babd7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java @@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.search.dto.*; import org.eclipse.rdf4j.query.MalformedQueryException; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +50,7 @@ public class SearchController { ) public ResponseEntity> search( @RequestBody @Valid SearchQueryDTO reqDto - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { return ResponseEntity.ok(searchService.search(reqDto)); } @@ -69,7 +69,7 @@ public ResponseEntity getSearchQueryTemplate() { ) public ResponseEntity> searchWithQuery( @RequestBody @Valid SearchQueryVariablesDTO reqDto - ) throws MetadataRepositoryException, MalformedQueryException { + ) throws MetadataRdfRepositoryException, MalformedQueryException { return ResponseEntity.ok(searchService.search(reqDto)); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java index 3f6a09f5d..4067c37dd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchResultDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -75,7 +75,7 @@ public ResponseEntity getSingle( @PostMapping(path = "/{uuid}", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> search( @PathVariable final String uuid - ) throws ResourceNotFoundException, MetadataRepositoryException { + ) throws ResourceNotFoundException, MetadataRdfRepositoryException { final Optional oDto = searchSavedQueryService.getSingle(uuid); if (oDto.isPresent()) { return ResponseEntity.ok(searchService.search(oDto.get().getVariables())); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index f699cc740..a925eabeb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -22,13 +22,13 @@ */ package org.fairdatateam.fairdatapoint.search; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilter; import org.fairdatateam.fairdatapoint.search.dto.*; -import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; +import org.fairdatateam.fairdatapoint.metadata.MetadataStateService; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.apache.commons.lang.text.StrSubstitutor; import org.eclipse.rdf4j.model.IRI; @@ -60,7 +60,7 @@ public class SearchService { private static String queryTemplate; - private final GenericMetadataRepository metadataRepository; + private final GenericMetadataRdfRepository metadataRepository; private final MetadataStateService metadataStateService; @@ -77,7 +77,7 @@ public class SearchService { * Constructor (autowired) */ public SearchService( - GenericMetadataRepository metadataRepository, + GenericMetadataRdfRepository metadataRepository, MetadataStateService metadataStateService, String persistentUrl, SearchMapper searchMapper, @@ -98,7 +98,7 @@ public SearchService( * @param simpleQuery Object containing a search string literal * @return List of search result objects */ - public List search(SearchQueryDTO simpleQuery) throws MetadataRepositoryException { + public List search(SearchQueryDTO simpleQuery) throws MetadataRdfRepositoryException { final List results = findByLiteral(l(simpleQuery.getQuery())); return processSearchResults(results); } @@ -110,7 +110,7 @@ public List search(SearchQueryDTO simpleQuery) throws MetadataR */ public List search( SearchQueryVariablesDTO queryVariables - ) throws MetadataRepositoryException, MalformedQueryException { + ) throws MetadataRdfRepositoryException, MalformedQueryException { // Compose query final String query = composeQuery(queryVariables); // Verify query @@ -177,7 +177,7 @@ private List queryFilterItems(String predicate) { searchFilterCache.setFilter(predicate, new SearchFilterCacheContainer(result)); return result; } - catch (MetadataRepositoryException exception) { + catch (MetadataRdfRepositoryException exception) { throw new RuntimeException(exception); } } @@ -232,14 +232,14 @@ private String composeQuery(SearchQueryVariablesDTO queryVariables) { return substitutor.replace(queryTemplate); } - public List findByLiteral(Literal query) throws MetadataRepositoryException { + public List findByLiteral(Literal query) throws MetadataRdfRepositoryException { return metadataRepository.runSparqlQueryFromFile(FIND_ENTITY_BY_LITERAL, Map.of("query", query)) .stream() .map(item -> searchMapper.toSearchResult(item, true)) .toList(); } - public List findBySparqlQuery(String query) throws MetadataRepositoryException { + public List findBySparqlQuery(String query) throws MetadataRdfRepositoryException { return metadataRepository .runSparqlQuery(query, null) .stream() @@ -247,7 +247,7 @@ public List findBySparqlQuery(String query) throws MetadataReposit .toList(); } - public List findByFilterPredicate(IRI predicateUri) throws MetadataRepositoryException { + public List findByFilterPredicate(IRI predicateUri) throws MetadataRdfRepositoryException { final Map values = new HashMap<>(); metadataRepository.runSparqlQueryFromFile( FIND_OBJECT_FOR_PREDICATE, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java index ace33eef2..7c549396c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java @@ -25,13 +25,13 @@ import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService; +import org.fairdatateam.fairdatapoint.metadata.MetadataService; +import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.metadata.MetadataStateService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; @@ -45,7 +45,7 @@ import java.util.List; import java.util.Optional; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java index e397b9f8e..a7b977ed8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java @@ -37,8 +37,8 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.springframework.http.HttpStatus; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java index 1169418af..a7a14c139 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; import org.fairdatateam.fairdatapoint.entity.schema.SemVer; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java index c855c9b6e..c6f19ab0c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java @@ -26,10 +26,11 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.api.dto.reset.ResetDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.*; +import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.metadata.generic.GenericMetadataService; +import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.settings.SettingsService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java index aa2b21fd6..d7ea5291b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Objects; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.setRdfTypes; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.setRdfTypes; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getSubjectBy; import static org.fairdatateam.fairdatapoint.util.ResourceReader.getResource; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java index 6ddc74426..04b069200 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.MigrationRunner; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.RdfDevelopmentMigrationRunner; +import org.fairdatateam.fairdatapoint.metadata.migration.development.RdfDevelopmentMigrationRunner; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java index 8dbd3906a..0c225b064 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java index 8760ca3a5..f1f2d298c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java @@ -24,9 +24,9 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java index 363de98df..0982ec8a2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java @@ -43,8 +43,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java index 20bf1f61a..138676ad4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.RdfMetadataMigration; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.Model; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java index 28b349494..8e34c5bf6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java index 420d821eb..95f26c7e7 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java index 1db31b26c..ffd1212e9 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java @@ -43,8 +43,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java index f9c5e2de3..e9f49f950 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java index ca0ae15a2..2316150ae 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java index 71f094ec9..0ea12647f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java @@ -42,8 +42,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java index 4fb39589a..52dbb478e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java index e1a40e3e8..825660158 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java index 5c4b35dfb..d50f0e9f9 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java @@ -40,8 +40,8 @@ import java.net.URI; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java index 2fcda35a2..f8c8528e0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.repository.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java index 5ba9fbf6b..243fb866c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.repository.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java index 7f6e25cd5..ad250afbd 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java @@ -27,6 +27,8 @@ import org.eclipse.rdf4j.query.TupleQueryResult; import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -69,11 +71,11 @@ public class CatalogMetadataRepositoryTest { @Spy @InjectMocks - private CatalogMetadataRepository catalogMetadataRepository; + private CatalogMetadataRdfRepository catalogMetadataRepository; @Test @DisplayName("Themes for catalog are in cache (no query to triple store)") - public void themesInCache() throws MetadataRepositoryException { + public void themesInCache() throws MetadataRdfRepositoryException { // GIVEN: when(cacheManager.getCache(CATALOG_THEMES_CACHE)).thenReturn(cache); when(cache.get(catalogUri.toString(), List.class)).thenReturn(Collections.emptyList()); @@ -87,7 +89,7 @@ public void themesInCache() throws MetadataRepositoryException { @Test @DisplayName("Themes for catalog are not in cache (we have to query to triple store)") - public void themesNotInCache() throws MetadataRepositoryException { + public void themesNotInCache() throws MetadataRdfRepositoryException { // GIVEN: when(cacheManager.getCache(CATALOG_THEMES_CACHE)).thenReturn(cache); when(repository.getConnection()).thenReturn(repositoryConnection); diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java index 6d4caba17..f7079da11 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java @@ -23,6 +23,9 @@ package org.fairdatateam.fairdatapoint.database.rdf.repository; import org.fairdatateam.fairdatapoint.WebIntegrationTest; +import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -36,8 +39,8 @@ import java.util.ArrayList; import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getLanguage; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getLanguage; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; @@ -52,14 +55,14 @@ public class GenericMetadataRepositoryTest extends WebIntegrationTest { private TestRdfMetadataFixtures testMetadataFixtures; @Autowired - private GenericMetadataRepository metadataRepository; + private GenericMetadataRdfRepository metadataRepository; @Autowired - private CatalogMetadataRepository catalogMetadataRepository; + private CatalogMetadataRdfRepository catalogMetadataRepository; @Test @DisplayName("'save' should evict cache") - public void saveEvictsCache() throws MetadataRepositoryException { + public void saveEvictsCache() throws MetadataRdfRepositoryException { // GIVEN: Model catalog = testMetadataFixtures.catalog1(); IRI catalogUri = getUri(catalog); @@ -80,7 +83,7 @@ public void saveEvictsCache() throws MetadataRepositoryException { @Test @DisplayName("'removeStatement' should evict cache") - public void removeStatementEvictsCache() throws MetadataRepositoryException { + public void removeStatementEvictsCache() throws MetadataRdfRepositoryException { // GIVEN: Model catalog = testMetadataFixtures.catalog1(); IRI catalogUri = getUri(catalog); @@ -101,7 +104,7 @@ public void removeStatementEvictsCache() throws MetadataRepositoryException { @Test @DisplayName("'remove' should evict cache") - public void removeEvictsCache() throws MetadataRepositoryException { + public void removeEvictsCache() throws MetadataRdfRepositoryException { // GIVEN: Model catalog = testMetadataFixtures.catalog1(); IRI catalogUri = getUri(catalog); diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java index 21cb49839..445f4ce7e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java @@ -29,6 +29,8 @@ import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.fairdatateam.fairdatapoint.WebIntegrationTest; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -41,7 +43,7 @@ import java.util.List; import java.util.Map; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -51,7 +53,7 @@ public class MetadataRepositoryTest extends WebIntegrationTest { @Autowired - private GenericMetadataRepository metadataRepository; + private GenericMetadataRdfRepository metadataRepository; @Autowired private TestRdfMetadataFixtures testMetadataFixtures; @@ -82,7 +84,7 @@ public void findNonExistingResource() throws Exception { } @Test - public void findChildTitlesWorks() throws MetadataRepositoryException { + public void findChildTitlesWorks() throws MetadataRdfRepositoryException { // given final IRI parent = getUri(testMetadataFixtures.catalog1()); diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index f0fcfdd5f..4243839c4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.service.index.harvester; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactoryImpl; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data.RdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory.MetadataFactoryImpl; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.index.HarvesterService; -import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; +import org.fairdatateam.fairdatapoint.metadata.MetadataEnhancer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.vocabulary.FDP; import org.eclipse.rdf4j.model.Model; @@ -47,7 +47,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.write; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.mockito.ArgumentMatchers.any; @@ -64,7 +64,7 @@ public class HarvesterServiceTest { private ResourceDefinitionCache resourceDefinitionCache; @Mock - private GenericMetadataRepository genericMetadataRepository; + private GenericMetadataRdfRepository genericMetadataRepository; @InjectMocks private static MetadataEnhancer metadataEnhancer; @@ -98,7 +98,7 @@ public void setup() { } @Test - public void harvestSucceed() throws MetadataRepositoryException { + public void harvestSucceed() throws MetadataRdfRepositoryException { // GIVEN: Mock webserver mockEndpoint(repositoryUrl, repository); mockEndpoint(catalogUrl, catalog); @@ -111,7 +111,7 @@ public void harvestSucceed() throws MetadataRepositoryException { } @Test - public void harvestFailedForLinkedChildren() throws MetadataRepositoryException { + public void harvestFailedForLinkedChildren() throws MetadataRdfRepositoryException { // GIVEN: Mock webserver mockEndpoint(repositoryUrl, repository); mockEndpoint404(catalogUrl); diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java index c7a2431e2..ef16da5ad 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java @@ -23,8 +23,9 @@ package org.fairdatateam.fairdatapoint.service.metadata.catalog; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.database.rdf.repository.CatalogMetadataRepository; -import org.fairdatateam.fairdatapoint.database.rdf.repository.GenericMetadataRepository; +import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataService; +import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -41,8 +42,8 @@ import java.util.ArrayList; import java.util.List; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getThemeTaxonomies; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getThemeTaxonomies; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -56,10 +57,10 @@ public class CatalogMetadataServiceMockTest extends BaseIntegrationTest { private TestRdfMetadataFixtures testMetadataFixtures; @Mock - private GenericMetadataRepository metadataRepository; + private GenericMetadataRdfRepository metadataRepository; @Mock - private CatalogMetadataRepository catalogMetadataRepository; + private CatalogMetadataRdfRepository catalogMetadataRepository; @InjectMocks private CatalogMetadataService catalogMetadataService; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java index 2ca68dad3..2f1584827 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService; +import org.fairdatateam.fairdatapoint.metadata.MetadataService; import org.fairdatateam.fairdatapoint.utils.AuthHelper; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; @@ -40,8 +40,8 @@ import java.time.OffsetDateTime; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.*; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.*; +import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java index 25fcf6a1b..a45afbaa4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java @@ -28,8 +28,9 @@ package org.fairdatateam.fairdatapoint.service.metadata.metric; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.entity.metadata.Metric; +import org.fairdatateam.fairdatapoint.metadata.Metric; import org.eclipse.rdf4j.model.IRI; +import org.fairdatateam.fairdatapoint.metadata.MetricsMetadataService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java index 41af1e31a..a0df54a00 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java @@ -25,7 +25,7 @@ import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.database.rdf.repository.MetadataRepositoryException; +import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.search.SearchFilterValue; import org.fairdatateam.fairdatapoint.search.SearchResult; import org.fairdatateam.fairdatapoint.search.SearchService; @@ -35,7 +35,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -50,7 +50,7 @@ public class SearchServiceTest extends BaseIntegrationTest { private TestRdfMetadataFixtures testMetadataFixtures; @Test - public void findByLiteralWorks() throws MetadataRepositoryException { + public void findByLiteralWorks() throws MetadataRdfRepositoryException { // given final Model catalog1 = testMetadataFixtures.catalog1(); final Literal title = getTitle(catalog1); @@ -63,7 +63,7 @@ public void findByLiteralWorks() throws MetadataRepositoryException { } @Test - public void findByFilterPredicateWorks() throws MetadataRepositoryException { + public void findByFilterPredicateWorks() throws MetadataRdfRepositoryException { // given // (value from SettingsFixtures.SEARCH_FILTER_TYPE is private) final String predicate = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java index 6c5107390..2b2b08ee7 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java @@ -23,16 +23,16 @@ package org.fairdatateam.fairdatapoint.utils; import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data.RdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory.MetadataFactory; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer; +import org.fairdatateam.fairdatapoint.metadata.MetadataEnhancer; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; @Service public class TestRdfMetadataFixtures extends RdfMetadataFixtures { From 1903ac5c291585a643f36bc784e5523db786cdde Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 18:37:43 +0200 Subject: [PATCH 07/70] move all openapi-related classes into fairdatapoint.openapi package --- .../fairdatapoint/{config => openapi}/OpenApiConfig.java | 4 +--- .../properties => openapi}/OpenApiContactProperties.java | 2 +- .../fairdatapoint/{service => }/openapi/OpenApiGenerator.java | 2 +- .../{config/properties => openapi}/OpenApiProperties.java | 2 +- .../fairdatapoint/{service => }/openapi/OpenApiService.java | 2 +- .../fairdatapoint/{service => }/openapi/OpenApiTagsUtils.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionService.java | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{config => openapi}/OpenApiConfig.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/properties => openapi}/OpenApiContactProperties.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/openapi/OpenApiGenerator.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/properties => openapi}/OpenApiProperties.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/openapi/OpenApiService.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/openapi/OpenApiTagsUtils.java (98%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/OpenApiConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/config/OpenApiConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java index 7042de640..48aae0902 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/OpenApiConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.openapi; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -32,8 +32,6 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.config.properties.OpenApiProperties; -import org.fairdatateam.fairdatapoint.service.openapi.OpenApiTagsUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiContactProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiContactProperties.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiContactProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiContactProperties.java index 8fe1ccc39..9f22a0b2c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiContactProperties.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiContactProperties.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config.properties; +package org.fairdatateam.fairdatapoint.openapi; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java index a7b977ed8..2dd9ea8d3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.openapi; +package org.fairdatateam.fairdatapoint.openapi; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiProperties.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiProperties.java index 358942807..c155862f0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiProperties.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiProperties.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config.properties; +package org.fairdatateam.fairdatapoint.openapi; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiService.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiService.java index 266028dd0..44436633d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.openapi; +package org.fairdatateam.fairdatapoint.openapi; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.PathItem; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiTagsUtils.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiTagsUtils.java index 2f8a9a8b0..450538ebb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiTagsUtils.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.openapi; +package org.fairdatateam.fairdatapoint.openapi; import io.swagger.v3.oas.models.tags.Tag; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java index dc24a9df2..ee475122e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.service.membership.MembershipService; -import org.fairdatateam.fairdatapoint.service.openapi.OpenApiService; +import org.fairdatateam.fairdatapoint.openapi.OpenApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.access.prepost.PreAuthorize; From fe383e8c7f54eb566a1ca89d96ba49dcd8a9e472 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 20:30:25 +0200 Subject: [PATCH 08/70] move all migration-related classes into fairdatapoint.migration package and adapt src/main/resources accordingly rename MigrationRunner to DevelopmentMigrationRunner to be consistent with RdfDevelopmentMigrationRunner rename MongoConfig to MongoDbMigrationConfig and rename RdfRepositoryMigrationConfig to TripleStoreMigrationConfig, for clarity and consistency --- .../common => }/migration/Migration.java | 2 +- .../MongoDbMigrationConfig.java} | 8 +++---- .../TripleStoreMigrationConfig.java} | 4 ++-- .../DevelopmentMigrationRunner.java} | 24 +++++++++---------- .../development/acl/AclMigration.java | 8 +++---- .../development/apikey/ApiKeyMigration.java | 6 ++--- .../apikey/data/ApiKeyFixtures.java | 4 ++-- .../index/entry/IndexEntryMigration.java | 6 ++--- .../index/entry/data/IndexEntryFixtures.java | 2 +- .../index/event/EventMigration.java | 2 +- .../membership/MembershipMigration.java | 6 ++--- .../membership/data/MembershipFixtures.java | 2 +- .../metadata/MetadataMigration.java | 4 ++-- .../metadata/data/MetadataFixtures.java | 2 +- .../resource/ResourceDefinitionMigration.java | 6 ++--- .../data/ResourceDefinitionFixtures.java | 2 +- .../schema/MetadataSchemaMigration.java | 6 ++--- .../schema/data/MetadataSchemaFixtures.java | 2 +- .../search/SearchSavedQueryFixtures.java | 2 +- .../settings/SettingsMigration.java | 4 ++-- .../settings/data/SettingsFixtures.java | 2 +- .../development/user/UserMigration.java | 6 ++--- .../development/user/data/UserFixtures.java | 2 +- .../production/Migration_0001_Init.java | 2 +- .../Migration_0002_CustomMetamodel.java | 2 +- .../Migration_0003_ShapeDefinition.java | 2 +- .../Migration_0004_ResourceDefinition.java | 2 +- .../Migration_0005_UpdateShapeDefinition.java | 2 +- .../Migration_0006_ShapesSharing.java | 2 +- .../Migration_0007_RemoveMongobee.java | 2 +- .../Migration_0008_ShapesInternalChange.java | 2 +- .../Migration_0009_ShapeTargetClasses.java | 2 +- .../Migration_0010_FixShapeXsdPrefix.java | 2 +- .../production/Migration_0011_ComplyFDPO.java | 2 +- .../Migration_0012_MetadataSchemas.java | 2 +- .../Migration_0013_ComplexSearch.java | 2 +- .../Migration_0014_FormsAutocomplete.java | 2 +- .../Migration_0015_FixMetadataVersion.java | 2 +- .../production/Migration_0016_FixSchemas.java | 2 +- .../Migration_0017_FixSchemaDateTimes.java | 2 +- ...igration_0018_IndexSettingsAutoPermit.java | 2 +- ...gration_0019_SetIndexEntryPermitValue.java | 2 +- .../development}/MetadataFactory.java | 2 +- .../development}/MetadataFactoryImpl.java | 2 +- .../RdfDevelopmentMigrationRunner.java | 3 +-- .../development}/RdfMetadataFixtures.java | 3 +-- .../development}/RdfMetadataMigration.java | 9 ++++--- .../production/Rdf_Migration_0001_Init.java | 2 +- .../Rdf_Migration_0002_Metadata_Draft.java | 2 +- .../production/Rdf_Migration_0003_FDPO.java | 2 +- .../Rdf_Migration_0004_Cleanup_Index.java | 2 +- ...Rdf_Migration_0005_FixMetadataVersion.java | 2 +- .../mongodb/development}/shape-catalog.ttl | 0 .../development}/shape-custom-edited.ttl | 0 .../mongodb/development}/shape-custom.ttl | 0 .../development}/shape-data-service.ttl | 0 .../mongodb/development}/shape-dataset.ttl | 0 .../development}/shape-distribution.ttl | 0 .../mongodb/development}/shape-fdp.ttl | 0 .../development}/shape-metadata-service.ttl | 0 .../mongodb/development}/shape-resource.ttl | 0 .../production/0003_shape-catalog.ttl | 0 .../production/0003_shape-dataset.ttl | 0 .../production/0003_shape-distribution.ttl | 0 .../production/0003_shape-repository.ttl | 0 .../production/0003_shape-resource.ttl | 0 .../production/0005_shape-catalog.ttl | 0 .../production/0005_shape-dataset.ttl | 0 .../production/0005_shape-distribution.ttl | 0 .../production/0005_shape-repository.ttl | 0 .../production/0005_shape-resource.ttl | 0 .../production/0011_shape-data-service.ttl | 0 .../mongodb}/production/0011_shape-fdp.ttl | 0 .../0011_shape-metadata-service.ttl | 0 .../production/0016_shape-catalog.ttl | 0 .../production/0016_shape-data-service.ttl | 0 .../production/0016_shape-dataset.ttl | 0 .../production/0016_shape-distribution.ttl | 0 .../mongodb}/production/0016_shape-fdp.ttl | 0 .../production/0016_shape-resource.ttl | 0 .../production/0017_shape-dataset.ttl | 0 .../production/0017_shape-distribution.ttl | 0 .../mongodb}/production/0017_shape-fdp.ttl | 0 .../mongodb}/production/readme.md | 4 ++-- .../fairdatapoint/WebIntegrationTest.java | 8 +++---- .../acceptance/apikey/Detail_DELETE.java | 2 +- .../acceptance/apikey/List_GET.java | 2 +- .../acceptance/dashboard/List_GET.java | 2 +- .../acceptance/general/SecurityTest.java | 2 +- .../acceptance/membership/List_GET.java | 2 +- .../metadata/catalog/List_POST.java | 2 +- .../catalog/member/Detail_DELETE.java | 2 +- .../metadata/catalog/member/Detail_PUT.java | 4 ++-- .../metadata/catalog/member/List_GET.java | 4 ++-- .../metadata/catalog/meta/List_GET.java | 6 ++--- .../metadata/catalog/meta/List_State_PUT.java | 2 +- .../dataset/member/Detail_DELETE.java | 2 +- .../metadata/dataset/member/Detail_PUT.java | 4 ++-- .../metadata/dataset/member/List_GET.java | 4 ++-- .../metadata/dataset/meta/List_GET.java | 6 ++--- .../metadata/dataset/meta/List_State_PUT.java | 2 +- .../distribution/member/Detail_DELETE.java | 2 +- .../distribution/member/Detail_PUT.java | 4 ++-- .../distribution/member/List_GET.java | 4 ++-- .../metadata/distribution/meta/List_GET.java | 6 ++--- .../distribution/meta/List_State_PUT.java | 2 +- .../metadata/repository/meta/List_GET.java | 2 +- .../repository/meta/List_State_PUT.java | 2 +- .../acceptance/resource/Detail_DELETE.java | 2 +- .../acceptance/resource/Detail_GET.java | 2 +- .../acceptance/resource/Detail_PUT.java | 2 +- .../acceptance/resource/List_GET.java | 2 +- .../acceptance/resource/List_POST.java | 2 +- .../acceptance/schema/Content_GET.java | 11 +-------- .../acceptance/schema/Detail_DELETE.java | 2 +- .../acceptance/schema/Detail_GET.java | 2 +- .../acceptance/schema/Draft_DELETE.java | 2 +- .../acceptance/schema/Draft_GET.java | 2 +- .../acceptance/schema/Draft_PUT.java | 2 +- .../acceptance/schema/Import_POST.java | 2 +- .../acceptance/schema/List_GET.java | 3 +-- .../acceptance/schema/List_POST.java | 2 +- .../acceptance/schema/Public_GET.java | 4 +--- .../acceptance/schema/Version_DELETE.java | 2 +- .../acceptance/schema/Version_GET.java | 2 +- .../acceptance/schema/Version_PUT.java | 2 +- .../acceptance/schema/Versions_POST.java | 2 +- .../search/query/saved/Detail_DELETE.java | 2 +- .../search/query/saved/Detail_GET.java | 2 +- .../search/query/saved/Detail_PUT.java | 2 +- .../search/query/saved/List_GET.java | 2 +- .../acceptance/user/Current_GET.java | 2 +- .../acceptance/user/Detail_Current_PUT.java | 2 +- .../user/Detail_Current_Password_PUT.java | 2 +- .../acceptance/user/Detail_DELETE.java | 2 +- .../acceptance/user/Detail_GET.java | 2 +- .../acceptance/user/Detail_PUT.java | 2 +- .../acceptance/user/Detail_Password_PUT.java | 2 +- .../acceptance/user/List_GET.java | 2 +- .../acceptance/user/List_POST.java | 2 +- .../index/harvester/HarvesterServiceTest.java | 6 ++--- .../generic/GenericMetadataServiceTest.java | 2 +- .../resource/ResourceDefinitionCacheTest.java | 2 +- .../ResourceDefinitionValidatorTest.java | 2 +- .../fairdatapoint/utils/AuthHelper.java | 2 +- .../utils/TestRdfMetadataFixtures.java | 6 ++--- 146 files changed, 170 insertions(+), 187 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{database/common => }/migration/Migration.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/MongoConfig.java => migration/MongoDbMigrationConfig.java} (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/RepositoryMigrationConfig.java => migration/TripleStoreMigrationConfig.java} (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/MigrationRunner.java => migration/mongodb/development/DevelopmentMigrationRunner.java} (74%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/acl/AclMigration.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/apikey/ApiKeyMigration.java (86%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/apikey/data/ApiKeyFixtures.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/index/entry/IndexEntryMigration.java (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/index/entry/data/IndexEntryFixtures.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/index/event/EventMigration.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/membership/MembershipMigration.java (86%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/membership/data/MembershipFixtures.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/metadata/MetadataMigration.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/metadata/data/MetadataFixtures.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/resource/ResourceDefinitionMigration.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/resource/data/ResourceDefinitionFixtures.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/schema/MetadataSchemaMigration.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/schema/data/MetadataSchemaFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/search/SearchSavedQueryFixtures.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/settings/SettingsMigration.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/settings/data/SettingsFixtures.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/user/UserMigration.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/development/user/data/UserFixtures.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0001_Init.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0002_CustomMetamodel.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0003_ShapeDefinition.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0004_ResourceDefinition.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0005_UpdateShapeDefinition.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0006_ShapesSharing.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0007_RemoveMongobee.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0008_ShapesInternalChange.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0009_ShapeTargetClasses.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0010_FixShapeXsdPrefix.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0011_ComplyFDPO.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0012_MetadataSchemas.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0013_ComplexSearch.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0014_FormsAutocomplete.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0015_FixMetadataVersion.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0016_FixSchemas.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0017_FixSchemaDateTimes.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0018_IndexSettingsAutoPermit.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/Migration_0019_SetIndexEntryPermitValue.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration/development/metadata/factory => migration/triplestore/development}/MetadataFactory.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration/development/metadata/factory => migration/triplestore/development}/MetadataFactoryImpl.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration => migration/triplestore}/development/RdfDevelopmentMigrationRunner.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration/development/metadata/data => migration/triplestore/development}/RdfMetadataFixtures.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration/development/metadata => migration/triplestore/development}/RdfMetadataMigration.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration => migration/triplestore}/production/Rdf_Migration_0001_Init.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration => migration/triplestore}/production/Rdf_Migration_0002_Metadata_Draft.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration => migration/triplestore}/production/Rdf_Migration_0003_FDPO.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration => migration/triplestore}/production/Rdf_Migration_0004_Cleanup_Index.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{metadata/migration => migration/triplestore}/production/Rdf_Migration_0005_FixMetadataVersion.java (97%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-catalog.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-custom-edited.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-custom.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-data-service.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-dataset.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-distribution.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-fdp.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-metadata-service.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration/development/schema/data => migration/mongodb/development}/shape-resource.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0003_shape-catalog.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0003_shape-dataset.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0003_shape-distribution.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0003_shape-repository.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0003_shape-resource.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0005_shape-catalog.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0005_shape-dataset.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0005_shape-distribution.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0005_shape-repository.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0005_shape-resource.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0011_shape-data-service.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0011_shape-fdp.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0011_shape-metadata-service.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0016_shape-catalog.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0016_shape-data-service.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0016_shape-dataset.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0016_shape-distribution.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0016_shape-fdp.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0016_shape-resource.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0017_shape-dataset.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0017_shape-distribution.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/0017_shape-fdp.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{database/mongo/migration => migration/mongodb}/production/readme.md (50%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/common/migration/Migration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/Migration.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/database/common/migration/Migration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/Migration.java index 877de8780..ca78696b4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/common/migration/Migration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/Migration.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.common.migration; +package org.fairdatateam.fairdatapoint.migration; public interface Migration { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/MongoDbMigrationConfig.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/MongoDbMigrationConfig.java index fbde3d4cf..13179ce9a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/MongoDbMigrationConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.migration; import io.mongock.api.config.LegacyMigration; import io.mongock.driver.mongodb.springdata.v4.SpringDataMongoV4Driver; @@ -46,7 +46,7 @@ "org.fairdatateam.security.acls" } ) -public class MongoConfig { +public class MongoDbMigrationConfig { @Autowired private ResourceDefinitionCache resourceDefinitionCache; @@ -64,9 +64,7 @@ public MongockInitializingBeanRunner mongockApplicationRunner( ) { return MongockSpringboot.builder() .setDriver(SpringDataMongoV4Driver.withDefaultLock(mongoTemplate)) - .addMigrationScanPackage( - "org.fairdatateam.fairdatapoint.database.mongo.migration.production" - ) + .addMigrationScanPackage("org.fairdatateam.fairdatapoint.migration.mongodb.production") .setSpringContext(springContext) .setLegacyMigration(new LegacyMigration("dbchangelog")) .addDependency(ResourceDefinitionCache.class, resourceDefinitionCache) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryMigrationConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/TripleStoreMigrationConfig.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryMigrationConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/TripleStoreMigrationConfig.java index b1293127c..1935ebfa3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryMigrationConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/TripleStoreMigrationConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.migration; import org.fairdatateam.fairdatapoint.Profiles; import org.fairdatateam.rdf.migration.database.RdfMigrationRepository; @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Profile; @Configuration -public class RepositoryMigrationConfig { +public class TripleStoreMigrationConfig { @Bean @DependsOn("mongockRunner") diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java similarity index 74% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java index 7dfe7312e..ca554ad70 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java @@ -20,20 +20,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.acl.AclMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.ApiKeyMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.IndexEntryMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.event.EventMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.MembershipMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.MetadataMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.ResourceDefinitionMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.MetadataSchemaMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.SettingsMigration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.UserMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.acl.AclMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.ApiKeyMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry.IndexEntryMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.index.event.EventMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.MembershipMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.MetadataMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.ResourceDefinitionMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.MetadataSchemaMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.settings.SettingsMigration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.UserMigration; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; @@ -44,7 +44,7 @@ @Service @Profile(Profiles.NON_PRODUCTION) -public class MigrationRunner { +public class DevelopmentMigrationRunner { @Autowired private UserMigration userMigration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java index af3b97c3b..7e991e42a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java @@ -20,11 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.acl; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.acl; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java similarity index 86% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java index 5a82209aa..5f0ec3712 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.ApiKeyRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java index d5fa6c85d..ad2bc1d97 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/IndexEntryMigration.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/IndexEntryMigration.java index f321f3cc9..ff565fb38 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/IndexEntryMigration.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.data.IndexEntryFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry.data.IndexEntryFixtures; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java index 913bf1098..f3878f476 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry.data; import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java index d244d5dcc..403d0a9d4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.event; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.event; import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java similarity index 86% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java index a1e4d1389..1cd5d37be 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.membership; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java index 341541db0..08100b769 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data; import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java index 37a934ae3..cee12a337 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java index 17857bdd4..018653fc1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.metadata.MetadataState; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/ResourceDefinitionMigration.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/ResourceDefinitionMigration.java index 859def34e..4a63661c1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/ResourceDefinitionMigration.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.resource; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java index 9e8ae05f6..5894140fa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java index f03badda9..694cef183 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.schema; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java index 3c8d13313..0037e4ebd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data; import lombok.SneakyThrows; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/search/SearchSavedQueryFixtures.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/search/SearchSavedQueryFixtures.java index 2648a553b..df507b30e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/search/SearchSavedQueryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.search; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.search; import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/SettingsMigration.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/SettingsMigration.java index 3472acbf1..77373c43e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/SettingsMigration.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.settings; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.data.SettingsFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.settings.data.SettingsFixtures; import org.fairdatateam.fairdatapoint.settings.SettingsRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/data/SettingsFixtures.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/data/SettingsFixtures.java index 7c89764d4..ceb827eb9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/data/SettingsFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.settings.data; import org.fairdatateam.fairdatapoint.search.SearchFilterType; import org.fairdatateam.fairdatapoint.settings.Settings; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/UserMigration.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/UserMigration.java index 73869d52a..a3588197f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/UserMigration.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.user; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.user; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/data/UserFixtures.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/data/UserFixtures.java index 06506b24f..8ec608a23 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/data/UserFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java index a637ec88e..9f96f3655 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java index 4d5b90ccd..53a597991 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java index 7f7a1cc3c..1ae830035 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java index 5e4b5d995..46b35e93a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java index 55c5310c4..be3b5face 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0006_ShapesSharing.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0006_ShapesSharing.java index 3625ed5ca..fad8372c3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0006_ShapesSharing.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0007_RemoveMongobee.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0007_RemoveMongobee.java index e00220e17..6b9729f21 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0007_RemoveMongobee.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0008_ShapesInternalChange.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0008_ShapesInternalChange.java index b618587b6..173b0dca7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0008_ShapesInternalChange.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java index 58053bb3c..a8641c7aa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0010_FixShapeXsdPrefix.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0010_FixShapeXsdPrefix.java index 1b1dbd39c..c1ad14ddc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0010_FixShapeXsdPrefix.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java index db99745b4..56406e6ec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java index 156269afb..4d399b49c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0013_ComplexSearch.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0013_ComplexSearch.java index de3744417..358063505 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0013_ComplexSearch.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0014_FormsAutocomplete.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0014_FormsAutocomplete.java index 3e51cf5f4..fd76a31e9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0014_FormsAutocomplete.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java index 96fab6ffa..6a41cffb6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java index f6a56c1f1..96bb00f77 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0017_FixSchemaDateTimes.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0017_FixSchemaDateTimes.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java index fb6181a42..444ad76af 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0017_FixSchemaDateTimes.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0018_IndexSettingsAutoPermit.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0018_IndexSettingsAutoPermit.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0018_IndexSettingsAutoPermit.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0018_IndexSettingsAutoPermit.java index 845213866..fae181785 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0018_IndexSettingsAutoPermit.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0018_IndexSettingsAutoPermit.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0019_SetIndexEntryPermitValue.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0019_SetIndexEntryPermitValue.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0019_SetIndexEntryPermitValue.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0019_SetIndexEntryPermitValue.java index ebeef85f1..6b911a2ea 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0019_SetIndexEntryPermitValue.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0019_SetIndexEntryPermitValue.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.migration.production; +package org.fairdatateam.fairdatapoint.migration.mongodb.production; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactory.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactory.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactory.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactory.java index fc6a1d480..0682fb633 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactory.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactory.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactoryImpl.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java index f6c4bb184..591358cd4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/factory/MetadataFactoryImpl.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; import org.fairdatateam.fairdatapoint.metadata.Agent; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/RdfDevelopmentMigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfDevelopmentMigrationRunner.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/RdfDevelopmentMigrationRunner.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfDevelopmentMigrationRunner.java index 48a437d1c..19b47927e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/RdfDevelopmentMigrationRunner.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfDevelopmentMigrationRunner.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.development; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.RdfMetadataMigration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/data/RdfMetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/data/RdfMetadataFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java index ded35f0a3..30a3ca9a1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/data/RdfMetadataFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory.MetadataFactory; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/RdfMetadataMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java index 2d2924a15..442c05b3b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/development/metadata/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java @@ -20,13 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.development.metadata; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data.RdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.metadata.MetadataState; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0001_Init.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java index da577dfed..2a51bc079 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.production; +package org.fairdatateam.fairdatapoint.migration.triplestore.production; import com.mongodb.client.MongoCollection; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0002_Metadata_Draft.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0002_Metadata_Draft.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java index e269a29ec..22497e9c2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0002_Metadata_Draft.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.production; +package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0003_FDPO.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java index 879633046..cd448a70b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0003_FDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.production; +package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0004_Cleanup_Index.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index 462006756..cc6442c9f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.production; +package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0005_FixMetadataVersion.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java index 23d3b1d4f..3a2dba821 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/migration/production/Rdf_Migration_0005_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.migration.production; +package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-catalog.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-catalog.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-catalog.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-catalog.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-custom-edited.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-custom-edited.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-custom-edited.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-custom-edited.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-custom.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-custom.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-custom.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-custom.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-data-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-data-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-data-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-data-service.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-dataset.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-dataset.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-dataset.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-dataset.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-distribution.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-distribution.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-distribution.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-distribution.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-fdp.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-fdp.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-fdp.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-fdp.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-metadata-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-metadata-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-metadata-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-metadata-service.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-resource.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-resource.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/shape-resource.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/development/shape-resource.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-catalog.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-catalog.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-catalog.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-catalog.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-dataset.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-dataset.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-dataset.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-dataset.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-distribution.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-distribution.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-distribution.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-distribution.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-repository.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-repository.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-repository.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-repository.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-resource.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-resource.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0003_shape-resource.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0003_shape-resource.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-catalog.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-catalog.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-catalog.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-catalog.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-dataset.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-dataset.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-dataset.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-dataset.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-distribution.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-distribution.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-distribution.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-distribution.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-repository.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-repository.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-repository.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-repository.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-resource.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-resource.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0005_shape-resource.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0005_shape-resource.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0011_shape-data-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0011_shape-data-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0011_shape-data-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0011_shape-data-service.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0011_shape-fdp.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0011_shape-fdp.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0011_shape-fdp.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0011_shape-fdp.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0011_shape-metadata-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0011_shape-metadata-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0011_shape-metadata-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0011_shape-metadata-service.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-catalog.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-catalog.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-catalog.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-catalog.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-data-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-data-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-data-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-data-service.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-dataset.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-dataset.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-dataset.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-dataset.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-distribution.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-distribution.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-distribution.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-distribution.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-fdp.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-fdp.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-fdp.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-fdp.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-resource.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-resource.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0016_shape-resource.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0016_shape-resource.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0017_shape-dataset.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0017_shape-dataset.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0017_shape-dataset.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0017_shape-dataset.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0017_shape-distribution.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0017_shape-distribution.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0017_shape-distribution.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0017_shape-distribution.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0017_shape-fdp.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0017_shape-fdp.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0017_shape-fdp.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0017_shape-fdp.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/readme.md b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/readme.md similarity index 50% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/readme.md rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/readme.md index 78d41fa55..b827f3924 100644 --- a/src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/readme.md +++ b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/readme.md @@ -1,2 +1,2 @@ -The content of these SHACL files is copied into the `metadataSchema.definition` field when mongodb migrations are executed (by mongock). -See corresponding migration classes in `src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production` for details. +The content of these SHACL files is copied into the `MetadataSchema.definition` field when mongodb migrations are executed (by mongock). +See corresponding migration classes in `src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production` for details. diff --git a/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java index 04b069200..e2fe9eb36 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.MigrationRunner; -import org.fairdatateam.fairdatapoint.metadata.migration.development.RdfDevelopmentMigrationRunner; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.DevelopmentMigrationRunner; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfDevelopmentMigrationRunner; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; @@ -53,14 +53,14 @@ public abstract class WebIntegrationTest { protected TestRestTemplate client; @Autowired - protected MigrationRunner migrationRunner; + protected DevelopmentMigrationRunner developmentMigrationRunner; @Autowired protected RdfDevelopmentMigrationRunner rdfDevelopmentMigrationRunner; @BeforeEach public void setup() { - migrationRunner.run(); + developmentMigrationRunner.run(); rdfDevelopmentMigrationRunner.run(); } diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java index e8bc68c39..cc2197f16 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.apikey; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java index 51b4637e1..2d13aad11 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java index 0c225b064..6ea68f5a2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java index 0e3ed24d0..29ef738da 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.general; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java index a6ced9335..cf072fc0e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java index 138676ad4..31f9393de 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.RdfMetadataMigration; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataMigration; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.Model; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java index 3d00d6841..d549091a2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java index a829d3519..1a8240c84 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java index 56720dce5..3c7dfa6a3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java index 8e34c5bf6..cbab683a9 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java @@ -26,9 +26,9 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java index 95f26c7e7..c69886fde 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java index 3ff77db66..d52eaa6e2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java index f352aa814..c85226ab1 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java index 88442e19f..ff9436ee1 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java index e9f49f950..c40722147 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java @@ -26,9 +26,9 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java index 2316150ae..a41ef32e3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java index 707d8100b..f648cf2a3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java index 10222c60f..f13def5ff 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java index b2d8446cb..266b80b4e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java index 52dbb478e..bd387ed5d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java @@ -26,9 +26,9 @@ import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.member.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java index 825660158..44a821948 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java index f8c8528e0..865d79d6c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java index 243fb866c..65cdf0b8d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java index c6e35468c..9f330831c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java index 0d814d1d0..7337c2485 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java index 7e2f15b6f..07f4deaab 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionMapper; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java index 1669c5c0e..056cf94ad 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java index 196ddd542..acccb9854 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java index 2f86b0924..8442209da 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java @@ -23,24 +23,15 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpStatus; -import org.springframework.http.RequestEntity; -import org.springframework.http.ResponseEntity; import java.net.URI; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsEqual.equalTo; @DisplayName("GET /metadata-schemas/:schemaUuid") public class Content_GET extends WebIntegrationTest { diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java index 4531c2b5d..cfee0d9e6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java index 448ef276d..12d03a068 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java index c5d3a30c0..87d23882c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java index f263dafb5..c0eb1ac08 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java index 4f8f010da..6f8d4b3be 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java index dad5f54f5..f331c298a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java index 111e3b54a..16611bd83 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java @@ -24,10 +24,9 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java index 90a643a9f..5ba7cad4d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java index 5ead03273..b9c815a82 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java @@ -23,10 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaRemoteDTO; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.entity.schema.SemVer; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java index 43456e26e..df3b97658 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java index f6d345778..28b52c46e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java index 90c13e128..432755eec 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaUpdateDTO; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java index 50bb9a806..abff4b00c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaReleaseDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java index e8cf5838c..11f1ca604 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query.saved; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java index 87f594095..61c7d181a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java index 64702bc1e..9cd3c6ad6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java index 2a759f07b..fa931cf8e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java index 168a43410..2f6832be4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java index a0ec5184c..a9515a799 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserProfileChangeDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java index fd2a68534..6cabfda37 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java index 1ead8b905..2c9dc4233 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java index f28bdfc72..9e7f3d3bc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java index a86a6e04f..fb7521009 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserChangeDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java index c5ebca181..84d61785f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java index d1767cf30..b64344443 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java index b1a528522..aac8a6f2a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserCreateDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index 4243839c4..2db6c9cb5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.service.index.harvester; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data.RdfMetadataFixtures; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory.MetadataFactoryImpl; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactoryImpl; import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java index 2f1584827..eca360d46 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.service.metadata.generic; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java index 3fa8b3d19..c5b8f864b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.service.resource; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java index 87e5a114e..279432e4b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.service.resource; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java index b245c3c13..bbbe9cb42 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.utils; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java index 2b2b08ee7..d485d8e11 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.utils; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.data.RdfMetadataFixtures; -import org.fairdatateam.fairdatapoint.metadata.migration.development.metadata.factory.MetadataFactory; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactory; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.metadata.MetadataEnhancer; import org.eclipse.rdf4j.model.Model; From cca41b2351cfef946323ae69ac997342f89fdb48 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 20:45:49 +0200 Subject: [PATCH 09/70] move all (metadata-)schema-related classes into fairdatapoint.schema package --- .../fairdatapoint/api/validator/SemVerValidator.java | 2 +- .../fairdatapoint/metadata/GenericController.java | 2 +- .../fairdatapoint/metadata/MetadataValidator.java | 2 +- .../development/schema/MetadataSchemaMigration.java | 2 +- .../schema/data/MetadataSchemaFixtures.java | 8 ++++---- .../Migration_0009_ShapeTargetClasses.java | 2 +- .../production/Migration_0012_MetadataSchemas.java | 4 ++-- .../Migration_0015_FixMetadataVersion.java | 2 +- .../ResourceDefinitionTargetClassesCache.java | 4 ++-- .../{entity => }/schema/MetadataSchema.java | 2 +- .../schema/MetadataSchemaController.java | 5 ++--- .../{entity => }/schema/MetadataSchemaDraft.java | 2 +- .../MetadataSchemaDraftRepository.java | 3 +-- .../{service => }/schema/MetadataSchemaMapper.java | 8 ++------ .../MetadataSchemaRepository.java | 3 +-- .../schema/MetadataSchemaRetrievalUtils.java | 4 ++-- .../{service => }/schema/MetadataSchemaService.java | 10 ++-------- .../schema/MetadataSchemaShaclUtils.java | 2 +- .../{entity => }/schema/MetadataSchemaType.java | 2 +- .../schema/MetadataSchemaValidator.java | 9 +++------ .../fairdatapoint/{entity => }/schema/SemVer.java | 2 +- .../dto}/MetadataSchemaChangeDTO.java | 2 +- .../dto/schema => schema/dto}/MetadataSchemaDTO.java | 2 +- .../dto}/MetadataSchemaDraftDTO.java | 2 +- .../dto}/MetadataSchemaPreviewRequestDTO.java | 2 +- .../dto}/MetadataSchemaReleaseDTO.java | 2 +- .../dto}/MetadataSchemaRemoteDTO.java | 2 +- .../dto}/MetadataSchemaRemoteState.java | 2 +- .../dto}/MetadataSchemaUpdateDTO.java | 2 +- .../dto}/MetadataSchemaVersionDTO.java | 4 ++-- .../service/profile/ProfileService.java | 4 ++-- .../fairdatapoint/service/reset/FactoryDefaults.java | 8 ++++---- .../fairdatapoint/service/reset/ResetService.java | 1 + .../fairdatapoint/acceptance/schema/Common.java | 12 ++++++------ .../acceptance/schema/Detail_DELETE.java | 4 ++-- .../fairdatapoint/acceptance/schema/Detail_GET.java | 4 ++-- .../acceptance/schema/Draft_DELETE.java | 4 ++-- .../fairdatapoint/acceptance/schema/Draft_GET.java | 6 +++--- .../fairdatapoint/acceptance/schema/Draft_PUT.java | 12 ++++++------ .../fairdatapoint/acceptance/schema/Import_POST.java | 4 ++-- .../fairdatapoint/acceptance/schema/List_GET.java | 6 +++--- .../fairdatapoint/acceptance/schema/List_POST.java | 6 +++--- .../fairdatapoint/acceptance/schema/Public_GET.java | 8 ++++---- .../acceptance/schema/Version_DELETE.java | 4 ++-- .../fairdatapoint/acceptance/schema/Version_GET.java | 6 +++--- .../fairdatapoint/acceptance/schema/Version_PUT.java | 8 ++++---- .../acceptance/schema/Versions_POST.java | 12 ++++++------ .../fairdatapoint/entity/schema/SemVerTest.java | 1 + 48 files changed, 98 insertions(+), 112 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/schema/MetadataSchema.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/schema/MetadataSchemaController.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/schema/MetadataSchemaDraft.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => schema}/MetadataSchemaDraftRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/schema/MetadataSchemaMapper.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => schema}/MetadataSchemaRepository.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/schema/MetadataSchemaRetrievalUtils.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/schema/MetadataSchemaService.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/schema/MetadataSchemaShaclUtils.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/schema/MetadataSchemaType.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/schema/MetadataSchemaValidator.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/schema/SemVer.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaChangeDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaDTO.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaDraftDTO.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaPreviewRequestDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaReleaseDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaRemoteDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaRemoteState.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaUpdateDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/schema => schema/dto}/MetadataSchemaVersionDTO.java (95%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java index da23fe7bf..02cf36a94 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java @@ -24,7 +24,7 @@ import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.schema.SemVer; public class SemVerValidator implements ConstraintValidator { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java index 758bc7b58..dcdfdd9e9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaService; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java index 600596d39..b69407d0b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.rdf.ShaclValidator; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.RDF; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java index 694cef183..ffe8865c0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java index 0037e4ebd..559b81195 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data; import lombok.SneakyThrows; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaType; +import org.fairdatateam.fairdatapoint.schema.SemVer; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java index a8641c7aa..8246a0793 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java @@ -31,7 +31,7 @@ import org.fairdatateam.fairdatapoint.Profiles; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaShaclUtils; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java index 4d399b49c..e852744e0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java @@ -29,10 +29,10 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.schema.SemVer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaShaclUtils; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java index 6a41cffb6..acd434835 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java @@ -29,7 +29,7 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.schema.SemVer; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java index 17a9f0a4f..ae30def4f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.resource; import jakarta.annotation.PostConstruct; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchema.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchema.java index 2a9e41004..93e9089f4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchema.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.schema; +package org.fairdatateam.fairdatapoint.schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaController.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaController.java index 8a0a73a79..ab48edc5d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaController.java @@ -20,15 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.schema; +package org.fairdatateam.fairdatapoint.schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.schema.*; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; +import org.fairdatateam.fairdatapoint.schema.dto.*; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaDraft.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraft.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaDraft.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraft.java index 258f29807..b7e757f09 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaDraft.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraft.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.schema; +package org.fairdatateam.fairdatapoint.schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraftRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraftRepository.java index ae51b45f8..50a12be68 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraftRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.schema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaMapper.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaMapper.java index 2f1b61de6..6897230e2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaMapper.java @@ -20,13 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.schema; +package org.fairdatateam.fairdatapoint.schema; -import org.fairdatateam.fairdatapoint.api.dto.schema.*; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.schema.dto.*; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRepository.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRepository.java index 4e2b5c96b..aafeb9629 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.schema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRetrievalUtils.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRetrievalUtils.java index 2122e0d04..6bab38b24 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRetrievalUtils.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.schema; +package org.fairdatateam.fairdatapoint.schema; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.entity.exception.MetadataSchemaImportException; import org.springframework.http.HttpHeaders; import tools.jackson.core.JacksonException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaService.java index 1c027960a..9141a44aa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaService.java @@ -20,20 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.schema; +package org.fairdatateam.fairdatapoint.schema; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.schema.*; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.schema.dto.*; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaShaclUtils.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaShaclUtils.java index a356421f5..d7a98b4be 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaShaclUtils.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.schema; +package org.fairdatateam.fairdatapoint.schema; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaType.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaType.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaType.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaType.java index 313a1d9ee..c8ba77b3e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaType.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaType.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.schema; +package org.fairdatateam.fairdatapoint.schema; public enum MetadataSchemaType { INTERNAL, CUSTOM, REFERENCE diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaValidator.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaValidator.java index eda75d20e..5bb67d4c1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaValidator.java @@ -20,16 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.schema; +package org.fairdatateam.fairdatapoint.schema; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/SemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/SemVer.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/schema/SemVer.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/SemVer.java index 5f91fa7d1..a853a4bbe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/SemVer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/SemVer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.schema; +package org.fairdatateam.fairdatapoint.schema; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaChangeDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaChangeDTO.java index 92b2c25d0..dbdc54159 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaChangeDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDTO.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDTO.java index c924ea052..8b6ee46b3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDraftDTO.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDraftDTO.java index ed2f28bc7..732cd1a3f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDraftDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaPreviewRequestDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaPreviewRequestDTO.java index 05bc416d3..28ce745e4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaPreviewRequestDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaReleaseDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaReleaseDTO.java index dc2e543f1..70ee343ce 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaReleaseDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteDTO.java index 2079e6e80..865770e49 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteState.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteState.java index c0cb00f2c..a2c13bc17 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteState.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; public enum MetadataSchemaRemoteState { DIRTY, CONFLICT, ALREADY_IMPORTED, NOT_IMPORTED diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaUpdateDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaUpdateDTO.java index 13afcc5e3..c252af50d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaUpdateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaVersionDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaVersionDTO.java index e734102de..a09a9f134 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaVersionDTO.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.schema; +package org.fairdatateam.fairdatapoint.schema.dto; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaType; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java index a0f20ddf2..948e96fcc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.service.profile; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java index a7a14c139..c50de2e8a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java @@ -26,13 +26,13 @@ import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; import org.fairdatateam.fairdatapoint.metadata.Metadata; import org.fairdatateam.fairdatapoint.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaType; +import org.fairdatateam.fairdatapoint.schema.SemVer; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaShaclUtils; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.vocabulary.DATACITE; import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java index c6f19ab0c..de7ad1676 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java @@ -33,6 +33,7 @@ import org.fairdatateam.fairdatapoint.metadata.GenericMetadataService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.bson.Document; import org.eclipse.rdf4j.model.IRI; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java index 794bc3e5b..f28a532b0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java @@ -22,12 +22,12 @@ */ package org.fairdatateam.fairdatapoint.acceptance.schema; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java index cfee0d9e6..21e828860 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java index 12d03a068..9ef50f49a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java index 87d23882c..df554470d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java index c0eb1ac08..960ef48d6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java index 6f8d4b3be..510e9af64 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java index f331c298a..2fa317e50 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java index 16611bd83..3fef7672d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java index 5ba7cad4d..df82ebd9d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java index b9c815a82..206dad620 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.SemVer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java index df3b97658..1a8481cba 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java index 28b52c46e..6b9d441cc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java index 432755eec..92bd5a4c0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaUpdateDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaUpdateDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java index abff4b00c..1ca67df69 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaReleaseDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaReleaseDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java index 4e25684f0..c2767d0df 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java @@ -22,6 +22,7 @@ */ package org.fairdatateam.fairdatapoint.entity.schema; +import org.fairdatateam.fairdatapoint.schema.SemVer; import org.junit.jupiter.api.Test; import java.util.Arrays; From 50c19fa6f0405d6234a9a312ed82ff8d84edba34 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 20:51:42 +0200 Subject: [PATCH 10/70] move metadata and schema packages into new fairdatapoint.rdf package --- .../dashboard/DashboardController.java | 2 +- .../exception/ExceptionControllerAdvice.java | 2 +- .../api/dto/dashboard/DashboardItemDTO.java | 2 +- .../api/validator/SemVerValidator.java | 2 +- .../fairdatapoint/index/HarvesterService.java | 6 +++--- .../index/IndexAdminController.java | 2 +- .../index/IndexEntryController.java | 2 +- .../fairdatapoint/index/IndexPingController.java | 2 +- .../index/entry/IndexEntryService.java | 4 ++-- .../mongodb/development/acl/AclMigration.java | 2 +- .../development/metadata/MetadataMigration.java | 2 +- .../metadata/data/MetadataFixtures.java | 4 ++-- .../schema/MetadataSchemaMigration.java | 2 +- .../schema/data/MetadataSchemaFixtures.java | 8 ++++---- .../Migration_0002_CustomMetamodel.java | 2 +- .../Migration_0009_ShapeTargetClasses.java | 2 +- .../Migration_0012_MetadataSchemas.java | 4 ++-- .../Migration_0015_FixMetadataVersion.java | 2 +- .../development/MetadataFactoryImpl.java | 4 ++-- .../development/RdfMetadataMigration.java | 16 ++++++++-------- .../Rdf_Migration_0002_Metadata_Draft.java | 6 +++--- .../Rdf_Migration_0004_Cleanup_Index.java | 4 ++-- .../fairdatapoint/openapi/OpenApiGenerator.java | 4 ++-- .../metadata/AbstractMetadataRdfRepository.java | 2 +- .../metadata/AbstractMetadataService.java | 6 +++--- .../{ => rdf}/metadata/AccessRights.java | 2 +- .../fairdatapoint/{ => rdf}/metadata/Agent.java | 2 +- .../{ => rdf}/metadata/Authorization.java | 2 +- .../metadata/CatalogMetadataRdfRepository.java | 2 +- .../metadata/CatalogMetadataService.java | 4 ++-- .../{ => rdf}/metadata/GenericController.java | 4 ++-- .../metadata/GenericMemberController.java | 4 ++-- .../metadata/GenericMetaController.java | 14 +++++++------- .../metadata/GenericMetadataRdfRepository.java | 4 ++-- .../metadata/GenericMetadataService.java | 4 ++-- .../{ => rdf}/metadata/Identifier.java | 2 +- .../{ => rdf}/metadata/Metadata.java | 2 +- .../{ => rdf}/metadata/MetadataConfig.java | 2 +- .../{ => rdf}/metadata/MetadataEnhancer.java | 6 +++--- .../{ => rdf}/metadata/MetadataGetter.java | 2 +- .../metadata/MetadataRdfRepository.java | 2 +- .../metadata/MetadataRdfRepositoryException.java | 2 +- .../{ => rdf}/metadata/MetadataRepository.java | 2 +- .../{ => rdf}/metadata/MetadataService.java | 2 +- .../metadata/MetadataServiceException.java | 2 +- .../metadata/MetadataServiceFactory.java | 2 +- .../{ => rdf}/metadata/MetadataSetter.java | 2 +- .../{ => rdf}/metadata/MetadataState.java | 2 +- .../{ => rdf}/metadata/MetadataStateService.java | 6 +++--- .../metadata/MetadataStateValidator.java | 4 ++-- .../{ => rdf}/metadata/MetadataValidator.java | 6 +++--- .../fairdatapoint/{ => rdf}/metadata/Metric.java | 2 +- .../metadata/MetricsMetadataService.java | 2 +- .../{ => rdf}/metadata/dto/MetaDTO.java | 2 +- .../{ => rdf}/metadata/dto/MetaPathDTO.java | 2 +- .../metadata/dto/MetaStateChangeDTO.java | 4 ++-- .../{ => rdf}/metadata/dto/MetaStateDTO.java | 4 ++-- .../{ => rdf}/schema/MetadataSchema.java | 2 +- .../schema/MetadataSchemaController.java | 3 ++- .../{ => rdf}/schema/MetadataSchemaDraft.java | 2 +- .../schema/MetadataSchemaDraftRepository.java | 2 +- .../{ => rdf}/schema/MetadataSchemaMapper.java | 3 ++- .../schema/MetadataSchemaRepository.java | 2 +- .../schema/MetadataSchemaRetrievalUtils.java | 4 ++-- .../{ => rdf}/schema/MetadataSchemaService.java | 3 ++- .../schema/MetadataSchemaShaclUtils.java | 2 +- .../{ => rdf}/schema/MetadataSchemaType.java | 2 +- .../schema/MetadataSchemaValidator.java | 6 +++--- .../fairdatapoint/{ => rdf}/schema/SemVer.java | 2 +- .../schema/dto/MetadataSchemaChangeDTO.java | 2 +- .../{ => rdf}/schema/dto/MetadataSchemaDTO.java | 2 +- .../schema/dto/MetadataSchemaDraftDTO.java | 2 +- .../dto/MetadataSchemaPreviewRequestDTO.java | 2 +- .../schema/dto/MetadataSchemaReleaseDTO.java | 2 +- .../schema/dto/MetadataSchemaRemoteDTO.java | 2 +- .../schema/dto/MetadataSchemaRemoteState.java | 2 +- .../schema/dto/MetadataSchemaUpdateDTO.java | 2 +- .../schema/dto/MetadataSchemaVersionDTO.java | 4 ++-- .../ResourceDefinitionTargetClassesCache.java | 4 ++-- .../fairdatapoint/search/SearchController.java | 2 +- .../search/SearchSavedQueryController.java | 2 +- .../fairdatapoint/search/SearchService.java | 8 ++++---- .../service/dashboard/DashboardService.java | 10 +++++----- .../service/profile/ProfileService.java | 4 ++-- .../service/reset/FactoryDefaults.java | 12 ++++++------ .../service/reset/ResetService.java | 8 ++++---- .../fairdatapoint/util/RdfIOUtil.java | 2 +- .../acceptance/dashboard/List_GET.java | 2 +- .../acceptance/metadata/Common.java | 6 +++--- .../acceptance/metadata/catalog/Detail_PUT.java | 4 ++-- .../metadata/catalog/meta/List_GET.java | 4 ++-- .../metadata/catalog/meta/List_State_PUT.java | 8 ++++---- .../acceptance/metadata/dataset/Detail_PUT.java | 4 ++-- .../metadata/dataset/meta/List_GET.java | 4 ++-- .../metadata/dataset/meta/List_State_PUT.java | 8 ++++---- .../metadata/distribution/Detail_PUT.java | 4 ++-- .../metadata/distribution/meta/List_GET.java | 4 ++-- .../distribution/meta/List_State_PUT.java | 8 ++++---- .../metadata/repository/Detail_PUT.java | 4 ++-- .../metadata/repository/meta/List_GET.java | 4 ++-- .../metadata/repository/meta/List_State_PUT.java | 8 ++++---- .../fairdatapoint/acceptance/schema/Common.java | 12 ++++++------ .../acceptance/schema/Detail_DELETE.java | 4 ++-- .../acceptance/schema/Detail_GET.java | 4 ++-- .../acceptance/schema/Draft_DELETE.java | 4 ++-- .../acceptance/schema/Draft_GET.java | 6 +++--- .../acceptance/schema/Draft_PUT.java | 12 ++++++------ .../acceptance/schema/Import_POST.java | 4 ++-- .../acceptance/schema/List_GET.java | 6 +++--- .../acceptance/schema/List_POST.java | 6 +++--- .../acceptance/schema/Public_GET.java | 8 ++++---- .../acceptance/schema/Version_DELETE.java | 4 ++-- .../acceptance/schema/Version_GET.java | 6 +++--- .../acceptance/schema/Version_PUT.java | 8 ++++---- .../acceptance/schema/Versions_POST.java | 12 ++++++------ .../CatalogMetadataRepositoryTest.java | 4 ++-- .../GenericMetadataRepositoryTest.java | 10 +++++----- .../rdf/repository/MetadataRepositoryTest.java | 6 +++--- .../fairdatapoint/entity/schema/SemVerTest.java | 2 +- .../index/harvester/HarvesterServiceTest.java | 8 ++++---- .../catalog/CatalogMetadataServiceMockTest.java | 10 +++++----- .../generic/GenericMetadataServiceTest.java | 6 +++--- .../metric/MetricsMetadataServiceTest.java | 4 ++-- .../service/search/SearchServiceTest.java | 4 ++-- .../utils/TestRdfMetadataFixtures.java | 4 ++-- 125 files changed, 266 insertions(+), 263 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/AbstractMetadataRdfRepository.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/AbstractMetadataService.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/AccessRights.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/Agent.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/Authorization.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/CatalogMetadataRdfRepository.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/CatalogMetadataService.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/GenericController.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/GenericMemberController.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/GenericMetaController.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/GenericMetadataRdfRepository.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/GenericMetadataService.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/Identifier.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/Metadata.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataConfig.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataEnhancer.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataGetter.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataRdfRepository.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataRdfRepositoryException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataRepository.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataService.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataServiceException.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataServiceFactory.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataSetter.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataState.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataStateService.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataStateValidator.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetadataValidator.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/Metric.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/MetricsMetadataService.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/dto/MetaDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/dto/MetaPathDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/dto/MetaStateChangeDTO.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/metadata/dto/MetaStateDTO.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchema.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaController.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaDraft.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaDraftRepository.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaMapper.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaRepository.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaRetrievalUtils.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaService.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaShaclUtils.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaType.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/MetadataSchemaValidator.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/SemVer.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaChangeDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaDTO.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaDraftDTO.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaPreviewRequestDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaReleaseDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaRemoteDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaRemoteState.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaUpdateDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/schema/dto/MetadataSchemaVersionDTO.java (95%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java index e6fd3e49b..c16e8ece6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java @@ -26,7 +26,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.service.dashboard.DashboardService; -import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java index 4bc06cf13..37fa859c9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java @@ -35,7 +35,7 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.entity.exception.*; import org.fairdatateam.fairdatapoint.index.exception.AbstractIndexException; -import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.query.MalformedQueryException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java index da93c6e15..4410c0353 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java @@ -27,7 +27,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java index 02cf36a94..cd2f176cb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java @@ -24,7 +24,7 @@ import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.fairdatateam.fairdatapoint.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; public class SemVerValidator implements ConstraintValidator { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java index 7b0b6b9d3..53d5865be 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.index; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; @@ -43,7 +43,7 @@ import java.util.*; import static java.util.Optional.ofNullable; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getChildren; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getChildren; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRdfContentType; import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read; import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.readFile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java index a45d4decd..0d6b6084c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java @@ -28,7 +28,7 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.service.UtilityService; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java index 8d5eb091d..3d5657c55 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java @@ -29,7 +29,7 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryUpdateDTO; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java index 9feafe1ee..29c921220 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java @@ -32,7 +32,7 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.service.UtilityService; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index 269fc2059..323f1a612 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -25,8 +25,8 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java index 7e991e42a..1154d1508 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java index cee12a337..7abefbf85 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java index 018653fc1..88300fc38 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data; -import org.fairdatateam.fairdatapoint.metadata.Metadata; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java index ffe8865c0..20f828af4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java index 559b81195..8e6e7c1bd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data; import lombok.SneakyThrows; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; +import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java index 53a597991..9b7881ae5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java @@ -53,7 +53,7 @@ public void run(MongoDatabase database) { private void updateAcl(MongoDatabase database) { final MongoCollection aclCol = database.getCollection("ACL"); aclCol.updateMany( - new Document(), combine(set("className", "org.fairdatateam.fairdatapoint.metadata.Metadata")) + new Document(), combine(set("className", "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata")) ); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java index 8246a0793..82d38a92f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java @@ -31,7 +31,7 @@ import org.fairdatateam.fairdatapoint.Profiles; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaShaclUtils; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaShaclUtils; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java index e852744e0..00338417e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java @@ -29,10 +29,10 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaShaclUtils; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaShaclUtils; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java index acd434835..867a22a21 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java @@ -29,7 +29,7 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java index 591358cd4..b75b30d33 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.migration.triplestore.development; -import org.fairdatateam.fairdatapoint.metadata.Agent; +import org.fairdatateam.fairdatapoint.rdf.metadata.Agent; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -33,7 +33,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java index 442c05b3b..8f9f04490 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java @@ -22,17 +22,17 @@ */ package org.fairdatateam.fairdatapoint.migration.triplestore.development; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.metadata.MetadataService; -import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; -import org.fairdatateam.fairdatapoint.metadata.MetadataStateService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataStateService; import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -42,7 +42,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java index 22497e9c2..ca06aed2b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; -import org.fairdatateam.fairdatapoint.metadata.Metadata; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.eclipse.rdf4j.model.Resource; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index cc6442c9f..726d61ce6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java @@ -25,8 +25,8 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java index 2dd9ea8d3..f29197e00 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java @@ -37,8 +37,8 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.springframework.http.HttpStatus; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataRdfRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java index a31db382d..d47fc590b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.extern.slf4j.Slf4j; import org.eclipse.rdf4j.common.iteration.Iterations; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index c789f782c..fe975670b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; @@ -44,8 +44,8 @@ import java.util.stream.Collectors; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getChildren; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getChildren; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; import static org.fairdatateam.fairdatapoint.util.ThrowingFunction.suppress; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/AccessRights.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AccessRights.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/AccessRights.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AccessRights.java index 0a2e7bc28..baa2a6635 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/AccessRights.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AccessRights.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Agent.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Agent.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/Agent.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Agent.java index 52b11af96..72f580130 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Agent.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Agent.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Authorization.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Authorization.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/Authorization.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Authorization.java index 9db181f57..b77672131 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Authorization.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Authorization.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataRdfRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java index bc636ec61..7a1ea2e7d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import jakarta.annotation.PostConstruct; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataService.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataService.java index 1d0978a43..e03ec6ad7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/CatalogMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; @@ -32,7 +32,7 @@ import javax.annotation.Nonnull; import java.util.List; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.setThemeTaxonomies; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.setThemeTaxonomies; @Service("catalogMetadataService") @Slf4j diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java index dcdfdd9e9..593d395d8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaService; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaService; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMemberController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMemberController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java index d33f31b0b..0066cca4c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMemberController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -40,7 +40,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getMetadataIdentifier; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getMetadataIdentifier; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; @Tag(name = "Authentication and Authorization") diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetaController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java index b9e2eff03..f54209d65 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java @@ -20,16 +20,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaPathDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaPathDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; @@ -44,8 +44,8 @@ import java.util.Map; import java.util.Optional; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getMetadataIdentifier; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getMetadataIdentifier; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataRdfRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java index 29695eaf7..e28d9617f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.eclipse.rdf4j.model.*; import org.eclipse.rdf4j.model.impl.LinkedHashModel; @@ -31,7 +31,7 @@ import java.util.List; import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; @Service public class GenericMetadataRdfRepository extends AbstractMetadataRdfRepository { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java index 090d81923..9416ba795 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/GenericMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; @@ -33,7 +33,7 @@ import java.util.Optional; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; @Service("genericMetadataService") public class GenericMetadataService extends AbstractMetadataService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Identifier.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Identifier.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/Identifier.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Identifier.java index fff02483b..daddd6379 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Identifier.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Identifier.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metadata.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Metadata.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/Metadata.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Metadata.java index 3eec36c62..817bf56fc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metadata.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Metadata.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.*; import org.bson.types.ObjectId; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java index 82fc9bfa6..dd0ceef9f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataEnhancer.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java index 725dfe40f..c29a527e9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; @@ -44,8 +44,8 @@ import java.util.stream.Collectors; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.*; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.RdfUtil.containsObject; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataGetter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataGetter.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java index 77bbfea65..ae9d5639a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataGetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java index 6cfdede26..545315d75 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.eclipse.rdf4j.model.*; import org.eclipse.rdf4j.query.BindingSet; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepositoryException.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepositoryException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepositoryException.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepositoryException.java index 6e28b14cb..1f1fad10c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRdfRepositoryException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepositoryException.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; public class MetadataRdfRepositoryException extends Exception { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRepository.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRepository.java index 2ff50a69d..dd475146b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java index 6523405f7..856f56440 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceException.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataServiceException.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceException.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataServiceException.java index 3c126130c..9ea86653c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataServiceException.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; /** * @author Rajaram Kaliyaperumal diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceFactory.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataServiceFactory.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceFactory.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataServiceFactory.java index 55c972ce2..7a1f585fe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataServiceFactory.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataServiceFactory.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataSetter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataSetter.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java index 94946a5ba..f5c1c863d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataSetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; import org.fairdatateam.fairdatapoint.vocabulary.FDP; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataState.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataState.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataState.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataState.java index 87713b7f5..fe836942e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataState.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataState.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; public enum MetadataState { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java index 410bc0739..7c9f7c1a8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java index 106b0892d..87794e403 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataStateValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java index b69407d0b..4cae48cd9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.service.rdf.ShaclValidator; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaService; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.RDF; @@ -35,7 +35,7 @@ import org.springframework.stereotype.Service; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metric.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Metric.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/Metric.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Metric.java index 6591452ad..9cc27b19b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/Metric.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/Metric.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetricsMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/MetricsMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java index 2003d9dcc..af0408c68 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/MetricsMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.settings.Settings; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java index 9ed929ada..bf53f0f66 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.dto; +package org.fairdatateam.fairdatapoint.rdf.metadata.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaPathDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaPathDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaPathDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaPathDTO.java index adba70f2c..e8b48f9aa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaPathDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaPathDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.dto; +package org.fairdatateam.fairdatapoint.rdf.metadata.dto; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaStateChangeDTO.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaStateChangeDTO.java index ca8e9fd17..90a777905 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaStateChangeDTO.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.dto; +package org.fairdatateam.fairdatapoint.rdf.metadata.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaStateDTO.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaStateDTO.java index 1bb5bd26f..0a1a12e93 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/metadata/dto/MetaStateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaStateDTO.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.metadata.dto; +package org.fairdatateam.fairdatapoint.rdf.metadata.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import java.util.Map; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchema.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchema.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java index 93e9089f4..e5aa6856a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchema.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java index ab48edc5d..c1d7530c5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java @@ -20,13 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.schema.dto.*; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraft.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaDraft.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraft.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaDraft.java index b7e757f09..8dd4a3c44 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraft.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaDraft.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraftRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaDraftRepository.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraftRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaDraftRepository.java index 50a12be68..976af5605 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaDraftRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaDraftRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java index 6897230e2..188119cac 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java @@ -20,8 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.schema.dto.*; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRepository.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRepository.java index aafeb9629..94436ac2a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRepository.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRetrievalUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRetrievalUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java index 6bab38b24..d18b36a99 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaRetrievalUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.entity.exception.MetadataSchemaImportException; import org.springframework.http.HttpHeaders; import tools.jackson.core.JacksonException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index 9141a44aa..d9aa03525 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java @@ -20,12 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.schema.dto.*; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaShaclUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaShaclUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java index d7a98b4be..0a9438baa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaShaclUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaType.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaType.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaType.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaType.java index c8ba77b3e..be0a7d4df 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaType.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaType.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; public enum MetadataSchemaType { INTERNAL, CUSTOM, REFERENCE diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java index 5bb67d4c1..54e0f81ca 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/MetadataSchemaValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java @@ -20,10 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/SemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVer.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/SemVer.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVer.java index a853a4bbe..3a1aea07c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/SemVer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaChangeDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaChangeDTO.java index dbdc54159..d661b25ca 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaChangeDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaChangeDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDTO.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDTO.java index 8b6ee46b3..571ccf590 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDraftDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDraftDTO.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDraftDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDraftDTO.java index 732cd1a3f..a57fa7227 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaDraftDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDraftDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaPreviewRequestDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaPreviewRequestDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaPreviewRequestDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaPreviewRequestDTO.java index 28ce745e4..17d3b9bf0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaPreviewRequestDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaPreviewRequestDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaReleaseDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaReleaseDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java index 70ee343ce..414319ebc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaReleaseDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteDTO.java index 865770e49..f070082e9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteState.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteState.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteState.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteState.java index a2c13bc17..f18decbba 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaRemoteState.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteState.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; public enum MetadataSchemaRemoteState { DIRTY, CONFLICT, ALREADY_IMPORTED, NOT_IMPORTED diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaUpdateDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaUpdateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaUpdateDTO.java index c252af50d..8e3052286 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaUpdateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaUpdateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaVersionDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaVersionDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaVersionDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaVersionDTO.java index a09a9f134..94847b2e4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/schema/dto/MetadataSchemaVersionDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaVersionDTO.java @@ -20,13 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.schema.dto; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaType; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java index ae30def4f..e4427303b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.resource; import jakarta.annotation.PostConstruct; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java index e6c6babd7..b4987a302 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java @@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.search.dto.*; import org.eclipse.rdf4j.query.MalformedQueryException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java index 4067c37dd..2bf588a0c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchResultDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index a925eabeb..73c2807d9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -22,13 +22,13 @@ */ package org.fairdatateam.fairdatapoint.search; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilter; import org.fairdatateam.fairdatapoint.search.dto.*; -import org.fairdatateam.fairdatapoint.metadata.MetadataStateService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataStateService; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.apache.commons.lang.text.StrSubstitutor; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java index 7c549396c..46eed1a26 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java @@ -25,13 +25,13 @@ import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.metadata.MetadataService; -import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; -import org.fairdatateam.fairdatapoint.metadata.MetadataStateService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataStateService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; @@ -45,7 +45,7 @@ import java.util.List; import java.util.Optional; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java index 948e96fcc..20337e993 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.service.profile; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java index c50de2e8a..ba0469379 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java @@ -24,15 +24,15 @@ import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; -import org.fairdatateam.fairdatapoint.metadata.Metadata; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; +import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaShaclUtils; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaShaclUtils; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.vocabulary.DATACITE; import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java index de7ad1676..7bc1ba555 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java @@ -26,14 +26,14 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.api.dto.reset.ResetDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.*; -import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.metadata.MetadataServiceException; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.bson.Document; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java index d7ea5291b..283855b7a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Objects; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.setRdfTypes; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.setRdfTypes; import static org.fairdatateam.fairdatapoint.util.RdfUtil.getSubjectBy; import static org.fairdatateam.fairdatapoint.util.ResourceReader.getResource; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java index 6ea68f5a2..d1ef18734 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.service.member.MemberService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java index f1f2d298c..81e05c7d1 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java @@ -24,9 +24,9 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java index 0982ec8a2..bf1e712c2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java @@ -43,8 +43,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java index cbab683a9..ccdcab8c3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java index c69886fde..ecfbee372 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; -import org.fairdatateam.fairdatapoint.metadata.Metadata; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java index ffd1212e9..0fa1d081f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java @@ -43,8 +43,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java index c40722147..f6c9f602f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java index a41ef32e3..db9075589 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; -import org.fairdatateam.fairdatapoint.metadata.Metadata; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java index 0ea12647f..ec072928a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java @@ -42,8 +42,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java index bd387ed5d..a142cfc6e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java index 44a821948..ce874f048 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; -import org.fairdatateam.fairdatapoint.metadata.Metadata; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java index d50f0e9f9..90ae8c7d6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java @@ -40,8 +40,8 @@ import java.net.URI; import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java index 865d79d6c..8781e4c4b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.repository.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaDTO; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java index 65cdf0b8d..2b9d32f9a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.repository.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.metadata.MetadataRepository; -import org.fairdatateam.fairdatapoint.metadata.Metadata; -import org.fairdatateam.fairdatapoint.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java index f28a532b0..f7952aad2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java @@ -22,12 +22,12 @@ */ package org.fairdatateam.fairdatapoint.acceptance.schema; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java index 21e828860..2077cc7ee 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java index 9ef50f49a..2786ab8ee 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java index df554470d..3496d5240 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java index 960ef48d6..a18477d79 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java index 510e9af64..f9935d5c4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java index 2fa317e50..60eabeac8 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java index 3fef7672d..1dc680cb6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java index df82ebd9d..1f2fd29f9 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaChangeDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDraftDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java index 206dad620..872d91b5a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java index 1a8481cba..9b4a90f21 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java index 6b9d441cc..ad63b5a59 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java index 92bd5a4c0..0e7361833 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java @@ -23,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaUpdateDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaVersionDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaUpdateDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java index 1ca67df69..8be3d46cf 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.schema.dto.MetadataSchemaReleaseDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaReleaseDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java index ad250afbd..93a446315 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java @@ -27,8 +27,8 @@ import org.eclipse.rdf4j.query.TupleQueryResult; import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.RepositoryConnection; -import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java index f7079da11..e2da02e3d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.database.rdf.repository; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -39,8 +39,8 @@ import java.util.ArrayList; import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getLanguage; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getLanguage; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java index 445f4ce7e..12fce75db 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java @@ -29,8 +29,8 @@ import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java index c2767d0df..d8f3ce590 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.entity.schema; -import org.fairdatateam.fairdatapoint.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index 2db6c9cb5..b1b3c2d5f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -25,11 +25,11 @@ import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactoryImpl; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.index.HarvesterService; -import org.fairdatateam.fairdatapoint.metadata.MetadataEnhancer; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataEnhancer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.vocabulary.FDP; import org.eclipse.rdf4j.model.Model; @@ -47,7 +47,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.write; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.mockito.ArgumentMatchers.any; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java index ef16da5ad..c75369670 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java @@ -23,9 +23,9 @@ package org.fairdatateam.fairdatapoint.service.metadata.catalog; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.metadata.CatalogMetadataService; -import org.fairdatateam.fairdatapoint.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataService; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -42,8 +42,8 @@ import java.util.ArrayList; import java.util.List; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getThemeTaxonomies; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getThemeTaxonomies; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java index eca360d46..0f9df6685 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.metadata.MetadataService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; import org.fairdatateam.fairdatapoint.utils.AuthHelper; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; @@ -40,8 +40,8 @@ import java.time.OffsetDateTime; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.*; -import static org.fairdatateam.fairdatapoint.metadata.MetadataSetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java index a45afbaa4..153fd966e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java @@ -28,9 +28,9 @@ package org.fairdatateam.fairdatapoint.service.metadata.metric; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.Metric; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metric; import org.eclipse.rdf4j.model.IRI; -import org.fairdatateam.fairdatapoint.metadata.MetricsMetadataService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetricsMetadataService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java index a0df54a00..a96c5438a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java @@ -25,7 +25,7 @@ import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.search.SearchFilterValue; import org.fairdatateam.fairdatapoint.search.SearchResult; import org.fairdatateam.fairdatapoint.search.SearchService; @@ -35,7 +35,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java index d485d8e11..64ecc0d34 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java @@ -26,13 +26,13 @@ import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactory; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.metadata.MetadataEnhancer; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataEnhancer; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import static org.fairdatateam.fairdatapoint.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; @Service public class TestRdfMetadataFixtures extends RdfMetadataFixtures { From b2205c0382e4839c61bd33f5ee586ef1d769a3eb Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 21:06:12 +0200 Subject: [PATCH 11/70] move all rdf-related classes into fairdatapoint.rdf package and rename RepositoryProperties classes to RdfRepositoryProperties for clarity --- .../dashboard/DashboardController.java | 2 +- .../exception/ExceptionControllerAdvice.java | 2 +- .../fairdatapoint/config/ConverterConfig.java | 2 +- .../fairdatapoint/config/WebMvcConfig.java | 2 +- .../fairdatapoint/index/HarvesterService.java | 8 +-- .../index/event/MetadataRetrievalUtils.java | 9 +-- .../data/ResourceDefinitionFixtures.java | 2 +- .../production/Migration_0011_ComplyFDPO.java | 2 +- .../production/Rdf_Migration_0003_FDPO.java | 4 +- ...Rdf_Migration_0005_FixMetadataVersion.java | 2 +- .../{api/converter => rdf}/RdfConverter.java | 3 +- .../{util => rdf}/RdfIOUtil.java | 8 ++- .../RdfRepositoryBasicProperties.java} | 4 +- .../RdfRepositoryConfig.java} | 59 +++++++++---------- .../RdfRepositoryNativeProperties.java} | 4 +- .../RdfRepositoryProperties.java} | 16 ++--- .../fairdatapoint/{util => rdf}/RdfUtil.java | 2 +- .../{service => }/rdf/ShaclValidator.java | 2 +- .../rdf/metadata/AbstractMetadataService.java | 2 +- .../rdf/metadata/GenericController.java | 6 +- .../rdf/metadata/GenericMetaController.java | 2 +- .../rdf/metadata/MetadataEnhancer.java | 8 +-- .../rdf/metadata/MetadataGetter.java | 4 +- .../rdf/metadata/MetadataSetter.java | 8 +-- .../rdf/metadata/MetadataStateService.java | 2 +- .../rdf/metadata/MetadataValidator.java | 2 +- .../rdf/schema/MetadataSchemaService.java | 2 +- .../rdf/schema/MetadataSchemaShaclUtils.java | 2 +- .../rdf/schema/MetadataSchemaValidator.java | 2 +- .../{ => rdf}/vocabulary/DATACITE.java | 2 +- .../{ => rdf}/vocabulary/DCAT3.java | 2 +- .../{ => rdf}/vocabulary/FDP.java | 2 +- .../{ => rdf}/vocabulary/R3D.java | 2 +- .../{ => rdf}/vocabulary/SIO.java | 2 +- .../service/dashboard/DashboardService.java | 2 +- .../RdfEntitiesNamespaceRetriever.java | 2 +- .../service/reset/FactoryDefaults.java | 8 +-- .../settings/SettingsMapper.java | 16 ++--- .../acceptance/general/SecurityTest.java | 2 +- .../metadata/catalog/Detail_PUT.java | 2 +- .../metadata/catalog/List_POST.java | 2 +- .../metadata/dataset/Detail_PUT.java | 2 +- .../metadata/dataset/List_POST.java | 2 +- .../metadata/distribution/Detail_PUT.java | 2 +- .../metadata/distribution/List_POST.java | 2 +- .../metadata/repository/Detail_PUT.java | 2 +- .../index/harvester/HarvesterServiceTest.java | 4 +- 47 files changed, 114 insertions(+), 117 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/converter => rdf}/RdfConverter.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{util => rdf}/RdfIOUtil.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/properties/RepositoryBasicProperties.java => rdf/RdfRepositoryBasicProperties.java} (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/RepositoryConfig.java => rdf/RdfRepositoryConfig.java} (69%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/properties/RepositoryNativeProperties.java => rdf/RdfRepositoryNativeProperties.java} (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{config/properties/RepositoryProperties.java => rdf/RdfRepositoryProperties.java} (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{util => rdf}/RdfUtil.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/rdf/ShaclValidator.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/vocabulary/DATACITE.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/vocabulary/DCAT3.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/vocabulary/FDP.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/vocabulary/R3D.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => rdf}/vocabulary/SIO.java (97%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java index c16e8ece6..fcab5ba5e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java @@ -40,7 +40,7 @@ import java.util.List; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRequestURL; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.removeLastPartOfIRI; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.removeLastPartOfIRI; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Tag(name = "Client") diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java index 37fa859c9..4db633f0a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java @@ -57,7 +57,7 @@ import java.util.Map; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.getWriterConfig; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.getWriterConfig; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @ControllerAdvice diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java index 546a9d912..16c6444b5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java @@ -28,7 +28,7 @@ package org.fairdatateam.fairdatapoint.config; import org.fairdatateam.fairdatapoint.api.converter.ErrorConverter; -import org.fairdatateam.fairdatapoint.api.converter.RdfConverter; +import org.fairdatateam.fairdatapoint.rdf.RdfConverter; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java index 26f4f9dc0..bafb148a8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import org.fairdatateam.fairdatapoint.api.converter.ErrorConverter; -import org.fairdatateam.fairdatapoint.api.converter.RdfConverter; +import org.fairdatateam.fairdatapoint.rdf.RdfConverter; import org.jspecify.annotations.NonNull; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java index 53d5865be..8c4a9d09f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java @@ -45,10 +45,10 @@ import static java.util.Optional.ofNullable; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getChildren; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRdfContentType; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.readFile; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getSubjectsBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.read; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.readFile; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getSubjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Slf4j diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrievalUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrievalUtils.java index 7ecdedcd3..1379999bc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrievalUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/MetadataRetrievalUtils.java @@ -23,16 +23,13 @@ package org.fairdatateam.fairdatapoint.index.event; import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; -import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.index.event.EventType; -import org.fairdatateam.fairdatapoint.index.event.MetadataRetrieval; import org.fairdatateam.fairdatapoint.index.http.Exchange; import org.fairdatateam.fairdatapoint.index.http.ExchangeDirection; import org.fairdatateam.fairdatapoint.index.http.ExchangeState; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; -import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; -import org.fairdatateam.fairdatapoint.vocabulary.R3D; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.DCAT3; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.R3D; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.Statement; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java index 5894140fa..9f98ee283 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java index 56406e6ec..ff4a49ea6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.bson.Document; import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java index cd448a70b..728290d5f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; -import org.fairdatateam.fairdatapoint.vocabulary.R3D; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.R3D; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java index 3a2dba821..94428195d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.DCAT3; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.eclipse.rdf4j.model.Statement; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/converter/RdfConverter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfConverter.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/converter/RdfConverter.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfConverter.java index 5da235d2c..a30529473 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/converter/RdfConverter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfConverter.java @@ -25,9 +25,8 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.api.converter; +package org.fairdatateam.fairdatapoint.rdf; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java index 283855b7a..b4285141a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.rdf; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.eclipse.rdf4j.model.Model; @@ -35,6 +35,8 @@ import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.eclipse.rdf4j.rio.*; import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter; +import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -45,7 +47,7 @@ import java.util.Objects; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.setRdfTypes; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getSubjectBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getSubjectBy; import static org.fairdatateam.fairdatapoint.util.ResourceReader.getResource; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s; @@ -76,7 +78,7 @@ public static Model changeBaseUri(Model oldModel, String newBaseUri, List getInMemoryStore(); - case RepositoryProperties.TYPE_NATIVE -> getNativeStore(); - case RepositoryProperties.TYPE_ALLEGRO -> getAgraphRepository(); - case RepositoryProperties.TYPE_GRAPHDB -> getGraphDBRepository(); - case RepositoryProperties.TYPE_BLAZEGRAPH -> getBlazeGraphRepository(); + final Repository repository = switch (rdfRepositoryProperties.getType()) { + case RdfRepositoryProperties.TYPE_IN_MEMORY -> getInMemoryStore(); + case RdfRepositoryProperties.TYPE_NATIVE -> getNativeStore(); + case RdfRepositoryProperties.TYPE_ALLEGRO -> getAgraphRepository(); + case RdfRepositoryProperties.TYPE_GRAPHDB -> getGraphDBRepository(); + case RdfRepositoryProperties.TYPE_BLAZEGRAPH -> getBlazeGraphRepository(); default -> null; }; @@ -83,8 +82,8 @@ private Repository getInMemoryStore() { private Repository getNativeStore() { log.info("Setting up Native Store"); - if (!repositoryProperties.getNativeRepo().getDir().isEmpty()) { - final File dataDir = new File(repositoryProperties.getNativeRepo().getDir()); + if (!rdfRepositoryProperties.getNativeRepo().getDir().isEmpty()) { + final File dataDir = new File(rdfRepositoryProperties.getNativeRepo().getDir()); return new SailRepository(new NativeStore(dataDir)); } log.warn("'repository.native.dir' is empty"); @@ -93,14 +92,14 @@ private Repository getNativeStore() { private Repository getAgraphRepository() { log.info("Setting up Allegro Graph Store"); - if (!repositoryProperties.getAgraph().getUrl().isEmpty()) { + if (!rdfRepositoryProperties.getAgraph().getUrl().isEmpty()) { final SPARQLRepository repository = - new SPARQLRepository(repositoryProperties.getAgraph().getUrl()); - if (!repositoryProperties.getAgraph().getUsername().isEmpty() - && !repositoryProperties.getAgraph().getPassword().isEmpty()) { + new SPARQLRepository(rdfRepositoryProperties.getAgraph().getUrl()); + if (!rdfRepositoryProperties.getAgraph().getUsername().isEmpty() + && !rdfRepositoryProperties.getAgraph().getPassword().isEmpty()) { repository.setUsernameAndPassword( - repositoryProperties.getAgraph().getUsername(), - repositoryProperties.getAgraph().getPassword() + rdfRepositoryProperties.getAgraph().getUsername(), + rdfRepositoryProperties.getAgraph().getPassword() ); } return repository; @@ -111,15 +110,15 @@ private Repository getAgraphRepository() { private Repository getBlazeGraphRepository() { log.info("Setting up Blaze Graph Store"); - String blazegraphUrl = repositoryProperties.getBlazegraph().getUrl(); + String blazegraphUrl = rdfRepositoryProperties.getBlazegraph().getUrl(); if (!blazegraphUrl.isEmpty()) { blazegraphUrl = removeLastSlash(blazegraphUrl); // Build url for blazegraph (Eg: http://localhost:8079/bigdata/namespace/test1/sparql) final StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append(blazegraphUrl); urlBuilder.append("/namespace/"); - if (!repositoryProperties.getBlazegraph().getRepository().isEmpty()) { - urlBuilder.append(repositoryProperties.getBlazegraph().getRepository()); + if (!rdfRepositoryProperties.getBlazegraph().getRepository().isEmpty()) { + urlBuilder.append(rdfRepositoryProperties.getBlazegraph().getRepository()); } else { urlBuilder.append("kb"); @@ -135,24 +134,24 @@ private Repository getGraphDBRepository() { log.info("Setting up GraphDB Store"); try { System.setProperty("org.eclipse.rdf4j.rio.binary.format_version", "1"); - if (!repositoryProperties.getGraphDb().getUrl().isEmpty() - && !repositoryProperties.getGraphDb().getRepository().isEmpty()) { + if (!rdfRepositoryProperties.getGraphDb().getUrl().isEmpty() + && !rdfRepositoryProperties.getGraphDb().getRepository().isEmpty()) { final RepositoryManager repositoryManager; - if (!repositoryProperties.getGraphDb().getUsername().isEmpty() - && !repositoryProperties.getGraphDb().getPassword().isEmpty()) { + if (!rdfRepositoryProperties.getGraphDb().getUsername().isEmpty() + && !rdfRepositoryProperties.getGraphDb().getPassword().isEmpty()) { repositoryManager = RemoteRepositoryManager.getInstance( - repositoryProperties.getGraphDb().getUrl(), - repositoryProperties.getGraphDb().getUsername(), - repositoryProperties.getGraphDb().getPassword() + rdfRepositoryProperties.getGraphDb().getUrl(), + rdfRepositoryProperties.getGraphDb().getUsername(), + rdfRepositoryProperties.getGraphDb().getPassword() ); } else { repositoryManager = RemoteRepositoryManager.getInstance( - repositoryProperties.getGraphDb().getUrl() + rdfRepositoryProperties.getGraphDb().getUrl() ); } return repositoryManager.getRepository( - repositoryProperties.getGraphDb().getRepository() + rdfRepositoryProperties.getGraphDb().getRepository() ); } log.warn("'repository.graphDb.url' or 'repository.graphDb.repository' is empty"); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryNativeProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryNativeProperties.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryNativeProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryNativeProperties.java index 6ab174a5b..a9132e39a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryNativeProperties.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryNativeProperties.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config.properties; +package org.fairdatateam.fairdatapoint.rdf; import lombok.AllArgsConstructor; import lombok.Getter; @@ -31,6 +31,6 @@ @AllArgsConstructor @Getter @Setter -public class RepositoryNativeProperties { +public class RdfRepositoryNativeProperties { private String dir = ""; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryProperties.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryProperties.java index f1734ed8c..1ab2c0674 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryProperties.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryProperties.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config.properties; +package org.fairdatateam.fairdatapoint.rdf; import lombok.AllArgsConstructor; import lombok.Getter; @@ -33,7 +33,7 @@ @Getter @Setter @ConfigurationProperties(prefix = "repository") -public class RepositoryProperties { +public class RdfRepositoryProperties { // TODO: use polymorphism for types of repository public static final int TYPE_IN_MEMORY = 1; @@ -47,13 +47,13 @@ public class RepositoryProperties { public static final int TYPE_BLAZEGRAPH = 5; private int type; - private RepositoryNativeProperties nativeRepo; - private RepositoryBasicProperties agraph; - private RepositoryBasicProperties graphDb; - private RepositoryBasicProperties blazegraph; + private RdfRepositoryNativeProperties nativeRepo; + private RdfRepositoryBasicProperties agraph; + private RdfRepositoryBasicProperties graphDb; + private RdfRepositoryBasicProperties blazegraph; - public void setNative(RepositoryNativeProperties repositoryNativeProperties) { - this.nativeRepo = repositoryNativeProperties; + public void setNative(RdfRepositoryNativeProperties rdfRepositoryNativeProperties) { + this.nativeRepo = rdfRepositoryNativeProperties; } public String getStringType() { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java index 40faf5477..0aa76d413 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.rdf; import org.eclipse.rdf4j.model.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/rdf/ShaclValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/service/rdf/ShaclValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java index 211630b9d..6d229f0a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/rdf/ShaclValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.rdf; +package org.fairdatateam.fairdatapoint.rdf; import org.fairdatateam.fairdatapoint.entity.exception.RdfValidationException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index fe975670b..75742a948 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -31,7 +31,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Statement; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java index 593d395d8..e30d65dbe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java @@ -54,9 +54,9 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.util.HttpUtil.*; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.changeBaseUri; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.*; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.changeBaseUri; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.read; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Tag(name = "Metadata") diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java index f54209d65..04f7696dc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java @@ -47,7 +47,7 @@ import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getMetadataIdentifier; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getStringObjectBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Tag(name = "Metadata") diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java index c29a527e9..b8918d016 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java @@ -29,8 +29,8 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; -import org.fairdatateam.fairdatapoint.vocabulary.DATACITE; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.DATACITE; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.*; @@ -46,8 +46,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.containsObject; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.containsObject; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java index ae9d5639a..14b4e628e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; @@ -37,7 +37,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.*; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.*; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java index f5c1c863d..7dbecaeb3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java @@ -22,9 +22,9 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; -import org.fairdatateam.fairdatapoint.vocabulary.SIO; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.DCAT3; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.SIO; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; @@ -32,7 +32,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.update; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.update; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java index 7c9f7c1a8..303f821ce 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java index 4cae48cd9..ffa9d611f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.rdf.ShaclValidator; +import org.fairdatateam.fairdatapoint.rdf.ShaclValidator; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaService; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index d9aa03525..c4941950d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java @@ -29,7 +29,7 @@ import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.schema.dto.*; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java index 0a9438baa..ecb399440 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.schema; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java index 54e0f81ca..4231d81ac 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DATACITE.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DATACITE.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java index a2f307287..a5c02c029 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DATACITE.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DCAT3.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DCAT3.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java index 367c16a6c..005d2044b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DCAT3.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.vocabulary.DCAT; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/FDP.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/vocabulary/FDP.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java index aaa53582b..1c371a51e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/FDP.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/R3D.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/vocabulary/R3D.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java index a6064bdc7..488008ac7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/R3D.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/SIO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/vocabulary/SIO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java index 2581b3a5d..ba48e32a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/SIO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java index 46eed1a26..4edf7a048 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java @@ -46,7 +46,7 @@ import java.util.Optional; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java index 4cf60ea91..2c2182b78 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java @@ -40,7 +40,7 @@ import java.util.HashMap; import java.util.Map; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getStringObjectBy; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Component diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java index ba0469379..8137ab6dd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java @@ -34,10 +34,10 @@ import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaShaclUtils; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; -import org.fairdatateam.fairdatapoint.vocabulary.DATACITE; -import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; -import org.fairdatateam.fairdatapoint.vocabulary.R3D; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.DATACITE; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.DCAT3; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.R3D; import org.bson.BasicBSONObject; import org.bson.Document; import org.bson.types.BasicBSONList; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java index 8b2e90e52..601ca8a3c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.config.properties.PingProperties; -import org.fairdatateam.fairdatapoint.config.properties.RepositoryProperties; +import org.fairdatateam.fairdatapoint.rdf.RdfRepositoryProperties; import org.fairdatateam.fairdatapoint.search.SearchMapper; import org.fairdatateam.fairdatapoint.settings.dto.*; import org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +42,7 @@ public class SettingsMapper { private PingProperties pingProperties; @Autowired - private RepositoryProperties repositoryProperties; + private RdfRepositoryProperties rdfRepositoryProperties; @Autowired private SearchMapper searchMapper; @@ -131,12 +131,12 @@ public SettingsPingDTO toDTO(SettingsPing settingsPing) { public SettingsRepositoryDTO getRepositoryDTO() { return SettingsRepositoryDTO .builder() - .type(repositoryProperties.getStringType()) - .dir(repositoryProperties.getDir()) - .url(repositoryProperties.getUrl()) - .repository(repositoryProperties.getRepository()) - .username(repositoryProperties.getUsername()) - .password(repositoryProperties.getPassword() != null ? "" : null) + .type(rdfRepositoryProperties.getStringType()) + .dir(rdfRepositoryProperties.getDir()) + .url(rdfRepositoryProperties.getUrl()) + .repository(rdfRepositoryProperties.getRepository()) + .username(rdfRepositoryProperties.getUsername()) + .password(rdfRepositoryProperties.getPassword() != null ? "" : null) .build(); } diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java index 29ef738da..e5155c97f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java index bf1e712c2..96078fecc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java index 31f9393de..db03cda14 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataMigration; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java index 0fa1d081f..0afe14903 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java index 7fd3a0bbe..8fd47c335 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java index ec072928a..631af56ae 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java index 1b2ef7fd7..424480a51 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java index 90ae8c7d6..9fd4dedea 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.repository; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index b1b3c2d5f..38c649aad 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -31,7 +31,7 @@ import org.fairdatateam.fairdatapoint.index.HarvesterService; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataEnhancer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.Model; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -48,7 +48,7 @@ import org.springframework.web.client.RestTemplate; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.write; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.write; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; From de1ecf7fb8f89af26cf6a54b4c56db2bf730c226 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 21:14:38 +0200 Subject: [PATCH 12/70] clean up imports --- .../database/mongo/repository/EventRepository.java | 2 +- .../fairdatapoint/index/IndexEntryRepository.java | 2 +- .../fairdatapoint/index/IndexSettingsRepository.java | 2 +- .../fairdatapoint/index/entry/IndexEntry.java | 4 +--- .../fairdatapoint/index/entry/IndexEntryMapper.java | 1 - .../fairdatapoint/index/entry/IndexEntryService.java | 3 +-- .../org/fairdatateam/fairdatapoint/index/event/Event.java | 2 +- .../fairdatapoint/index/event/EventMapper.java | 2 -- .../fairdatapoint/index/event/EventService.java | 8 +++----- .../fairdatapoint/index/event/IncomingPingUtils.java | 2 -- .../fairdatapoint/index/settings/IndexSettings.java | 2 +- .../fairdatapoint/index/settings/IndexSettingsMapper.java | 3 --- .../fairdatapoint/index/settings/IndexSettingsPing.java | 2 +- .../index/settings/IndexSettingsRetrieval.java | 2 +- .../index/settings/IndexSettingsService.java | 3 --- .../fairdatapoint/index/webhook/WebhookService.java | 2 +- .../development/index/entry/data/IndexEntryFixtures.java | 2 +- .../production/Rdf_Migration_0004_Cleanup_Index.java | 2 +- .../org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java | 1 - .../fairdatapoint/rdf/metadata/MetadataRdfRepository.java | 3 ++- .../rdf/schema/MetadataSchemaController.java | 1 - .../fairdatapoint/rdf/schema/MetadataSchemaMapper.java | 1 - .../fairdatapoint/rdf/schema/MetadataSchemaService.java | 1 - .../acceptance/index/admin/List_Trigger_POST.java | 2 +- .../acceptance/index/entry/List_All_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_GET.java | 2 +- .../acceptance/index/entry/List_Info_GET.java | 2 +- .../fairdatapoint/acceptance/index/ping/List_POST.java | 2 +- .../acceptance/index/settings/List_DELETE.java | 6 +++--- .../fairdatapoint/acceptance/index/settings/List_GET.java | 6 +++--- .../fairdatapoint/acceptance/index/settings/List_PUT.java | 6 +++--- .../fairdatapoint/utils/TestIndexEntryFixtures.java | 2 +- 32 files changed, 32 insertions(+), 51 deletions(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java index f1d66335e..f7ae707ef 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.database.mongo.repository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; import org.springframework.data.domain.Page; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java index 5f7739b6c..5d1162612 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.index; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import org.springframework.data.domain.Page; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java index d924bb715..0a327aea1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.index; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntry.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntry.java index 167c23528..634cd41eb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntry.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntry.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index.entity.entry; +package org.fairdatateam.fairdatapoint.index.entry; import lombok.*; import org.bson.types.ObjectId; -import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryMapper.java index 644c60cf9..efe5ba2e3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryMapper.java @@ -25,7 +25,6 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDetailDTO; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryStateDTO; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventMapper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index 323f1a612..3601e3f83 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -28,8 +28,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.fairdatateam.fairdatapoint.index.entry.dto.*; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/Event.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/Event.java index 8ceabf4a1..2f819e457 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/Event.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/Event.java @@ -26,7 +26,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.bson.types.ObjectId; import org.fairdatateam.fairdatapoint.index.webhook.WebhookPing; import org.fairdatateam.fairdatapoint.index.webhook.WebhookTrigger; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventMapper.java index 14ae5a90a..635a5c78c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventMapper.java @@ -22,8 +22,6 @@ */ package org.fairdatateam.fairdatapoint.index.event; -import org.fairdatateam.fairdatapoint.index.event.AdminTrigger; -import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.dto.EventDTO; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java index a1d9c15b3..d266251b1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java @@ -28,19 +28,17 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; -import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.index.event.EventType; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.exception.IncorrectPingFormatException; import org.fairdatateam.fairdatapoint.index.exception.PingDeniedException; import org.fairdatateam.fairdatapoint.index.exception.RateLimitException; import org.fairdatateam.fairdatapoint.index.http.Exchange; import org.fairdatateam.fairdatapoint.index.http.ExchangeState; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; import org.fairdatateam.fairdatapoint.service.UtilityService; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPingUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPingUtils.java index 297aee034..f581e2557 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPingUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/IncomingPingUtils.java @@ -23,8 +23,6 @@ package org.fairdatateam.fairdatapoint.index.event; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.index.event.IncomingPing; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.http.Exchange; import org.fairdatateam.fairdatapoint.index.http.ExchangeDirection; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettings.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettings.java index 4496ba8fe..d3a9a9b06 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettings.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettings.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index.entity.settings; +package org.fairdatateam.fairdatapoint.index.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java index deccbd6f8..43b033a96 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java @@ -26,9 +26,6 @@ import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsPingDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsRetrievalDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.springframework.stereotype.Service; import java.time.Duration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsPing.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsPing.java index a01bbba1a..618db613a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsPing.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsPing.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index.entity.settings; +package org.fairdatateam.fairdatapoint.index.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRetrieval.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRetrieval.java index 0d9598a2e..f1ecc2f61 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRetrieval.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRetrieval.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index.entity.settings; +package org.fairdatateam.fairdatapoint.index.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java index 75c18b9b6..25a0b4455 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java @@ -28,9 +28,6 @@ import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java index 86cd539ab..003117b89 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.database.mongo.repository.WebhookRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; import org.fairdatateam.fairdatapoint.service.UtilityService; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java index f3878f476..7a40c4bd9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry.data; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index 726d61ce6..a4053f921 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.eclipse.rdf4j.model.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java index b4285141a..572ff50f9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java @@ -46,7 +46,6 @@ import java.util.List; import java.util.Objects; -import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.setRdfTypes; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getSubjectBy; import static org.fairdatateam.fairdatapoint.util.ResourceReader.getResource; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java index 545315d75..8422ae34e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java @@ -52,5 +52,6 @@ boolean checkExistence(Resource subject, IRI predicate, Value object) void removeStatement(Resource subject, IRI predicate, Value object, IRI context) throws MetadataRdfRepositoryException; - List runSparqlQuery(String queryString, Map bindings) throws MetadataRdfRepositoryException; + List runSparqlQuery(String queryString, Map bindings) + throws MetadataRdfRepositoryException; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java index c1d7530c5..74644334d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java @@ -28,7 +28,6 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; -import org.fairdatateam.fairdatapoint.schema.dto.*; import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java index 188119cac..0c3a99826 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java @@ -23,7 +23,6 @@ package org.fairdatateam.fairdatapoint.rdf.schema; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; -import org.fairdatateam.fairdatapoint.schema.dto.*; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index c4941950d..1949710d4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java @@ -28,7 +28,6 @@ import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.schema.dto.*; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 040555ec2..595363c5e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index 068707f18..c8292cd03 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index eaf46f0d7..3d237de1d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.utils.CustomPageImpl; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java index 0006d80f3..903ab427e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java index 940926fb9..e70f4f7be 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java index 87468abaf..238b9d6c3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java @@ -25,9 +25,9 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java index 132b57a38..d79d53a03 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java @@ -25,9 +25,9 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java index 689730d9d..ca866bf44 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java @@ -28,9 +28,9 @@ import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsRetrievalDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettings; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsPing; -import org.fairdatateam.fairdatapoint.index.entity.settings.IndexSettingsRetrieval; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java index ef2fe5d89..a73bbe575 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.utils; -import org.fairdatateam.fairdatapoint.index.entity.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; From 8c1a284e5621bdba583304c8d79f64f25a2b2b6c Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 21:41:14 +0200 Subject: [PATCH 13/70] move all reset-related classes into fairdatapoint.reset package --- .../triplestore/production/Rdf_Migration_0001_Init.java | 2 +- .../fairdatapoint/{service => }/reset/FactoryDefaults.java | 2 +- .../{api/controller => }/reset/ResetController.java | 4 +--- .../fairdatapoint/{api/dto => }/reset/ResetDTO.java | 2 +- .../fairdatapoint/{service => }/reset/ResetService.java | 3 +-- .../fairdatapoint/{service => }/reset/shape-catalog.ttl | 0 .../fairdatapoint/{service => }/reset/shape-data-service.ttl | 0 .../fairdatapoint/{service => }/reset/shape-dataset.ttl | 0 .../fairdatapoint/{service => }/reset/shape-distribution.ttl | 0 .../fairdatapoint/{service => }/reset/shape-fdp.ttl | 0 .../{service => }/reset/shape-metadata-service.ttl | 0 .../fairdatapoint/{service => }/reset/shape-resource.ttl | 0 12 files changed, 5 insertions(+), 8 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/reset/FactoryDefaults.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/reset/ResetController.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => }/reset/ResetDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/reset/ResetService.java (98%) rename src/main/resources/org/fairdatateam/fairdatapoint/{service => }/reset/shape-catalog.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{service => }/reset/shape-data-service.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{service => }/reset/shape-dataset.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{service => }/reset/shape-distribution.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{service => }/reset/shape-fdp.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{service => }/reset/shape-metadata-service.ttl (100%) rename src/main/resources/org/fairdatateam/fairdatapoint/{service => }/reset/shape-resource.ttl (100%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java index 2a51bc079..1d2f87b02 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java @@ -24,7 +24,7 @@ import com.mongodb.client.MongoCollection; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.service.reset.FactoryDefaults; +import org.fairdatateam.fairdatapoint.reset.FactoryDefaults; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.bson.Document; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java rename to src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java index 8137ab6dd..1499aed1a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.reset; +package org.fairdatateam.fairdatapoint.reset; import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/reset/ResetController.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetController.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/reset/ResetController.java rename to src/main/java/org/fairdatateam/fairdatapoint/reset/ResetController.java index 5d3402beb..be0be79ce 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/reset/ResetController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetController.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.reset; +package org.fairdatateam.fairdatapoint.reset; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.reset.ResetDTO; -import org.fairdatateam.fairdatapoint.service.reset.ResetService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/reset/ResetDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/reset/ResetDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/reset/ResetDTO.java index e48f8075f..a9639abaf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/reset/ResetDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.reset; +package org.fairdatateam.fairdatapoint.reset; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java rename to src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java index 7bc1ba555..98e3945af 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.reset; +package org.fairdatateam.fairdatapoint.reset; import com.mongodb.client.MongoCollection; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.reset.ResetDTO; import org.fairdatateam.fairdatapoint.database.mongo.repository.*; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-catalog.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-catalog.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-catalog.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-catalog.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-data-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-data-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-data-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-data-service.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-dataset.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-dataset.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-dataset.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-dataset.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-distribution.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-distribution.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-distribution.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-distribution.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-fdp.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-fdp.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-fdp.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-fdp.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-metadata-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-metadata-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-metadata-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-metadata-service.ttl diff --git a/src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-resource.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-resource.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/service/reset/shape-resource.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/reset/shape-resource.ttl From f7b1eada28ab74a32d2a9dec0c0f8db6a266e208 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 21:50:27 +0200 Subject: [PATCH 14/70] move some leftovers for index etc. --- .../api/controller/exception/ExceptionControllerAdvice.java | 1 + .../fairdatateam/fairdatapoint/index/IndexFeatureAspect.java | 2 +- .../mongo/repository => index/event}/EventRepository.java | 4 +--- .../fairdatateam/fairdatapoint/index/event/EventService.java | 1 - .../{entity => index}/exception/FeatureDisabledException.java | 2 +- .../mongo/repository => index/webhook}/WebhookRepository.java | 3 +-- .../fairdatapoint/index/webhook/WebhookService.java | 3 +-- .../mongodb/development/index/event/EventMigration.java | 2 +- .../{entity/exception => rdf}/RdfValidationException.java | 2 +- .../org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java | 1 - .../schema}/MetadataSchemaImportException.java | 2 +- .../rdf/schema/MetadataSchemaRetrievalUtils.java | 1 - .../acceptance/index/admin/List_TriggerAll_POST.java | 2 +- .../acceptance/index/admin/List_Trigger_POST.java | 2 +- 14 files changed, 11 insertions(+), 17 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => index/event}/EventRepository.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => index}/exception/FeatureDisabledException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => index/webhook}/WebhookRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity/exception => rdf}/RdfValidationException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity/exception => rdf/schema}/MetadataSchemaImportException.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java index 4db633f0a..3d370d1de 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java @@ -35,6 +35,7 @@ import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.entity.exception.*; import org.fairdatateam.fairdatapoint.index.exception.AbstractIndexException; +import org.fairdatateam.fairdatapoint.rdf.RdfValidationException; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java index 48c41a72e..1af4fb93d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java @@ -24,7 +24,7 @@ import lombok.SneakyThrows; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.entity.exception.FeatureDisabledException; +import org.fairdatateam.fairdatapoint.index.exception.FeatureDisabledException; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventRepository.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/event/EventRepository.java index f7ae707ef..d29416a94 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventRepository.java @@ -20,11 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.index.event; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.index.event.EventType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java index d266251b1..09209f2ec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java @@ -26,7 +26,6 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/FeatureDisabledException.java b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/FeatureDisabledException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/exception/FeatureDisabledException.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/exception/FeatureDisabledException.java index 3f5d9fc7c..d53a76ef0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/FeatureDisabledException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/FeatureDisabledException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.exception; +package org.fairdatateam.fairdatapoint.index.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookRepository.java index 760b13fbf..b933f10c5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.index.webhook; -import org.fairdatateam.fairdatapoint.index.webhook.Webhook; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java index 003117b89..fc7fe6732 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java @@ -24,8 +24,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; -import org.fairdatateam.fairdatapoint.database.mongo.repository.WebhookRepository; +import org.fairdatateam.fairdatapoint.index.event.EventRepository; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java index 403d0a9d4..ea0b82817 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.event; -import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; +import org.fairdatateam.fairdatapoint.index.event.EventRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/RdfValidationException.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfValidationException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/exception/RdfValidationException.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfValidationException.java index b5ebb0d64..3ae9e2ed2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/RdfValidationException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfValidationException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.exception; +package org.fairdatateam.fairdatapoint.rdf; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java index 6d229f0a0..85cf76b24 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java @@ -22,7 +22,6 @@ */ package org.fairdatateam.fairdatapoint.rdf; -import org.fairdatateam.fairdatapoint.entity.exception.RdfValidationException; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.RDF4J; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/MetadataSchemaImportException.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaImportException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/exception/MetadataSchemaImportException.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaImportException.java index 5690160be..964880924 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/MetadataSchemaImportException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaImportException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.exception; +package org.fairdatateam.fairdatapoint.rdf.schema; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java index d18b36a99..7cf10d440 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java @@ -24,7 +24,6 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.entity.exception.MetadataSchemaImportException; import org.springframework.http.HttpHeaders; import tools.jackson.core.JacksonException; import tools.jackson.core.type.TypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java index 3f6c1a3d5..c4a08630a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.index.admin; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; +import org.fairdatateam.fairdatapoint.index.event.EventRepository; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 595363c5e..7b66b2ed3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository; +import org.fairdatateam.fairdatapoint.index.event.EventRepository; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; From 2a0de1c9ddf7285ab7518f870008d3b7191ecc85 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:15:03 +0200 Subject: [PATCH 15/70] move all security-related classes into fairdatapoint.security package --- .../api/dto/dashboard/DashboardItemDTO.java | 2 +- .../fairdatateam/fairdatapoint/config/CacheConfig.java | 2 +- .../fairdatapoint/index/entry/IndexEntryService.java | 2 +- .../migration/mongodb/development/acl/AclMigration.java | 4 ++-- .../mongodb/development/apikey/ApiKeyMigration.java | 2 +- .../mongodb/development/apikey/data/ApiKeyFixtures.java | 2 +- .../development/membership/MembershipMigration.java | 2 +- .../development/membership/data/MembershipFixtures.java | 4 ++-- .../mongodb/production/Migration_0001_Init.java | 2 +- .../production/Migration_0004_ResourceDefinition.java | 2 +- .../triplestore/development/RdfMetadataMigration.java | 2 +- .../fairdatapoint/openapi/OpenApiGenerator.java | 4 ++-- .../rdf/metadata/AbstractMetadataService.java | 4 ++-- .../fairdatapoint/rdf/metadata/GenericController.java | 2 +- .../rdf/metadata/GenericMemberController.java | 6 +++--- .../rdf/metadata/GenericMetaController.java | 4 ++-- .../fairdatapoint/rdf/metadata/MetadataStateService.java | 2 +- .../fairdatapoint/rdf/metadata/dto/MetaDTO.java | 2 +- .../rdf/schema/MetadataSchemaController.java | 2 +- .../fairdatapoint/reset/FactoryDefaults.java | 4 ++-- .../fairdatateam/fairdatapoint/reset/ResetService.java | 3 ++- .../resource/ResourceDefinitionService.java | 2 +- .../fairdatapoint/search/SearchSavedQueryService.java | 2 +- .../{service => }/security/CurrentUserProvider.java | 2 +- .../security/MongoAuthenticationService.java | 2 +- .../{service => }/security/MongoUserDetailsService.java | 2 +- .../{config => security}/PasswordConfig.java | 2 +- .../{config => security}/SecurityConfig.java | 4 ++-- .../{config => security/acl}/AclConfig.java | 2 +- .../acl}/AclMethodSecurityConfiguration.java | 2 +- .../{entity => security}/apikey/ApiKey.java | 2 +- .../controller => security}/apikey/ApiKeyController.java | 4 +--- .../{api/dto => security}/apikey/ApiKeyDTO.java | 2 +- .../{service => security}/apikey/ApiKeyMapper.java | 4 +--- .../repository => security/apikey}/ApiKeyRepository.java | 3 +-- .../{service => security}/apikey/ApiKeyService.java | 9 +++------ .../{api/dto => security}/auth/AuthDTO.java | 2 +- .../{api => security}/filter/FilterConfigurer.java | 2 +- .../{api => security}/filter/JwtTokenFilter.java | 6 +++--- .../{api => security}/filter/LoggingFilter.java | 2 +- .../member => security/membership}/MemberCreateDTO.java | 2 +- .../dto/member => security/membership}/MemberDTO.java | 3 +-- .../member => security/membership}/MemberMapper.java | 5 +---- .../member => security/membership}/MemberService.java | 9 ++------- .../{entity => security}/membership/Membership.java | 2 +- .../membership/MembershipController.java | 4 +--- .../{api/dto => security}/membership/MembershipDTO.java | 2 +- .../membership/MembershipMapper.java | 6 +----- .../membership/MembershipPermission.java | 2 +- .../membership/MembershipPermissionDTO.java | 2 +- .../membership}/MembershipRepository.java | 3 +-- .../membership/MembershipService.java | 5 +---- .../membership/PermissionService.java | 3 +-- .../{service/jwt => security/token}/JwtService.java | 6 +++--- .../controller => security}/token/TokenController.java | 6 ++---- .../{api/dto/auth => security/token}/TokenDTO.java | 2 +- .../service/dashboard/DashboardService.java | 6 +++--- .../fairdatateam/fairdatapoint/user/UserController.java | 2 +- .../org/fairdatateam/fairdatapoint/user/UserService.java | 4 ++-- .../fairdatapoint/acceptance/apikey/Detail_DELETE.java | 2 +- .../fairdatapoint/acceptance/apikey/List_GET.java | 2 +- .../fairdatapoint/acceptance/apikey/List_POST.java | 2 +- .../fairdatapoint/acceptance/dashboard/List_GET.java | 2 +- .../fairdatapoint/acceptance/membership/Common.java | 4 ++-- .../fairdatapoint/acceptance/membership/List_GET.java | 2 +- .../fairdatapoint/acceptance/metadata/Common.java | 2 +- .../acceptance/metadata/catalog/member/Detail_PUT.java | 6 +++--- .../acceptance/metadata/catalog/member/List_GET.java | 4 ++-- .../acceptance/metadata/catalog/meta/List_GET.java | 4 ++-- .../acceptance/metadata/dataset/member/Detail_PUT.java | 6 +++--- .../acceptance/metadata/dataset/member/List_GET.java | 4 ++-- .../acceptance/metadata/dataset/meta/List_GET.java | 4 ++-- .../metadata/distribution/member/Detail_PUT.java | 6 +++--- .../metadata/distribution/member/List_GET.java | 4 ++-- .../acceptance/metadata/distribution/meta/List_GET.java | 4 ++-- .../fairdatapoint/acceptance/token/List_POST.java | 4 ++-- .../org/fairdatateam/fairdatapoint/utils/AuthHelper.java | 2 +- 77 files changed, 112 insertions(+), 141 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/security/CurrentUserProvider.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/security/MongoAuthenticationService.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/security/MongoUserDetailsService.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{config => security}/PasswordConfig.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{config => security}/SecurityConfig.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{config => security/acl}/AclConfig.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{config => security/acl}/AclMethodSecurityConfiguration.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => security}/apikey/ApiKey.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => security}/apikey/ApiKeyController.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => security}/apikey/ApiKeyDTO.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => security}/apikey/ApiKeyMapper.java (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => security/apikey}/ApiKeyRepository.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => security}/apikey/ApiKeyService.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => security}/auth/AuthDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api => security}/filter/FilterConfigurer.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{api => security}/filter/JwtTokenFilter.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api => security}/filter/LoggingFilter.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/member => security/membership}/MemberCreateDTO.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/member => security/membership}/MemberDTO.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/member => security/membership}/MemberMapper.java (86%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/member => security/membership}/MemberService.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => security}/membership/Membership.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => security}/membership/MembershipController.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => security}/membership/MembershipDTO.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => security}/membership/MembershipMapper.java (83%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => security}/membership/MembershipPermission.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => security}/membership/MembershipPermissionDTO.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{database/mongo/repository => security/membership}/MembershipRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => security}/membership/MembershipService.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => security}/membership/PermissionService.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/jwt => security/token}/JwtService.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => security}/token/TokenController.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/auth => security/token}/TokenDTO.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java index 4410c0353..3f9f80536 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java @@ -26,7 +26,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; +import org.fairdatateam.fairdatapoint.security.membership.MembershipDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java index 106eec0bb..6b5ced5eb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java @@ -29,7 +29,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.config.AclConfig.ACL_CACHE; +import static org.fairdatateam.fairdatapoint.security.acl.AclConfig.ACL_CACHE; @Configuration @EnableCaching diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index 3601e3f83..c6ac63a54 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -35,7 +35,7 @@ import org.fairdatateam.fairdatapoint.index.event.EventService; import org.fairdatateam.fairdatapoint.index.HarvesterService; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.TreeModel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java index 1154d1508..2e556b52f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; -import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; +import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.fairdatateam.security.acls.dao.AclRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java index 5f0ec3712..759dc0124 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ApiKeyRepository; +import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java index ad2bc1d97..807c9cf8c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; +import org.fairdatateam.fairdatapoint.security.apikey.ApiKey; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java index 1cd5d37be..6f4bbfa58 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository; +import org.fairdatateam.fairdatapoint.security.membership.MembershipRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java index 08100b769..8ff836a01 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; -import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; +import org.fairdatateam.fairdatapoint.security.membership.Membership; +import org.fairdatateam.fairdatapoint.security.membership.MembershipPermission; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java index 9f96f3655..fb14b6297 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java @@ -103,7 +103,7 @@ private Document createMembership(String uuid, String name, boolean owner) { } membership.append(FIELD_PERMISSIONS, permissions); membership.append("allowedEntities", allowedEntities); - membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.membership.Membership"); + membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.security.membership.Membership"); return membership; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java index 46b35e93a..29e7b7d01 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java @@ -205,7 +205,7 @@ private Document createMembership(String uuid, String name, boolean owner) { } membership.append(FIELD_PERMISSIONS, permissions); membership.append("allowedEntities", allowedEntities); - membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.membership.Membership"); + membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.security.membership.Membership"); return membership; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java index 8f9f04490..91ec93f84 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java @@ -33,7 +33,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataStateService; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java index f29197e00..73e5c0a79 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java @@ -35,8 +35,8 @@ import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.tags.Tag; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index 75742a948..7c7e22728 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -27,10 +27,10 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; -import org.fairdatateam.fairdatapoint.service.member.MemberService; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java index e30d65dbe..c8985ec3f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java @@ -32,7 +32,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaService; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java index 0066cca4c..e192dd323 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java @@ -25,10 +25,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.member.MemberService; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java index 04f7696dc..c3ebd7c12 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java @@ -25,13 +25,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaPathDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.member.MemberService; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java index 303f821ce..f9a34f8de 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java index bf53f0f66..dca4ca572 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java @@ -29,7 +29,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import java.util.Map; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java index 74644334d..35142d10d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java index 1499aed1a..304dae5f5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.reset; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; -import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; +import org.fairdatateam.fairdatapoint.security.membership.Membership; +import org.fairdatateam.fairdatapoint.security.membership.MembershipPermission; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java index 98e3945af..c8db38071 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java @@ -24,7 +24,6 @@ import com.mongodb.client.MongoCollection; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.database.mongo.repository.*; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; @@ -33,6 +32,8 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyRepository; +import org.fairdatateam.fairdatapoint.security.membership.MembershipRepository; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.bson.Document; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java index ee475122e..1c80819e0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.membership.MembershipService; +import org.fairdatateam.fairdatapoint.security.membership.MembershipService; import org.fairdatateam.fairdatapoint.openapi.OpenApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java index 53ccf67b9..f89076c74 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java b/src/main/java/org/fairdatateam/fairdatapoint/security/CurrentUserProvider.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/CurrentUserProvider.java index 7f549f155..978fcca76 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/CurrentUserProvider.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.security; +package org.fairdatateam.fairdatapoint.security; import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.user.User; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoAuthenticationService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoAuthenticationService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoAuthenticationService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/MongoAuthenticationService.java index b91ea6304..936274110 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoAuthenticationService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoAuthenticationService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.security; +package org.fairdatateam.fairdatapoint.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java index 5e29546cb..c3d3875ab 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.security; +package org.fairdatateam.fairdatapoint.security; import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/PasswordConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/security/PasswordConfig.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/PasswordConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/PasswordConfig.java index d1bb7e874..30a5ee5dd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/PasswordConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/PasswordConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.security; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/SecurityConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/security/SecurityConfig.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/config/SecurityConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/SecurityConfig.java index deabdb5e8..202eca820 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/SecurityConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/SecurityConfig.java @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.security; -import org.fairdatateam.fairdatapoint.api.filter.FilterConfigurer; +import org.fairdatateam.fairdatapoint.security.filter.FilterConfigurer; import org.springframework.boot.security.autoconfigure.actuate.web.servlet.EndpointRequest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclConfig.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclConfig.java index 2f141d921..8f129643e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.security.acl; import org.fairdatateam.fairdatapoint.user.UserRole; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/AclMethodSecurityConfiguration.java b/src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclMethodSecurityConfiguration.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/AclMethodSecurityConfiguration.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclMethodSecurityConfiguration.java index cafb124db..4b38ccce2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/AclMethodSecurityConfiguration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclMethodSecurityConfiguration.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.security.acl; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/apikey/ApiKey.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKey.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/apikey/ApiKey.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKey.java index 9f3c53439..95bb2ba0b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/apikey/ApiKey.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKey.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.apikey; +package org.fairdatateam.fairdatapoint.security.apikey; import lombok.*; import org.bson.types.ObjectId; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/apikey/ApiKeyController.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/apikey/ApiKeyController.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java index b737d2f3a..303b1410c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/apikey/ApiKeyController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.apikey; +package org.fairdatateam.fairdatapoint.security.apikey; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.apikey.ApiKeyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/apikey/ApiKeyDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/apikey/ApiKeyDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyDTO.java index c02cbfec7..ea3199160 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/apikey/ApiKeyDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.apikey; +package org.fairdatateam.fairdatapoint.security.apikey; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyMapper.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyMapper.java index aef37190b..8e94a5b28 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyMapper.java @@ -20,10 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.apikey; +package org.fairdatateam.fairdatapoint.security.apikey; -import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO; -import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ApiKeyRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyRepository.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ApiKeyRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyRepository.java index f3de063fe..f1c2bf8ae 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ApiKeyRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.security.apikey; -import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java index 2687582be..bfc5c7156 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java @@ -20,17 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.apikey; +package org.fairdatateam.fairdatapoint.security.apikey; -import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ApiKeyRepository; -import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/AuthDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/security/auth/AuthDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/AuthDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/auth/AuthDTO.java index fdcd560b2..59916849b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/AuthDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/auth/AuthDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.auth; +package org.fairdatateam.fairdatapoint.security.auth; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/filter/FilterConfigurer.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/FilterConfigurer.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/api/filter/FilterConfigurer.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/filter/FilterConfigurer.java index 8c32e9eb1..4827ec42a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/filter/FilterConfigurer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/FilterConfigurer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.filter; +package org.fairdatateam.fairdatapoint.security.filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/filter/JwtTokenFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/filter/JwtTokenFilter.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java index cdf29a98f..f7e3d01ac 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/filter/JwtTokenFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.filter; +package org.fairdatateam.fairdatapoint.security.filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -28,8 +28,8 @@ import jakarta.servlet.http.HttpServletResponse; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; -import org.fairdatateam.fairdatapoint.service.apikey.ApiKeyService; -import org.fairdatateam.fairdatapoint.service.jwt.JwtService; +import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyService; +import org.fairdatateam.fairdatapoint.security.token.JwtService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/filter/LoggingFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/api/filter/LoggingFilter.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java index 9100f7784..814dbf9ff 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/filter/LoggingFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.api.filter; +package org.fairdatateam.fairdatapoint.security.filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberCreateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberCreateDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberCreateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberCreateDTO.java index cfffe716e..2a45957fd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberCreateDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberCreateDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.member; +package org.fairdatateam.fairdatapoint.security.membership; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberDTO.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberDTO.java index 99c6b6d4a..96fcb72c1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberDTO.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.member; +package org.fairdatateam.fairdatapoint.security.membership; import lombok.AllArgsConstructor; import lombok.Data; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; import org.fairdatateam.fairdatapoint.user.dto.UserSimpleDTO; @Data diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberMapper.java similarity index 86% rename from src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberMapper.java index ed247aa7d..ab8f8b1fe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberMapper.java @@ -20,12 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.member; +package org.fairdatateam.fairdatapoint.security.membership; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.fairdatateam.fairdatapoint.user.User; -import org.fairdatateam.fairdatapoint.service.membership.MembershipMapper; import org.fairdatateam.fairdatapoint.user.UserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java index 26857b35d..6643aeec9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java @@ -20,18 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.member; +package org.fairdatateam.fairdatapoint.security.membership; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository; import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; -import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.service.membership.PermissionService; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.fairdatateam.security.acls.dao.AclRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/Membership.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/Membership.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/membership/Membership.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/Membership.java index ea2b64be3..4062a2b88 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/Membership.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/Membership.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.membership; +package org.fairdatateam.fairdatapoint.security.membership; import lombok.*; import org.bson.types.ObjectId; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/membership/MembershipController.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipController.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/membership/MembershipController.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipController.java index 999adc71c..a0e91d3e4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/membership/MembershipController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipController.java @@ -20,11 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.membership; +package org.fairdatateam.fairdatapoint.security.membership; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.service.membership.MembershipService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipDTO.java index ed99c7d88..246c718c2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.membership; +package org.fairdatateam.fairdatapoint.security.membership; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipMapper.java similarity index 83% rename from src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipMapper.java index e44b266d7..000fb1a53 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipMapper.java @@ -20,12 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.membership; +package org.fairdatateam.fairdatapoint.security.membership; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipPermissionDTO; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; -import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; import org.springframework.stereotype.Service; import java.util.stream.Collectors; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/MembershipPermission.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/membership/MembershipPermission.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.java index 8a4528192..360bce215 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/MembershipPermission.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.membership; +package org.fairdatateam.fairdatapoint.security.membership; import lombok.*; import org.bson.types.ObjectId; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermissionDTO.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermissionDTO.java index c215edf61..c9cc634e3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermissionDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.membership; +package org.fairdatateam.fairdatapoint.security.membership; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MembershipRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MembershipRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipRepository.java index 5460c31d0..d081d798c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MembershipRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.mongo.repository; +package org.fairdatateam.fairdatapoint.security.membership; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.java index c548e55d4..eac12be27 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.java @@ -20,11 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.membership; +package org.fairdatateam.fairdatapoint.security.membership; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/PermissionService.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/membership/PermissionService.java index 22fdb3215..6d5616367 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/PermissionService.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.membership; +package org.fairdatateam.fairdatapoint.security.membership; -import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; import org.fairdatateam.fairdatapoint.user.UserPermission; import org.springframework.security.acls.model.Permission; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java index c64c7abe7..8c0820ce3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java @@ -20,15 +20,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.jwt; +package org.fairdatateam.fairdatapoint.security.token; import io.jsonwebtoken.*; import jakarta.annotation.PostConstruct; -import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO; +import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/token/TokenController.java b/src/main/java/org/fairdatateam/fairdatapoint/security/token/TokenController.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/token/TokenController.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/token/TokenController.java index 5d356e563..7d8b35e9d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/token/TokenController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/token/TokenController.java @@ -20,13 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.token; +package org.fairdatateam.fairdatapoint.security.token; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO; -import org.fairdatateam.fairdatapoint.api.dto.auth.TokenDTO; -import org.fairdatateam.fairdatapoint.service.jwt.JwtService; +import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/TokenDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/security/token/TokenDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/TokenDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/token/TokenDTO.java index 86c2bd9c9..fd65fd09d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/TokenDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/token/TokenDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.auth; +package org.fairdatateam.fairdatapoint.security.token; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java index 4edf7a048..0503af238 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java @@ -23,12 +23,12 @@ package org.fairdatateam.fairdatapoint.service.dashboard; import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MembershipDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.service.member.MemberService; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataStateService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java index b0d46b785..bbaf7485c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java @@ -26,7 +26,7 @@ import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.fairdatateam.fairdatapoint.user.dto.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/user/UserService.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserService.java index 8d1048df8..cecb66f95 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/user/UserService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserService.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.user; -import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.fairdatateam.fairdatapoint.user.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java index cc2197f16..13402132a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; -import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey; +import org.fairdatateam.fairdatapoint.security.apikey.ApiKey; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java index 2d13aad11..a9579ee9a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.apikey; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO; +import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_POST.java index d1cf343d3..716cb6e68 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.apikey; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO; +import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyDTO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java index d1ef18734..85f64a22e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; -import org.fairdatateam.fairdatapoint.service.member.MemberService; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/Common.java index 95d59d930..b3e1be7f9 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/Common.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.acceptance.membership; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; +import org.fairdatateam.fairdatapoint.security.membership.MembershipDTO; +import org.fairdatateam.fairdatapoint.security.membership.Membership; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java index cf072fc0e..576f42ba4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.membership; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO; +import org.fairdatateam.fairdatapoint.security.membership.MembershipDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java index 81e05c7d1..0bf1a375e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java index 1a8240c84..f1f82b0b6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java @@ -24,11 +24,11 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java index 3c7dfa6a3..4f5e3e52c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java @@ -24,10 +24,10 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java index ccdcab8c3..236045f01 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java index c85226ab1..baa5a9b71 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java @@ -24,11 +24,11 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java index ff9436ee1..e5fad679a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java @@ -24,10 +24,10 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java index f6c9f602f..58c4b4114 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java index f13def5ff..d720113f6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java @@ -24,11 +24,11 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java index 266b80b4e..a7f6c127c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java @@ -24,10 +24,10 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java index a142cfc6e..fb0a0f4b3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java @@ -23,13 +23,13 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.meta; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.member.MemberMapper; +import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java index 769dad621..da365dbcc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.token; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO; -import org.fairdatateam.fairdatapoint.api.dto.auth.TokenDTO; +import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; +import org.fairdatateam.fairdatapoint.security.token.TokenDTO; import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java index bbbe9cb42..9002d5ff7 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.utils; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; From 90d311d294365478dfa13b1e1a67a298df8db527 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:19:15 +0200 Subject: [PATCH 16/70] move all form-related classes into fairdatapoint.form package --- .../controller => }/form/FormAutocompleteController.java | 5 +---- .../{api/dto => }/form/FormAutocompleteItemDTO.java | 2 +- .../{api/dto => }/form/FormAutocompleteRequestDTO.java | 2 +- .../autocomplete => form}/FormsAutocompleteCache.java | 3 +-- .../autocomplete => form}/FormsAutocompleteService.java | 8 +------- .../retrieval => form}/RdfEntitiesNamespaceRetriever.java | 3 +-- .../retrieval => form}/RdfEntitiesRetriever.java | 4 +--- .../retrieval => form}/RdfEntitiesSparqlRetriever.java | 3 +-- .../{entity/forms => form}/RdfEntityCacheContainer.java | 3 +-- .../{entity/forms => form}/RdfEntitySourceType.java | 2 +- 10 files changed, 10 insertions(+), 25 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/form/FormAutocompleteController.java (88%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => }/form/FormAutocompleteItemDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => }/form/FormAutocompleteRequestDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/form/autocomplete => form}/FormsAutocompleteCache.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/form/autocomplete => form}/FormsAutocompleteService.java (87%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/form/autocomplete/retrieval => form}/RdfEntitiesNamespaceRetriever.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/form/autocomplete/retrieval => form}/RdfEntitiesRetriever.java (89%) rename src/main/java/org/fairdatateam/fairdatapoint/{service/form/autocomplete/retrieval => form}/RdfEntitiesSparqlRetriever.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity/forms => form}/RdfEntityCacheContainer.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity/forms => form}/RdfEntitySourceType.java (95%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/form/FormAutocompleteController.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteController.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/form/FormAutocompleteController.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteController.java index 7e718617f..fc595ccc8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/form/FormAutocompleteController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteController.java @@ -20,13 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.form; +package org.fairdatateam.fairdatapoint.form; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO; -import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO; -import org.fairdatateam.fairdatapoint.service.form.autocomplete.FormsAutocompleteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteItemDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteItemDTO.java index 94452792c..1a643dd37 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteItemDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.form; +package org.fairdatateam.fairdatapoint.form; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java index 7620e9297..d4d67abd6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.form; +package org.fairdatateam.fairdatapoint.form; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.java index 4adc2ff50..50230376f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.form.autocomplete; +package org.fairdatateam.fairdatapoint.form; -import org.fairdatateam.fairdatapoint.entity.forms.RdfEntityCacheContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteService.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteService.java index 0276c5db5..2f670a881 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteService.java @@ -20,15 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.form.autocomplete; +package org.fairdatateam.fairdatapoint.form; -import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO; -import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO; -import org.fairdatateam.fairdatapoint.entity.forms.RdfEntityCacheContainer; import org.fairdatateam.fairdatapoint.settings.Settings; -import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesNamespaceRetriever; -import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesRetriever; -import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesSparqlRetriever; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesNamespaceRetriever.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesNamespaceRetriever.java index 2c2182b78..53faf96fc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesNamespaceRetriever.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval; +package org.fairdatateam.fairdatapoint.form; import lombok.SneakyThrows; -import org.fairdatateam.fairdatapoint.entity.forms.RdfEntitySourceType; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesRetriever.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesRetriever.java index 5677225c1..6a91d6382 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesRetriever.java @@ -20,9 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval; - -import org.fairdatateam.fairdatapoint.entity.forms.RdfEntitySourceType; +package org.fairdatateam.fairdatapoint.form; import java.util.Map; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesSparqlRetriever.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesSparqlRetriever.java index 2aae63e72..09dfbc784 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesSparqlRetriever.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval; +package org.fairdatateam.fairdatapoint.form; -import org.fairdatateam.fairdatapoint.entity.forms.RdfEntitySourceType; import org.fairdatateam.fairdatapoint.settings.SettingsAutocompleteSource; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.eclipse.rdf4j.query.TupleQuery; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntityCacheContainer.java b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntityCacheContainer.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntityCacheContainer.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntityCacheContainer.java index 5a8fd2b3b..b02ea2e83 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntityCacheContainer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntityCacheContainer.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.forms; +package org.fairdatateam.fairdatapoint.form; import lombok.*; -import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntitySourceType.java b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitySourceType.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntitySourceType.java rename to src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitySourceType.java index 814e2b5e6..8f8cdd40b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntitySourceType.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitySourceType.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.forms; +package org.fairdatateam.fairdatapoint.form; public enum RdfEntitySourceType { SPARQL, From 90ae804c1477145a8f0ab43753b60ee2e68dcb35 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:21:33 +0200 Subject: [PATCH 17/70] move all actuator-related classes into fairdatapoint.actuator package --- .../{config => actuator}/ActuatorMetricsConfig.java | 2 +- .../{service => }/actuator/AppInfoContributor.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataEnhancer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{config => actuator}/ActuatorMetricsConfig.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/actuator/AppInfoContributor.java (97%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/ActuatorMetricsConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/actuator/ActuatorMetricsConfig.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/config/ActuatorMetricsConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/actuator/ActuatorMetricsConfig.java index 49c5d68eb..891c67f9c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/ActuatorMetricsConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/actuator/ActuatorMetricsConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.actuator; import io.micrometer.common.KeyValue; import io.micrometer.core.instrument.MeterRegistry; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/actuator/AppInfoContributor.java b/src/main/java/org/fairdatateam/fairdatapoint/actuator/AppInfoContributor.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/actuator/AppInfoContributor.java rename to src/main/java/org/fairdatateam/fairdatapoint/actuator/AppInfoContributor.java index 1c53dea95..baad6b0a6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/actuator/AppInfoContributor.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/actuator/AppInfoContributor.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.actuator; +package org.fairdatateam.fairdatapoint.actuator; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.actuate.info.Info; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java index b8918d016..c85f5cda7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.service.actuator.AppInfoContributor; +import org.fairdatateam.fairdatapoint.actuator.AppInfoContributor; import org.fairdatateam.fairdatapoint.service.profile.ProfileService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; From 0df839e2cf7779ea7f61270fc7aceeb5632fc311 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:25:15 +0200 Subject: [PATCH 18/70] move all ping-related classes into fairdatapoint.ping package --- .../{config/properties => ping}/PingProperties.java | 2 +- .../fairdatapoint/{service => }/ping/PingService.java | 3 +-- .../fairdatateam/fairdatapoint/settings/SettingsMapper.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{config/properties => ping}/PingProperties.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/ping/PingService.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/PingProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingProperties.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/properties/PingProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/ping/PingProperties.java index 9a261d1ea..ba91d2a2e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/PingProperties.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingProperties.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config.properties; +package org.fairdatateam.fairdatapoint.ping; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java rename to src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java index f8d714ed4..a93a057af 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.ping; +package org.fairdatateam.fairdatapoint.ping; import lombok.extern.log4j.Log4j2; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.config.properties.PingProperties; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java index 601ca8a3c..55fe5a428 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.config.properties.PingProperties; +import org.fairdatateam.fairdatapoint.ping.PingProperties; import org.fairdatateam.fairdatapoint.rdf.RdfRepositoryProperties; import org.fairdatateam.fairdatapoint.search.SearchMapper; import org.fairdatateam.fairdatapoint.settings.dto.*; From d7960925356080ad9a1fe2afaa8c188d769fb07e Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:26:09 +0200 Subject: [PATCH 19/70] move UtilityService into util package --- .../fairdatapoint/{service => util}/UtilityService.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{service => util}/UtilityService.java (100%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/UtilityService.java b/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java similarity index 100% rename from src/main/java/org/fairdatateam/fairdatapoint/service/UtilityService.java rename to src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java From de455814a965ad5c311d31451ebf4e44974fb1f2 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:26:19 +0200 Subject: [PATCH 20/70] move UtilityService into util package --- .../fairdatateam/fairdatapoint/index/IndexAdminController.java | 2 +- .../fairdatateam/fairdatapoint/index/IndexPingController.java | 2 +- .../fairdatateam/fairdatapoint/index/event/EventService.java | 2 +- .../fairdatapoint/index/webhook/WebhookService.java | 2 +- .../fairdatapoint/security/filter/LoggingFilter.java | 2 +- .../org/fairdatateam/fairdatapoint/util/UtilityService.java | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java index 0d6b6084c..684942251 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.service.UtilityService; +import org.fairdatateam.fairdatapoint.util.UtilityService; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; import org.fairdatateam.fairdatapoint.index.event.EventService; import org.fairdatateam.fairdatapoint.index.webhook.WebhookService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java index 29c921220..959431c48 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexPingController.java @@ -34,7 +34,7 @@ import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.service.UtilityService; +import org.fairdatateam.fairdatapoint.util.UtilityService; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; import org.fairdatateam.fairdatapoint.index.event.EventService; import org.fairdatateam.fairdatapoint.index.webhook.WebhookService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java index 09209f2ec..5fce2ae53 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java @@ -38,7 +38,7 @@ import org.fairdatateam.fairdatapoint.index.http.ExchangeState; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; -import org.fairdatateam.fairdatapoint.service.UtilityService; +import org.fairdatateam.fairdatapoint.util.UtilityService; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java index fc7fe6732..8033a1bf1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; -import org.fairdatateam.fairdatapoint.service.UtilityService; +import org.fairdatateam.fairdatapoint.util.UtilityService; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java index 814dbf9ff..033ba667a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java @@ -31,7 +31,7 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.fairdatateam.fairdatapoint.service.UtilityService; +import org.fairdatateam.fairdatapoint.util.UtilityService; import org.apache.logging.log4j.ThreadContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java b/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java index b1512ae12..f1438a7fc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service; +package org.fairdatateam.fairdatapoint.util; import jakarta.servlet.http.HttpServletRequest; import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.util.HttpUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; From 67f1fc6e418ee4e3d62271d7b806eb0e37950ea6 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:27:59 +0200 Subject: [PATCH 21/70] move all label-related classes into fairdatapoint.label package --- .../{api/controller => }/label/LabelController.java | 4 +--- .../fairdatapoint/{api/dto => }/label/LabelDTO.java | 2 +- .../fairdatapoint/{service => }/label/LabelService.java | 3 +-- .../fairdatateam/fairdatapoint/search/SearchFilterCache.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/label/LabelController.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => }/label/LabelDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/label/LabelService.java (97%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/label/LabelController.java b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelController.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/label/LabelController.java rename to src/main/java/org/fairdatateam/fairdatapoint/label/LabelController.java index f0a292bfb..daf6f35d9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/label/LabelController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelController.java @@ -20,10 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.label; +package org.fairdatateam.fairdatapoint.label; -import org.fairdatateam.fairdatapoint.api.dto.label.LabelDTO; -import org.fairdatateam.fairdatapoint.service.label.LabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/label/LabelDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/label/LabelDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/label/LabelDTO.java index 3f6bf8169..048ec8342 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/label/LabelDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.label; +package org.fairdatateam.fairdatapoint.label; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/label/LabelService.java b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/label/LabelService.java rename to src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java index 2f5c2b213..ab6c07f4c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/label/LabelService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.label; +package org.fairdatateam.fairdatapoint.label; import static java.util.function.Predicate.isEqual; import static org.fairdatateam.fairdatapoint.config.CacheConfig.LABEL_CACHE; @@ -32,7 +32,6 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.label.LabelDTO; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java index 03f6f0064..cf6161981 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java @@ -24,7 +24,7 @@ import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.service.label.LabelService; +import org.fairdatateam.fairdatapoint.label.LabelService; import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; From 9fc13ba6870eefbe0e7719cbdf722f7e1a7ecbff Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:29:34 +0200 Subject: [PATCH 22/70] move all dashboard-related classes into fairdatapoint.dashboard package --- .../{api/controller => }/dashboard/DashboardController.java | 4 +--- .../{api/dto => }/dashboard/DashboardItemDTO.java | 2 +- .../{service => }/dashboard/DashboardService.java | 3 +-- .../fairdatapoint/acceptance/dashboard/List_GET.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/dashboard/DashboardController.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => }/dashboard/DashboardItemDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/dashboard/DashboardService.java (97%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java rename to src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java index fcab5ba5e..abacea949 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.dashboard; +package org.fairdatateam.fairdatapoint.dashboard; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; -import org.fairdatateam.fairdatapoint.service.dashboard.DashboardService; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; import org.eclipse.rdf4j.model.IRI; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardItemDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardItemDTO.java index 3f9f80536..02b35c395 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardItemDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.dashboard; +package org.fairdatateam.fairdatapoint.dashboard; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java rename to src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java index 0503af238..2e5aff17c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.dashboard; +package org.fairdatateam.fairdatapoint.dashboard; -import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.security.membership.MembershipDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java index 85f64a22e..8456d34af 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.dashboard; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO; +import org.fairdatateam.fairdatapoint.dashboard.DashboardItemDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.security.membership.MemberService; From fd1f8f79d59d8b91f4cbaf44d31c08387b964947 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:32:04 +0200 Subject: [PATCH 23/70] move all profile-related classes into fairdatapoint.profile package --- .../{api/controller => }/profile/ProfileController.java | 3 +-- .../fairdatapoint/{service => }/profile/ProfileService.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataEnhancer.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/profile/ProfileController.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/profile/ProfileService.java (98%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/profile/ProfileController.java b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/profile/ProfileController.java rename to src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java index 35f72eb02..8fae138dc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/profile/ProfileController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java @@ -20,12 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.profile; +package org.fairdatateam.fairdatapoint.profile; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.profile.ProfileService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java rename to src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java index 20337e993..fc2d79e3d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.profile; +package org.fairdatateam.fairdatapoint.profile; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java index c85f5cda7..da0c3277f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.actuator.AppInfoContributor; -import org.fairdatateam.fairdatapoint.service.profile.ProfileService; +import org.fairdatateam.fairdatapoint.profile.ProfileService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; From 83f804e89d14cee42d290bce44778870d05f9e8f Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:35:29 +0200 Subject: [PATCH 24/70] move all config-related classes into fairdatapoint.config package --- .../{api/dto => }/config/BootstrapConfigDTO.java | 2 +- .../{api/controller => }/config/ConfigController.java | 4 +--- .../fairdatapoint/{service => }/config/ConfigService.java | 4 +--- .../config/{properties => }/InstanceProperties.java | 2 +- .../fairdatateam/fairdatapoint/index/IndexFeatureAspect.java | 2 +- .../fairdatapoint/index/settings/IndexSettingsService.java | 2 +- .../production/Rdf_Migration_0004_Cleanup_Index.java | 2 +- .../org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java | 2 +- .../java/org/fairdatateam/fairdatapoint/ping/PingService.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataConfig.java | 2 +- .../fairdatateam/fairdatapoint/settings/SettingsMapper.java | 2 +- .../org/fairdatateam/fairdatapoint/util/UtilityService.java | 2 +- .../fairdatapoint/acceptance/config/List_Bootstrap_GET.java | 2 +- 13 files changed, 13 insertions(+), 17 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto => }/config/BootstrapConfigDTO.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/config/ConfigController.java (90%) rename src/main/java/org/fairdatateam/fairdatapoint/{service => }/config/ConfigService.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/config/{properties => }/InstanceProperties.java (97%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/config/BootstrapConfigDTO.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/config/BootstrapConfigDTO.java index ea5bbe278..3b6c1ffc3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/BootstrapConfigDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.config; +package org.fairdatateam.fairdatapoint.config; import lombok.*; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/config/ConfigController.java b/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigController.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/config/ConfigController.java rename to src/main/java/org/fairdatateam/fairdatapoint/config/ConfigController.java index b148030bf..233d43611 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/config/ConfigController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigController.java @@ -20,11 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.controller.config; +package org.fairdatateam.fairdatapoint.config; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO; -import org.fairdatateam.fairdatapoint.service.config.ConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java b/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java rename to src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java index 4b5b750f7..422dd5383 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java @@ -20,10 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.config; +package org.fairdatateam.fairdatapoint.config; -import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.settings.SettingsService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/InstanceProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/InstanceProperties.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/config/properties/InstanceProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/config/InstanceProperties.java index 8568da6d9..a1cc530f2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/InstanceProperties.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/InstanceProperties.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config.properties; +package org.fairdatateam.fairdatapoint.config; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java index 1af4fb93d..fb158ee3c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.index; import lombok.SneakyThrows; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.fairdatateam.fairdatapoint.index.exception.FeatureDisabledException; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java index 25a0b4455..5ba2efd83 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index a4053f921..505c0bd82 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java index 48aae0902..e0bd05f93 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java index a93a057af..696afadc6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.ping; import lombok.extern.log4j.Log4j2; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java index dd0ceef9f..94939843d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.eclipse.rdf4j.model.IRI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java index 55fe5a428..3a7b76c57 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.fairdatateam.fairdatapoint.ping.PingProperties; import org.fairdatateam.fairdatapoint.rdf.RdfRepositoryProperties; import org.fairdatateam.fairdatapoint.search.SearchMapper; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java b/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java index f1438a7fc..712cef0b3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/UtilityService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.util; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/config/List_Bootstrap_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/config/List_Bootstrap_GET.java index 97819558e..dd0f44a7c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/config/List_Bootstrap_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/config/List_Bootstrap_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.config; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO; +import org.fairdatateam.fairdatapoint.config.BootstrapConfigDTO; import org.junit.jupiter.api.Test; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpStatus; From 4bf9b258f8147e1e99cd942ac1e1a3d533584d70 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:40:37 +0200 Subject: [PATCH 25/70] move all exception/error-related classes into fairdatapoint.exception package --- .../fairdatateam/fairdatapoint/config/ConverterConfig.java | 2 +- .../org/fairdatateam/fairdatapoint/config/WebMvcConfig.java | 2 +- .../{api/converter => exception}/ErrorConverter.java | 3 +-- .../fairdatapoint/{api/dto/error => exception}/ErrorDTO.java | 2 +- .../controller => }/exception/ExceptionControllerAdvice.java | 4 +--- .../{entity => }/exception/ForbiddenException.java | 2 +- .../{entity => }/exception/ResourceNotFoundException.java | 2 +- .../{entity => }/exception/UnauthorizedException.java | 2 +- .../{entity => }/exception/ValidationException.java | 2 +- .../fairdatapoint/index/entry/IndexEntryService.java | 2 +- .../fairdatapoint/index/exception/AbstractIndexException.java | 2 +- .../fairdatapoint/index/webhook/WebhookService.java | 2 +- .../fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java | 2 +- .../fairdatateam/fairdatapoint/profile/ProfileController.java | 2 +- .../java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java | 2 +- .../org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java | 2 +- .../fairdatapoint/rdf/metadata/AbstractMetadataService.java | 2 +- .../fairdatapoint/rdf/metadata/GenericController.java | 4 ++-- .../fairdatapoint/rdf/metadata/GenericMemberController.java | 2 +- .../fairdatapoint/rdf/metadata/GenericMetadataService.java | 4 ++-- .../fairdatapoint/rdf/metadata/MetadataService.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataStateService.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataStateValidator.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataValidator.java | 2 +- .../fairdatapoint/rdf/schema/MetadataSchemaController.java | 4 ++-- .../fairdatapoint/rdf/schema/MetadataSchemaService.java | 4 ++-- .../fairdatapoint/rdf/schema/MetadataSchemaValidator.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionController.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionService.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionValidator.java | 2 +- .../fairdatapoint/search/SearchSavedQueryController.java | 2 +- .../fairdatapoint/search/SearchSavedQueryService.java | 2 +- .../org/fairdatateam/fairdatapoint/search/SearchService.java | 2 +- .../fairdatapoint/search/SparqlProxyController.java | 2 +- .../fairdatapoint/search/SparqlQueryValidator.java | 2 +- .../fairdatapoint/security/MongoUserDetailsService.java | 2 +- .../fairdatapoint/security/apikey/ApiKeyController.java | 2 +- .../fairdatapoint/security/apikey/ApiKeyService.java | 4 ++-- .../fairdatapoint/security/filter/JwtTokenFilter.java | 4 ++-- .../fairdatapoint/security/membership/MemberService.java | 2 +- .../fairdatateam/fairdatapoint/security/token/JwtService.java | 2 +- .../org/fairdatateam/fairdatapoint/user/UserController.java | 4 ++-- .../org/fairdatateam/fairdatapoint/user/UserValidator.java | 2 +- .../java/org/fairdatateam/fairdatapoint/util/HttpUtil.java | 2 +- .../fairdatapoint/acceptance/metadata/Common.java | 2 +- .../acceptance/metadata/catalog/member/Detail_PUT.java | 2 +- .../acceptance/metadata/catalog/member/List_GET.java | 2 +- .../acceptance/metadata/dataset/member/Detail_PUT.java | 2 +- .../acceptance/metadata/dataset/member/List_GET.java | 2 +- .../acceptance/metadata/distribution/member/Detail_PUT.java | 2 +- .../acceptance/metadata/distribution/member/List_GET.java | 2 +- .../fairdatapoint/acceptance/schema/Detail_DELETE.java | 2 +- .../acceptance/search/sparql/SparqlQueryValidatorTest.java | 2 +- .../fairdatapoint/acceptance/token/List_POST.java | 2 +- .../fairdatapoint/acceptance/user/Detail_Current_PUT.java | 2 +- .../fairdatapoint/acceptance/user/Detail_PUT.java | 2 +- .../fairdatateam/fairdatapoint/acceptance/user/List_POST.java | 2 +- .../service/metadata/generic/GenericMetadataServiceTest.java | 4 ++-- .../service/resource/ResourceDefinitionValidatorTest.java | 2 +- 59 files changed, 67 insertions(+), 70 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/converter => exception}/ErrorConverter.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/dto/error => exception}/ErrorDTO.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/controller => }/exception/ExceptionControllerAdvice.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/exception/ForbiddenException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/exception/ResourceNotFoundException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/exception/UnauthorizedException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{entity => }/exception/ValidationException.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java index 16c6444b5..4c5e2895a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java @@ -27,7 +27,7 @@ */ package org.fairdatateam.fairdatapoint.config; -import org.fairdatateam.fairdatapoint.api.converter.ErrorConverter; +import org.fairdatateam.fairdatapoint.exception.ErrorConverter; import org.fairdatateam.fairdatapoint.rdf.RdfConverter; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java index bafb148a8..a5c3fc7b9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.config; import com.fasterxml.jackson.annotation.JsonInclude; -import org.fairdatateam.fairdatapoint.api.converter.ErrorConverter; +import org.fairdatateam.fairdatapoint.exception.ErrorConverter; import org.fairdatateam.fairdatapoint.rdf.RdfConverter; import org.jspecify.annotations.NonNull; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/converter/ErrorConverter.java b/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorConverter.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/converter/ErrorConverter.java rename to src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorConverter.java index 0ceb36c38..3c079a8ed 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/converter/ErrorConverter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorConverter.java @@ -25,9 +25,8 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.api.converter; +package org.fairdatateam.fairdatapoint.exception; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/error/ErrorDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorDTO.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/error/ErrorDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorDTO.java index e8e06193a..80a1ec093 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/error/ErrorDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.dto.error; +package org.fairdatateam.fairdatapoint.exception; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/exception/ExceptionControllerAdvice.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java rename to src/main/java/org/fairdatateam/fairdatapoint/exception/ExceptionControllerAdvice.java index 3d370d1de..a15e7b16b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/exception/ExceptionControllerAdvice.java @@ -25,15 +25,13 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.api.controller.exception; +package org.fairdatateam.fairdatapoint.exception; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.entity.exception.*; import org.fairdatateam.fairdatapoint.index.exception.AbstractIndexException; import org.fairdatateam.fairdatapoint.rdf.RdfValidationException; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ForbiddenException.java b/src/main/java/org/fairdatateam/fairdatapoint/exception/ForbiddenException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ForbiddenException.java rename to src/main/java/org/fairdatateam/fairdatapoint/exception/ForbiddenException.java index 3f59ad0a4..7946374cd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ForbiddenException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/exception/ForbiddenException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.exception; +package org.fairdatateam.fairdatapoint.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ResourceNotFoundException.java b/src/main/java/org/fairdatateam/fairdatapoint/exception/ResourceNotFoundException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ResourceNotFoundException.java rename to src/main/java/org/fairdatateam/fairdatapoint/exception/ResourceNotFoundException.java index 2a7a6d690..600cefd83 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ResourceNotFoundException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/exception/ResourceNotFoundException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.exception; +package org.fairdatateam.fairdatapoint.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/UnauthorizedException.java b/src/main/java/org/fairdatateam/fairdatapoint/exception/UnauthorizedException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/exception/UnauthorizedException.java rename to src/main/java/org/fairdatateam/fairdatapoint/exception/UnauthorizedException.java index 1d79cd0dc..f59d74910 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/UnauthorizedException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/exception/UnauthorizedException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.exception; +package org.fairdatateam.fairdatapoint.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ValidationException.java b/src/main/java/org/fairdatateam/fairdatapoint/exception/ValidationException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ValidationException.java rename to src/main/java/org/fairdatateam/fairdatapoint/exception/ValidationException.java index b85dfcb2f..c61fbe6fc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ValidationException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/exception/ValidationException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.exception; +package org.fairdatateam.fairdatapoint.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index c6ac63a54..c788df766 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.fairdatateam.fairdatapoint.index.entry.dto.*; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java index 775dca235..cecf9fe02 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.index.exception; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.springframework.http.HttpStatus; public abstract class AbstractIndexException extends RuntimeException { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java index 8033a1bf1..4b6ae9f67 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java @@ -25,7 +25,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.event.EventRepository; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; import org.fairdatateam.fairdatapoint.util.UtilityService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java index 73e5c0a79..d1c9215dd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java @@ -34,7 +34,7 @@ import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.tags.Tag; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java index 8fae138dc..8f58c344d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java @@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java index 572ff50f9..f4cd81c09 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.Statement; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java index 85cf76b24..96d876123 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/ShaclValidator.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.RDF4J; import org.eclipse.rdf4j.repository.RepositoryException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index 7c7e22728..880f2747d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java index c8985ec3f..dce647062 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java @@ -24,8 +24,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ForbiddenException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java index e192dd323..39e21e466 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java @@ -27,7 +27,7 @@ import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java index 9416ba795..2a3befb43 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ForbiddenException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.user.UserRole; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java index 856f56440..dcd2fef55 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java index f9a34f8de..9afe7b1c9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java index 87794e403..f11416663 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java index ffa9d611f..2b11076e7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.rdf.ShaclValidator; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java index 35142d10d..97629fa07 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java @@ -25,8 +25,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index 1949710d4..1d7d8dac7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java @@ -24,8 +24,8 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java index 4231d81ac..e65c4bf00 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java index 2d9628c09..7705cefca 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java @@ -26,7 +26,7 @@ import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java index 1c80819e0..6d3975524 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.security.membership.MembershipService; import org.fairdatateam.fairdatapoint.openapi.OpenApiService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java index f12f590c5..2261cbf15 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.resource; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.validation.BindException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java index 2bf588a0c..a1156e59b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java index f89076c74..142f9c3cf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; +import org.fairdatateam.fairdatapoint.exception.ForbiddenException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index 73c2807d9..21091f9a9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilter; import org.fairdatateam.fairdatapoint.search.dto.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java index 2482e5173..6683f19ed 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java @@ -33,7 +33,7 @@ import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.http.HTTPRepository; import org.eclipse.rdf4j.repository.sparql.SPARQLRepository; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.hibernate.validator.constraints.URL; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java index 5c28e9049..fcee9b43c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java @@ -29,7 +29,7 @@ import org.eclipse.rdf4j.repository.RepositoryException; import org.eclipse.rdf4j.repository.sail.SailRepository; import org.eclipse.rdf4j.sail.memory.MemoryStore; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; /** * Custom validator for SPARQL query strings. Throws a ValidationException if validation fails. diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java index c3d3875ab..e8ee36c7f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.security; import org.fairdatateam.fairdatapoint.user.UserRepository; -import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java index 303b1410c..ece135dbd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.security.apikey; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java index bfc5c7156..926072b4e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.security.apikey; -import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.exception.ForbiddenException; +import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java index f7e3d01ac..5cc3f8a09 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java @@ -26,8 +26,8 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; -import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyService; import org.fairdatateam.fairdatapoint.security.token.JwtService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java index 6643aeec9..d80d7e82d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.security.membership; import org.fairdatateam.fairdatapoint.user.UserRepository; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java index 8c0820ce3..9c025d78b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java @@ -26,7 +26,7 @@ import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; import org.fairdatateam.fairdatapoint.user.UserRepository; -import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java index bbaf7485c..4bd975ccc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java @@ -24,8 +24,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ForbiddenException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.fairdatateam.fairdatapoint.user.dto.*; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java index 5fbafc9f1..fd680a3ff 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.user; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java index 1a1ba4964..6f8a8e57e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java @@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java index 0bf1a375e..192b3b4f6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.acceptance.metadata; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java index f1f82b0b6..5c4064762 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java index 4f5e3e52c..c8c87aeb2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java index baa5a9b71..a5a0d8e0d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java index e5fad679a..327c35744 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java index d720113f6..5079f2e05 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java index a7f6c127c..8fd0b2b13 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java index 2077cc7ee..fb0a9b700 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java index 483aac320..b7b84d0d0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.search.SparqlQueryValidator; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java index da365dbcc..843379d30 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; import org.fairdatateam.fairdatapoint.security.token.TokenDTO; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java index a9515a799..1d90f093f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserProfileChangeDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java index fb7521009..4999d668c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserChangeDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java index aac8a6f2a..d0fffb9a5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserCreateDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java index 0f9df6685..5578ec845 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; import org.fairdatateam.fairdatapoint.utils.AuthHelper; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java index 279432e4b..98fe4cf3e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.*; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; From aab2e65ab9179ff427b761eecffc14caa865ef3b Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:41:07 +0200 Subject: [PATCH 26/70] remove unused BreadcrumbDTO class --- .../api/dto/common/BreadcrumbDTO.java | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/main/java/org/fairdatateam/fairdatapoint/api/dto/common/BreadcrumbDTO.java diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/common/BreadcrumbDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/common/BreadcrumbDTO.java deleted file mode 100644 index b3cf395c6..000000000 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/common/BreadcrumbDTO.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * The MIT License - * Copyright © 2017 FAIR Data Team - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.fairdatateam.fairdatapoint.api.dto.common; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@NoArgsConstructor -@AllArgsConstructor -@Getter -@Setter -public class BreadcrumbDTO { - - private String label; - - private String identifier; - -} From 901cf04393acc6627bcffd8da8cfb3453e274aeb Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:46:15 +0200 Subject: [PATCH 27/70] move remaining validator classes to corresponding packages --- .../fairdatapoint/form/FormAutocompleteRequestDTO.java | 2 +- .../{api/validator => index/settings}/DurationValidator.java | 2 +- .../{api/validator => index/settings}/ValidDuration.java | 2 +- .../fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java | 2 +- .../index/settings/dto/IndexSettingsRetrievalDTO.java | 2 +- .../{api/validator => rdf/schema}/SemVerValidator.java | 3 +-- .../{api/validator => rdf/schema}/ValidSemVer.java | 2 +- .../fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionChild.java | 2 +- .../resource/ResourceDefinitionChildListView.java | 2 +- .../resource/ResourceDefinitionChildListViewMetadata.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionLink.java | 2 +- .../fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java | 2 +- .../fairdatapoint/search/dto/SearchFilterItemDTO.java | 2 +- .../settings/dto/SettingsAutocompleteSourceDTO.java | 2 +- .../fairdatapoint/{api/validator => util}/IriValidator.java | 2 +- .../fairdatapoint/{api/validator => util}/ValidIri.java | 2 +- 17 files changed, 17 insertions(+), 18 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{api/validator => index/settings}/DurationValidator.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/validator => index/settings}/ValidDuration.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/validator => rdf/schema}/SemVerValidator.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/validator => rdf/schema}/ValidSemVer.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/validator => util}/IriValidator.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{api/validator => util}/ValidIri.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java index d4d67abd6..94cf36b6d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/DurationValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/DurationValidator.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/validator/DurationValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/DurationValidator.java index ed0af9fbe..a91faa4e5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/DurationValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/DurationValidator.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.validator; +package org.fairdatateam.fairdatapoint.index.settings; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidDuration.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/ValidDuration.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidDuration.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/ValidDuration.java index 9e901c016..3a3c66898 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidDuration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/ValidDuration.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.validator; +package org.fairdatateam.fairdatapoint.index.settings; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java index bbb871f20..25985da98 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsPingDTO.java @@ -27,7 +27,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.api.validator.ValidDuration; +import org.fairdatateam.fairdatapoint.index.settings.ValidDuration; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java index b31a6900e..de872984d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java @@ -27,7 +27,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.api.validator.ValidDuration; +import org.fairdatateam.fairdatapoint.index.settings.ValidDuration; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVerValidator.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVerValidator.java index cd2f176cb..bb636ce51 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVerValidator.java @@ -20,11 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.validator; +package org.fairdatateam.fairdatapoint.rdf.schema; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; public class SemVerValidator implements ConstraintValidator { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidSemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/ValidSemVer.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidSemVer.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/ValidSemVer.java index 02d440381..ca3e7a331 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidSemVer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/ValidSemVer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.validator; +package org.fairdatateam.fairdatapoint.rdf.schema; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java index 414319ebc..551a6d225 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java @@ -27,7 +27,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.api.validator.ValidSemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.ValidSemVer; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java index c048b9246..f4a8a4847 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java @@ -25,7 +25,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java index 9f3bb87d6..f9846a8a7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java @@ -25,7 +25,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java index ce7dff738..85abcf4d9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java index bbbbb309e..c331c6a9c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java index 8caa0d2ae..77f651d4c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java @@ -25,7 +25,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; import org.fairdatateam.fairdatapoint.search.SearchFilterType; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java index 2a3008f99..e9295a7ba 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.search.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java index 05b0b71df..78801a83b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/IriValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/util/IriValidator.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/validator/IriValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/util/IriValidator.java index eb27c90f0..f97c64658 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/IriValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/IriValidator.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.validator; +package org.fairdatateam.fairdatapoint.util; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidIri.java b/src/main/java/org/fairdatateam/fairdatapoint/util/ValidIri.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidIri.java rename to src/main/java/org/fairdatateam/fairdatapoint/util/ValidIri.java index c16c32257..bbeb8151b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidIri.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/ValidIri.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.api.validator; +package org.fairdatateam.fairdatapoint.util; import jakarta.validation.Constraint; import jakarta.validation.Payload; From 5ce21f4cb3e6e60d472bef03eace69749e284da5 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 29 Jun 2026 22:49:41 +0200 Subject: [PATCH 28/70] move remaining classes into security.auth --- .../migration/mongodb/development/acl/AclMigration.java | 2 +- .../migration/triplestore/development/RdfMetadataMigration.java | 2 +- .../fairdatapoint/security/apikey/ApiKeyService.java | 2 +- .../security/{ => auth}/MongoAuthenticationService.java | 2 +- .../fairdatapoint/security/{ => auth}/PasswordConfig.java | 2 +- .../fairdatateam/fairdatapoint/security/token/JwtService.java | 2 +- .../java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/security/{ => auth}/MongoAuthenticationService.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/security/{ => auth}/PasswordConfig.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java index 2e556b52f..bfdde1c86 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.security.membership.MemberService; -import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.fairdatateam.security.acls.dao.AclRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java index 91ec93f84..523016d89 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java @@ -33,7 +33,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataServiceException; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataStateService; -import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java index 926072b4e..6a2206ad1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/MongoAuthenticationService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/auth/MongoAuthenticationService.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/security/MongoAuthenticationService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/auth/MongoAuthenticationService.java index 936274110..14e631dcb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/MongoAuthenticationService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/auth/MongoAuthenticationService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.security; +package org.fairdatateam.fairdatapoint.security.auth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/PasswordConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/security/auth/PasswordConfig.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/security/PasswordConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/auth/PasswordConfig.java index 30a5ee5dd..4c3522deb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/PasswordConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/auth/PasswordConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.security; +package org.fairdatateam.fairdatapoint.security.auth; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java index 9c025d78b..28e0752cb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.user.UserRepository; import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; -import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java index 9002d5ff7..7b3a87a44 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.utils; import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; From 215547f1f1d1256f3502e60b751cdaa589c5605f Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 30 Jun 2026 16:31:24 +0200 Subject: [PATCH 29/70] flatten migration.mongodb.development structure to match resources resource loader looks for resources relative to class path, so the file structure in java and resources must match --- .../mongodb/development/{acl => }/AclMigration.java | 4 +--- .../development/{apikey/data => }/ApiKeyFixtures.java | 3 +-- .../development/{apikey => }/ApiKeyMigration.java | 3 +-- .../development/DevelopmentMigrationRunner.java | 10 ---------- .../development/{index/event => }/EventMigration.java | 2 +- .../{index/entry/data => }/IndexEntryFixtures.java | 2 +- .../{index/entry => }/IndexEntryMigration.java | 3 +-- .../{membership/data => }/MembershipFixtures.java | 2 +- .../{membership => }/MembershipMigration.java | 3 +-- .../{metadata/data => }/MetadataFixtures.java | 2 +- .../development/{metadata => }/MetadataMigration.java | 2 +- .../{schema/data => }/MetadataSchemaFixtures.java | 2 +- .../{schema => }/MetadataSchemaMigration.java | 3 +-- .../data => }/ResourceDefinitionFixtures.java | 2 +- .../{resource => }/ResourceDefinitionMigration.java | 3 +-- .../{search => }/SearchSavedQueryFixtures.java | 2 +- .../{settings/data => }/SettingsFixtures.java | 2 +- .../development/{settings => }/SettingsMigration.java | 3 +-- .../development/{user/data => }/UserFixtures.java | 2 +- .../mongodb/development/{user => }/UserMigration.java | 3 +-- .../triplestore/development/RdfMetadataMigration.java | 4 ++-- .../fairdatapoint/acceptance/apikey/Detail_DELETE.java | 2 +- .../fairdatapoint/acceptance/apikey/List_GET.java | 2 +- .../fairdatapoint/acceptance/dashboard/List_GET.java | 2 +- .../fairdatapoint/acceptance/general/SecurityTest.java | 2 +- .../fairdatapoint/acceptance/membership/List_GET.java | 2 +- .../metadata/catalog/member/Detail_DELETE.java | 2 +- .../acceptance/metadata/catalog/member/Detail_PUT.java | 4 ++-- .../acceptance/metadata/catalog/member/List_GET.java | 4 ++-- .../acceptance/metadata/catalog/meta/List_GET.java | 6 +++--- .../metadata/catalog/meta/List_State_PUT.java | 2 +- .../metadata/dataset/member/Detail_DELETE.java | 2 +- .../acceptance/metadata/dataset/member/Detail_PUT.java | 4 ++-- .../acceptance/metadata/dataset/member/List_GET.java | 4 ++-- .../acceptance/metadata/dataset/meta/List_GET.java | 6 +++--- .../metadata/dataset/meta/List_State_PUT.java | 2 +- .../metadata/distribution/member/Detail_DELETE.java | 2 +- .../metadata/distribution/member/Detail_PUT.java | 4 ++-- .../metadata/distribution/member/List_GET.java | 4 ++-- .../metadata/distribution/meta/List_GET.java | 6 +++--- .../metadata/distribution/meta/List_State_PUT.java | 2 +- .../acceptance/metadata/repository/meta/List_GET.java | 2 +- .../metadata/repository/meta/List_State_PUT.java | 2 +- .../acceptance/resource/Detail_DELETE.java | 2 +- .../fairdatapoint/acceptance/resource/Detail_GET.java | 2 +- .../fairdatapoint/acceptance/resource/Detail_PUT.java | 2 +- .../fairdatapoint/acceptance/resource/List_GET.java | 2 +- .../fairdatapoint/acceptance/resource/List_POST.java | 2 +- .../fairdatapoint/acceptance/schema/Content_GET.java | 2 +- .../fairdatapoint/acceptance/schema/Detail_DELETE.java | 2 +- .../fairdatapoint/acceptance/schema/Detail_GET.java | 2 +- .../fairdatapoint/acceptance/schema/Draft_DELETE.java | 2 +- .../fairdatapoint/acceptance/schema/Draft_GET.java | 2 +- .../fairdatapoint/acceptance/schema/Draft_PUT.java | 2 +- .../fairdatapoint/acceptance/schema/Import_POST.java | 2 +- .../fairdatapoint/acceptance/schema/List_GET.java | 2 +- .../fairdatapoint/acceptance/schema/List_POST.java | 2 +- .../fairdatapoint/acceptance/schema/Public_GET.java | 2 +- .../acceptance/schema/Version_DELETE.java | 2 +- .../fairdatapoint/acceptance/schema/Version_GET.java | 2 +- .../fairdatapoint/acceptance/schema/Version_PUT.java | 2 +- .../fairdatapoint/acceptance/schema/Versions_POST.java | 2 +- .../acceptance/search/query/saved/Detail_DELETE.java | 2 +- .../acceptance/search/query/saved/Detail_GET.java | 2 +- .../acceptance/search/query/saved/Detail_PUT.java | 2 +- .../acceptance/search/query/saved/List_GET.java | 2 +- .../fairdatapoint/acceptance/user/Current_GET.java | 2 +- .../acceptance/user/Detail_Current_PUT.java | 2 +- .../acceptance/user/Detail_Current_Password_PUT.java | 2 +- .../fairdatapoint/acceptance/user/Detail_DELETE.java | 2 +- .../fairdatapoint/acceptance/user/Detail_GET.java | 2 +- .../fairdatapoint/acceptance/user/Detail_PUT.java | 2 +- .../acceptance/user/Detail_Password_PUT.java | 2 +- .../fairdatapoint/acceptance/user/List_GET.java | 2 +- .../fairdatapoint/acceptance/user/List_POST.java | 2 +- .../service/index/harvester/HarvesterServiceTest.java | 2 +- .../metadata/generic/GenericMetadataServiceTest.java | 2 +- .../service/resource/ResourceDefinitionCacheTest.java | 2 +- .../resource/ResourceDefinitionValidatorTest.java | 2 +- .../fairdatateam/fairdatapoint/utils/AuthHelper.java | 2 +- .../fairdatapoint/utils/TestRdfMetadataFixtures.java | 2 +- 81 files changed, 93 insertions(+), 113 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{acl => }/AclMigration.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{apikey/data => }/ApiKeyFixtures.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{apikey => }/ApiKeyMigration.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{index/event => }/EventMigration.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{index/entry/data => }/IndexEntryFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{index/entry => }/IndexEntryMigration.java (94%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{membership/data => }/MembershipFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{membership => }/MembershipMigration.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{metadata/data => }/MetadataFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{metadata => }/MetadataMigration.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{schema/data => }/MetadataSchemaFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{schema => }/MetadataSchemaMigration.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{resource/data => }/ResourceDefinitionFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{resource => }/ResourceDefinitionMigration.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{search => }/SearchSavedQueryFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{settings/data => }/SettingsFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{settings => }/SettingsMigration.java (93%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{user/data => }/UserFixtures.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/{user => }/UserMigration.java (94%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/AclMigration.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/AclMigration.java index bfdde1c86..8ac4c9ec8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/acl/AclMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/AclMigration.java @@ -20,11 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.acl; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyFixtures.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyFixtures.java index 807c9cf8c..ada36042d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/data/ApiKeyFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyFixtures.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.security.apikey.ApiKey; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyMigration.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyMigration.java index 759dc0124..3b5fd2339 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/apikey/ApiKeyMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyMigration.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java index ca554ad70..dd9223d24 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java @@ -24,16 +24,6 @@ import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.acl.AclMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.ApiKeyMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry.IndexEntryMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.index.event.EventMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.MembershipMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.MetadataMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.ResourceDefinitionMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.MetadataSchemaMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.settings.SettingsMigration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.UserMigration; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.search.SearchFilterCache; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/EventMigration.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/EventMigration.java index ea0b82817..41d7049ea 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/event/EventMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/EventMigration.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.event; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.index.event.EventRepository; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryFixtures.java index 7a40c4bd9..32d3cc721 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/data/IndexEntryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/IndexEntryMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/IndexEntryMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java index ff565fb38..afdfb3716 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/index/entry/IndexEntryMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.index.entry.data.IndexEntryFixtures; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java index 8ff836a01..73dd46239 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/data/MembershipFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.security.membership.Membership; import org.fairdatateam.fairdatapoint.security.membership.MembershipPermission; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipMigration.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipMigration.java index 6f4bbfa58..01a84f27d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/membership/MembershipMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipMigration.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.membership; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; import org.fairdatateam.fairdatapoint.security.membership.MembershipRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataFixtures.java index 88300fc38..17a52967c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/data/MetadataFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataMigration.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataMigration.java index 7abefbf85..35ce432e6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/metadata/MetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataMigration.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java index 8e6e7c1bd..0fcd8d443 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/data/MetadataSchemaFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import lombok.SneakyThrows; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaMigration.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaMigration.java index 20f828af4..59a70d261 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/schema/MetadataSchemaMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaMigration.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.schema; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java index 9f98ee283..6a7e06fcf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/data/ResourceDefinitionFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/ResourceDefinitionMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionMigration.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/ResourceDefinitionMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionMigration.java index 4a63661c1..34a13f387 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/resource/ResourceDefinitionMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionMigration.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.resource; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/search/SearchSavedQueryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/search/SearchSavedQueryFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java index df507b30e..31dad954b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/search/SearchSavedQueryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.search; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/data/SettingsFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/data/SettingsFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsFixtures.java index ceb827eb9..4386da6df 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/data/SettingsFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.settings.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.search.SearchFilterType; import org.fairdatateam.fairdatapoint.settings.Settings; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/SettingsMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsMigration.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/SettingsMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsMigration.java index 77373c43e..db9f9ab99 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/settings/SettingsMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsMigration.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.settings; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.settings.data.SettingsFixtures; import org.fairdatateam.fairdatapoint.settings.SettingsRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/data/UserFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/data/UserFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java index 8ec608a23..8cd58b874 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/data/UserFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/UserMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserMigration.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/UserMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserMigration.java index a3588197f..1354d39d2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/user/UserMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserMigration.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration.mongodb.development.user; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; import org.fairdatateam.fairdatapoint.user.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java index 523016d89..004ad5da6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java index 13402132a..18dba96ca 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.apikey; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.security.apikey.ApiKey; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java index a9579ee9a..3619d6ae1 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ApiKeyFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java index 8456d34af..1fbe9de91 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.dashboard.DashboardItemDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java index e5155c97f..33b40a230 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.general; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.apikey.data.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java index 576f42ba4..d2225cb04 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.security.membership.MembershipDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java index d549091a2..015037b55 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java index 5c4064762..b8b6fac89 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java index c8c87aeb2..650c4cff8 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java index 236045f01..d8a1aa5d3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java @@ -26,9 +26,9 @@ import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java index ecfbee372..9ca594abc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java index d52eaa6e2..17d0a2e0c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java index a5a0d8e0d..c761b253e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java index 327c35744..daff4b2b5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java index 58c4b4114..6db8bb14f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java @@ -26,9 +26,9 @@ import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java index db9075589..ee85f1202 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java index f648cf2a3..13ec2d4ab 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java index 5079f2e05..30c0009fe 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java index 8fd0b2b13..167b8a58f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java index fb0a0f4b3..2770bc191 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java @@ -26,9 +26,9 @@ import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.membership.data.MembershipFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.membership.MemberMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java index ce874f048..fd1588dc4 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java index 8781e4c4b..d421d8386 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java index 2b9d32f9a..6177f6e57 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java index 9f330831c..82542d283 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java index 7337c2485..533d5fb51 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java index 07f4deaab..ff7e48073 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionMapper; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java index 056cf94ad..4a357cc46 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.resource; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java index acccb9854..4888cca33 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java index 8442209da..e258249bc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.junit.jupiter.api.DisplayName; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java index fb0a9b700..1b14d0b27 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.exception.ErrorDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java index 2786ab8ee..5aa20454f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java index 3496d5240..782a5ac11 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java index a18477d79..56d37b68a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java index f9935d5c4..4fdbe44ba 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java index 60eabeac8..c0e7ef0a5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java index 1dc680cb6..e02b660cf 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java index 1f2fd29f9..292b6ab7a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java index 872d91b5a..d552a8a6a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java index 9b4a90f21..99be210e3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java index ad63b5a59..5b13e231b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java index 0e7361833..97199d60c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaUpdateDTO; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java index 8be3d46cf..346e1fb56 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaReleaseDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.schema.data.MetadataSchemaFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraftRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java index 11f1ca604..191036947 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search.query.saved; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java index 61c7d181a..bf2a0639e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java index 9cd3c6ad6..d0403c5d6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java index fa931cf8e..49283c244 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.search.SearchSavedQueryFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.SearchSavedQueryFixtures; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java index 2f6832be4..ca30633fc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java index 1d90f093f..5bc5f8d9e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserProfileChangeDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java index 6cabfda37..5bb572ce9 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java index 2c9dc4233..1b98c6461 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java index 9e7f3d3bc..714f6c67b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java index 4999d668c..e9c06497b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserChangeDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java index 84d61785f..41e1c9403 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java index b64344443..2499c3ddc 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java index d0fffb9a5..af60c5a37 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.exception.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserCreateDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.user.User; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index 38c649aad..2d9615204 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.service.index.harvester; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactoryImpl; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java index 5578ec845..bb41b5392 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.service.metadata.generic; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java index c5b8f864b..aa77e4a59 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.service.resource; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java index 98fe4cf3e..096f160eb 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.service.resource; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java index 7b3a87a44..f1ad46133 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.utils; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java index 64ecc0d34..f22230068 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.utils; -import org.fairdatateam.fairdatapoint.migration.mongodb.development.resource.data.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactory; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; From 103af27dd1abeb172e924a654ad2462b93a7c800 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 16:40:08 +0200 Subject: [PATCH 30/70] fix test imports --- .../fairdatapoint/service/ping/PingServiceTest.java | 9 +++++---- .../service/rdf/StandaloneShaclValidatorTest.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java index 9f3615625..85fd3d535 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java @@ -23,10 +23,11 @@ package org.fairdatateam.fairdatapoint.service.ping; import com.fasterxml.jackson.core.JsonProcessingException; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.config.properties.PingProperties; -import org.fairdatateam.fairdatapoint.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.ping.PingProperties; +import org.fairdatateam.fairdatapoint.ping.PingService; +import org.fairdatateam.fairdatapoint.settings.Settings; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java index eaee36c57..0f8418882 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java @@ -26,7 +26,8 @@ import org.eclipse.rdf4j.model.vocabulary.SHACL; import org.eclipse.rdf4j.rio.RDFFormat; import org.eclipse.rdf4j.rio.Rio; -import org.fairdatateam.fairdatapoint.entity.exception.RdfValidationException; +import org.fairdatateam.fairdatapoint.rdf.RdfValidationException; +import org.fairdatateam.fairdatapoint.rdf.StandaloneShaclValidator; import org.junit.jupiter.api.Test; import java.io.IOException; From ab982d1899985ea755889327978a2dd1414fec8e Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:01:29 +0200 Subject: [PATCH 31/70] consistent naming for rdf.metadata tests - rename test classes and variables for consistency with main file structure - remove MetadataRepositoryTest class and move its content into GenericMetadataRdfRepositoryTest --- .../GenericMetadataRepositoryTest.java | 130 ---------- .../repository/MetadataRepositoryTest.java | 156 ------------ .../CatalogMetadataRdfRepositoryTest.java} | 16 +- .../GenericMetadataRdfRepositoryTest.java | 231 ++++++++++++++++++ 4 files changed, 238 insertions(+), 295 deletions(-) delete mode 100644 src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java delete mode 100644 src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java rename src/test/java/org/fairdatateam/fairdatapoint/{database/rdf/repository/CatalogMetadataRepositoryTest.java => rdf/metadata/CatalogMetadataRdfRepositoryTest.java} (83%) create mode 100644 src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java deleted file mode 100644 index e2da02e3d..000000000 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java +++ /dev/null @@ -1,130 +0,0 @@ -/** - * The MIT License - * Copyright © 2017 FAIR Data Team - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; - -import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; -import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.Model; -import org.eclipse.rdf4j.model.vocabulary.DCTERMS; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.Cache; -import org.springframework.cache.concurrent.ConcurrentMapCacheManager; - -import java.util.ArrayList; - -import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getLanguage; -import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.hamcrest.core.IsNull.nullValue; - -public class GenericMetadataRepositoryTest extends WebIntegrationTest { - - @Autowired - private ConcurrentMapCacheManager cacheManager; - - @Autowired - private TestRdfMetadataFixtures testMetadataFixtures; - - @Autowired - private GenericMetadataRdfRepository metadataRepository; - - @Autowired - private CatalogMetadataRdfRepository catalogMetadataRepository; - - @Test - @DisplayName("'save' should evict cache") - public void saveEvictsCache() throws MetadataRdfRepositoryException { - // GIVEN: - Model catalog = testMetadataFixtures.catalog1(); - IRI catalogUri = getUri(catalog); - Model dataset = testMetadataFixtures.c1_dataset1(); - - // AND: Compute cache - catalogMetadataRepository.getDatasetThemesForCatalog(catalogUri); - - // AND: Check if cache is full - assertThat(getCache().get(catalogUri.stringValue()), is(notNullValue())); - - // WHEN: - metadataRepository.save(new ArrayList<>(dataset), getUri(dataset)); - - // THEN: - assertThat(getCache().get(catalogUri.stringValue()), is(nullValue())); - } - - @Test - @DisplayName("'removeStatement' should evict cache") - public void removeStatementEvictsCache() throws MetadataRdfRepositoryException { - // GIVEN: - Model catalog = testMetadataFixtures.catalog1(); - IRI catalogUri = getUri(catalog); - Model dataset = testMetadataFixtures.c1_dataset1(); - - // AND: Compute cache - catalogMetadataRepository.getDatasetThemesForCatalog(catalogUri); - - // AND: Check if cache is full - assertThat(getCache().get(catalogUri.stringValue()), is(notNullValue())); - - // WHEN: - metadataRepository.removeStatement(getUri(dataset), DCTERMS.LANGUAGE, getLanguage(dataset), getUri(dataset)); - - // THEN: - assertThat(getCache().get(catalogUri.stringValue()), is(nullValue())); - } - - @Test - @DisplayName("'remove' should evict cache") - public void removeEvictsCache() throws MetadataRdfRepositoryException { - // GIVEN: - Model catalog = testMetadataFixtures.catalog1(); - IRI catalogUri = getUri(catalog); - Model dataset = testMetadataFixtures.c1_dataset1(); - - // AND: Compute cache - catalogMetadataRepository.getDatasetThemesForCatalog(catalogUri); - - // AND: Check if cache is full - assertThat(getCache().get(catalogUri.stringValue()), is(notNullValue())); - - // WHEN: - metadataRepository.remove(getUri(dataset)); - - // THEN: - assertThat(getCache().get(catalogUri.stringValue()), is(nullValue())); - } - - private Cache getCache() { - return cacheManager.getCache(CATALOG_THEMES_CACHE); - } - -} diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java deleted file mode 100644 index 12fce75db..000000000 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java +++ /dev/null @@ -1,156 +0,0 @@ -/** - * The MIT License - * Copyright © 2017 FAIR Data Team - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; - -import org.eclipse.rdf4j.model.vocabulary.DCAT; -import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; -import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.Model; -import org.eclipse.rdf4j.model.Statement; -import org.eclipse.rdf4j.model.vocabulary.DCTERMS; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsEqual.equalTo; - -public class MetadataRepositoryTest extends WebIntegrationTest { - - @Autowired - private GenericMetadataRdfRepository metadataRepository; - - @Autowired - private TestRdfMetadataFixtures testMetadataFixtures; - - @Test - public void findWorks() throws Exception { - // GIVEN: - Model metadata = testMetadataFixtures.catalog1(); - IRI context = getUri(testMetadataFixtures.catalog1()); - - // WHEN: - List result = metadataRepository.find(context); - - // THEN: - assertThat(result.size(), is(equalTo(metadata.size()))); - } - - @Test - public void findNonExistingResource() throws Exception { - // GIVEN: - IRI context = i("http://localhost/non-existing"); - - // WHEN: - List result = metadataRepository.find(context); - - // THEN: - assertThat(result.size(), is(equalTo(0))); - } - - @Test - public void findChildTitlesWorks() throws MetadataRdfRepositoryException { - // given - final IRI parent = getUri(testMetadataFixtures.catalog1()); - - // when - final Map result = metadataRepository.findChildTitles(parent, DCAT.HAS_DATASET); - - // then - assertThat(result.size(), is(greaterThan(0))); - } - - @Test - public void checkExistenceWorks() throws Exception { - // GIVEN: - Model metadata = testMetadataFixtures.catalog1(); - - // WHEN: - boolean result = metadataRepository.checkExistence(getUri(metadata), DCTERMS.LANGUAGE, getLanguage(metadata)); - - // THEN: - assertThat(result, is(equalTo(true))); - } - - @Test - public void saveWorks() throws Exception { - // GIVEN: - Model metadata = testMetadataFixtures.c1_d2_distribution3(); - IRI context = getUri(metadata); - ArrayList statements = new ArrayList<>(metadata); - - // WHEN: - metadataRepository.save(statements, context); - - // THEN: - assertThat(metadataRepository.find(context).size(), is(equalTo(28))); - } - - @Test - public void removeWorks() throws Exception { - // GIVEN: - Model metadata = testMetadataFixtures.catalog1(); - IRI context = getUri(metadata); - - // AND: Check existence before delete - assertThat(metadataRepository.find(context).size(), is(equalTo(metadata.size()))); - - // WHEN: - metadataRepository.remove(context); - - // THEN: - assertThat(metadataRepository.find(context).size(), is(equalTo(0))); - } - - @Test - public void removeStatementWorks() throws Exception { - // GIVEN: - Model metadata = testMetadataFixtures.catalog1(); - IRI context = getUri(metadata); - - // AND: Check existence before delete - assertThat(metadataRepository.find(context).size(), is(equalTo(metadata.size()))); - - // WHEN: - metadataRepository.removeStatement(getUri(metadata), DCTERMS.LANGUAGE, getLanguage(metadata), context); - - // THEN: - assertThat(metadataRepository.find(context).size(), is(equalTo(metadata.size() - 1))); - } - -} diff --git a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java similarity index 83% rename from src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java index 93a446315..c12db8301 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java @@ -20,15 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.database.rdf.repository; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.query.TupleQuery; import org.eclipse.rdf4j.query.TupleQueryResult; import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.RepositoryConnection; -import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,7 +45,7 @@ import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -public class CatalogMetadataRepositoryTest { +public class CatalogMetadataRdfRepositoryTest { private final IRI catalogUri = i("http://localhost/textmining"); @@ -71,7 +69,7 @@ public class CatalogMetadataRepositoryTest { @Spy @InjectMocks - private CatalogMetadataRdfRepository catalogMetadataRepository; + private CatalogMetadataRdfRepository catalogMetadataRdfRepository; @Test @DisplayName("Themes for catalog are in cache (no query to triple store)") @@ -81,10 +79,10 @@ public void themesInCache() throws MetadataRdfRepositoryException { when(cache.get(catalogUri.toString(), List.class)).thenReturn(Collections.emptyList()); // WHEN: - catalogMetadataRepository.getDatasetThemesForCatalog(catalogUri); + catalogMetadataRdfRepository.getDatasetThemesForCatalog(catalogUri); // THEN: - verify(catalogMetadataRepository, never()).runSparqlQueryFromFile(any(), any()); + verify(catalogMetadataRdfRepository, never()).runSparqlQueryFromFile(any(), any()); } @Test @@ -97,10 +95,10 @@ public void themesNotInCache() throws MetadataRdfRepositoryException { when(tupleQuery.evaluate()).thenReturn(tupleQueryResult); // WHEN: - catalogMetadataRepository.getDatasetThemesForCatalog(catalogUri); + catalogMetadataRdfRepository.getDatasetThemesForCatalog(catalogUri); // THEN: - verify(catalogMetadataRepository, times(1)).runSparqlQueryFromFile(any(), any()); + verify(catalogMetadataRdfRepository, times(1)).runSparqlQueryFromFile(any(), any()); } } diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java new file mode 100644 index 000000000..e4de548e4 --- /dev/null +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java @@ -0,0 +1,231 @@ +/** + * The MIT License + * Copyright © 2017 FAIR Data Team + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.fairdatateam.fairdatapoint.rdf.metadata; + +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.vocabulary.DCAT; +import org.fairdatateam.fairdatapoint.WebIntegrationTest; +import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.vocabulary.DCTERMS; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.Cache; +import org.springframework.cache.concurrent.ConcurrentMapCacheManager; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getLanguage; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.hamcrest.core.IsNull.nullValue; + +public class GenericMetadataRdfRepositoryTest extends WebIntegrationTest { + + @Autowired + private ConcurrentMapCacheManager cacheManager; + + @Autowired + private TestRdfMetadataFixtures testMetadataFixtures; + + @Autowired + private GenericMetadataRdfRepository genericMetadataRdfRepository; + + @Autowired + private CatalogMetadataRdfRepository catalogMetadataRdfRepository; + + @Test + @DisplayName("'save' should evict cache") + public void saveEvictsCache() throws MetadataRdfRepositoryException { + // GIVEN: + Model catalog = testMetadataFixtures.catalog1(); + IRI catalogUri = getUri(catalog); + Model dataset = testMetadataFixtures.c1_dataset1(); + + // AND: Compute cache + catalogMetadataRdfRepository.getDatasetThemesForCatalog(catalogUri); + + // AND: Check if cache is full + assertThat(getCache().get(catalogUri.stringValue()), is(notNullValue())); + + // WHEN: + genericMetadataRdfRepository.save(new ArrayList<>(dataset), getUri(dataset)); + + // THEN: + assertThat(getCache().get(catalogUri.stringValue()), is(nullValue())); + } + + @Test + @DisplayName("'removeStatement' should evict cache") + public void removeStatementEvictsCache() throws MetadataRdfRepositoryException { + // GIVEN: + Model catalog = testMetadataFixtures.catalog1(); + IRI catalogUri = getUri(catalog); + Model dataset = testMetadataFixtures.c1_dataset1(); + + // AND: Compute cache + catalogMetadataRdfRepository.getDatasetThemesForCatalog(catalogUri); + + // AND: Check if cache is full + assertThat(getCache().get(catalogUri.stringValue()), is(notNullValue())); + + // WHEN: + genericMetadataRdfRepository.removeStatement(getUri(dataset), DCTERMS.LANGUAGE, getLanguage(dataset), getUri(dataset)); + + // THEN: + assertThat(getCache().get(catalogUri.stringValue()), is(nullValue())); + } + + @Test + @DisplayName("'remove' should evict cache") + public void removeEvictsCache() throws MetadataRdfRepositoryException { + // GIVEN: + Model catalog = testMetadataFixtures.catalog1(); + IRI catalogUri = getUri(catalog); + Model dataset = testMetadataFixtures.c1_dataset1(); + + // AND: Compute cache + catalogMetadataRdfRepository.getDatasetThemesForCatalog(catalogUri); + + // AND: Check if cache is full + assertThat(getCache().get(catalogUri.stringValue()), is(notNullValue())); + + // WHEN: + genericMetadataRdfRepository.remove(getUri(dataset)); + + // THEN: + assertThat(getCache().get(catalogUri.stringValue()), is(nullValue())); + } + + private Cache getCache() { + return cacheManager.getCache(CATALOG_THEMES_CACHE); + } + + // The following tests were moved here from the existing MetadataRepositoryTest class, which was then removed. + + @Test + public void findWorks() throws Exception { + // GIVEN: + Model metadata = testMetadataFixtures.catalog1(); + IRI context = getUri(testMetadataFixtures.catalog1()); + + // WHEN: + List result = genericMetadataRdfRepository.find(context); + + // THEN: + assertThat(result.size(), is(equalTo(metadata.size()))); + } + + @Test + public void findNonExistingResource() throws Exception { + // GIVEN: + IRI context = i("http://localhost/non-existing"); + + // WHEN: + List result = genericMetadataRdfRepository.find(context); + + // THEN: + assertThat(result.size(), is(equalTo(0))); + } + + @Test + public void findChildTitlesWorks() throws MetadataRdfRepositoryException { + // given + final IRI parent = getUri(testMetadataFixtures.catalog1()); + + // when + final Map result = genericMetadataRdfRepository.findChildTitles(parent, DCAT.HAS_DATASET); + + // then + assertThat(result.size(), is(greaterThan(0))); + } + + @Test + public void checkExistenceWorks() throws Exception { + // GIVEN: + Model metadata = testMetadataFixtures.catalog1(); + + // WHEN: + boolean result = genericMetadataRdfRepository.checkExistence(getUri(metadata), DCTERMS.LANGUAGE, getLanguage(metadata)); + + // THEN: + assertThat(result, is(equalTo(true))); + } + + @Test + public void saveWorks() throws Exception { + // GIVEN: + Model metadata = testMetadataFixtures.c1_d2_distribution3(); + IRI context = getUri(metadata); + ArrayList statements = new ArrayList<>(metadata); + + // WHEN: + genericMetadataRdfRepository.save(statements, context); + + // THEN: + assertThat(genericMetadataRdfRepository.find(context).size(), is(equalTo(28))); + } + + @Test + public void removeWorks() throws Exception { + // GIVEN: + Model metadata = testMetadataFixtures.catalog1(); + IRI context = getUri(metadata); + + // AND: Check existence before delete + assertThat(genericMetadataRdfRepository.find(context).size(), is(equalTo(metadata.size()))); + + // WHEN: + genericMetadataRdfRepository.remove(context); + + // THEN: + assertThat(genericMetadataRdfRepository.find(context).size(), is(equalTo(0))); + } + + @Test + public void removeStatementWorks() throws Exception { + // GIVEN: + Model metadata = testMetadataFixtures.catalog1(); + IRI context = getUri(metadata); + + // AND: Check existence before delete + assertThat(genericMetadataRdfRepository.find(context).size(), is(equalTo(metadata.size()))); + + // WHEN: + genericMetadataRdfRepository.removeStatement(getUri(metadata), DCTERMS.LANGUAGE, getLanguage(metadata), context); + + // THEN: + assertThat(genericMetadataRdfRepository.find(context).size(), is(equalTo(metadata.size() - 1))); + } + +} From 0de11e650d0c246e845bd41b58e00bcf70c74062 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:04:22 +0200 Subject: [PATCH 32/70] fix HarvesterServiceTest variable names --- .../service/index/harvester/HarvesterServiceTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java index b2b4fa404..fe0e10bc5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java @@ -99,7 +99,7 @@ public void harvestSucceeded() throws MetadataRdfRepositoryException { // THEN: mockRemoteServer.verify(); - verify(genericMetadataRepository, times(2)).save(anyList(), eq(i(repositoryUrl))); + verify(genericMetadataRdfRepository, times(2)).save(anyList(), eq(i(repositoryUrl))); } @Test @@ -115,7 +115,7 @@ public void harvestFailedDueToServerError() throws MetadataRdfRepositoryExceptio // THEN: mockRemoteServer.verify(); - verify(genericMetadataRepository, never()).save(any(), any()); + verify(genericMetadataRdfRepository, never()).save(any(), any()); } @Test @@ -132,7 +132,7 @@ public void harvestFailedForLinkedChildren() throws MetadataRdfRepositoryExcepti // THEN: mockRemoteServer.verify(); - verify(genericMetadataRepository, times(1)).save(anyList(), eq(i(repositoryUrl))); + verify(genericMetadataRdfRepository, times(1)).save(anyList(), eq(i(repositoryUrl))); } private void mockEndpoint(String url, Model body) { From 9f32a04dd3e2f703b0d848a89fcbbe28f54db352 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:08:46 +0200 Subject: [PATCH 33/70] consistent naming of index test package --- .../index/harvester => index}/HarvesterServiceTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{service/index/harvester => index}/HarvesterServiceTest.java (97%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java similarity index 97% rename from src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java index fe0e10bc5..c45414549 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.index.harvester; +package org.fairdatateam.fairdatapoint.index; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; @@ -28,7 +28,6 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.index.HarvesterService; import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.Model; import org.junit.jupiter.api.BeforeEach; From 7bebd5b543b12582f4c20b977b788ba3808d12e6 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:16:42 +0200 Subject: [PATCH 34/70] move SemVer* classes into util package this makes more sense than rdf.schema where they came from originally --- .../migration/mongodb/development/MetadataSchemaFixtures.java | 2 +- .../mongodb/production/Migration_0012_MetadataSchemas.java | 2 +- .../mongodb/production/Migration_0015_FixMetadataVersion.java | 2 +- .../fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java | 1 + .../fairdatapoint/rdf/schema/MetadataSchemaMapper.java | 1 + .../fairdatapoint/rdf/schema/MetadataSchemaService.java | 1 + .../fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java | 2 +- .../org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java | 2 +- .../fairdatateam/fairdatapoint/{rdf/schema => util}/SemVer.java | 2 +- .../fairdatapoint/{rdf/schema => util}/SemVerValidator.java | 2 +- .../fairdatapoint/{rdf/schema => util}/ValidSemVer.java | 2 +- .../fairdatapoint/acceptance/schema/Public_GET.java | 2 +- .../fairdatateam/fairdatapoint/entity/schema/SemVerTest.java | 2 +- 13 files changed, 13 insertions(+), 10 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{rdf/schema => util}/SemVer.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{rdf/schema => util}/SemVerValidator.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{rdf/schema => util}/ValidSemVer.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java index 0fcd8d443..18e56733c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java index 00338417e..330078dcf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java @@ -29,7 +29,7 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaShaclUtils; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java index 867a22a21..0efa8f440 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java @@ -29,7 +29,7 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java index e5aa6856a..18d8f34a6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java @@ -26,6 +26,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; import org.bson.types.ObjectId; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.annotation.Transient; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java index 0c3a99826..eb2602cc9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java @@ -23,6 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.schema; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index 1d7d8dac7..24d4d0f48 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java @@ -31,6 +31,7 @@ import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java index 551a6d225..d5c68141a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java @@ -27,7 +27,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.rdf.schema.ValidSemVer; +import org.fairdatateam.fairdatapoint.util.ValidSemVer; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java index 304dae5f5..67c18e323 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/util/SemVer.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVer.java rename to src/main/java/org/fairdatateam/fairdatapoint/util/SemVer.java index 3a1aea07c..4f8d5a0f3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/SemVer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.rdf.schema; +package org.fairdatateam.fairdatapoint.util; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVerValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/util/SemVerValidator.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVerValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/util/SemVerValidator.java index bb636ce51..5739a4736 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/SemVerValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/SemVerValidator.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.rdf.schema; +package org.fairdatateam.fairdatapoint.util; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/ValidSemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/util/ValidSemVer.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/ValidSemVer.java rename to src/main/java/org/fairdatateam/fairdatapoint/util/ValidSemVer.java index ca3e7a331..80c327224 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/ValidSemVer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/ValidSemVer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.rdf.schema; +package org.fairdatateam.fairdatapoint.util; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java index d552a8a6a..692b05859 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java index d8f3ce590..39ce41425 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.entity.schema; -import org.fairdatateam.fairdatapoint.rdf.schema.SemVer; +import org.fairdatateam.fairdatapoint.util.SemVer; import org.junit.jupiter.api.Test; import java.util.Arrays; From 6aaa9da5aebba576086f52549dd268177e0376ec Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:32:51 +0200 Subject: [PATCH 35/70] move SemVerTest into new util test package for consistency --- .../fairdatapoint/{entity/schema => util}/SemVerTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{entity/schema => util}/SemVerTest.java (96%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java similarity index 96% rename from src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java index 39ce41425..10786811c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.entity.schema; +package org.fairdatateam.fairdatapoint.util; -import org.fairdatateam.fairdatapoint.util.SemVer; import org.junit.jupiter.api.Test; import java.util.Arrays; From 273bc95ff12eb8d91a0459e4f16466cebec466ee Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:20:46 +0200 Subject: [PATCH 36/70] rename test utils package to testutils to clarify that it contains test utilities and to disambiguate from the util package --- .../fairdatapoint/acceptance/general/SecurityTest.java | 2 +- .../acceptance/index/admin/List_Trigger_POST.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_All_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_GET.java | 4 ++-- .../fairdatapoint/acceptance/index/entry/List_Info_GET.java | 2 +- .../fairdatapoint/acceptance/index/ping/List_POST.java | 2 +- .../fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java | 2 +- .../fairdatapoint/acceptance/metadata/catalog/List_POST.java | 2 +- .../fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java | 2 +- .../fairdatapoint/acceptance/metadata/dataset/List_POST.java | 2 +- .../acceptance/metadata/distribution/Detail_PUT.java | 2 +- .../acceptance/metadata/distribution/List_POST.java | 2 +- .../acceptance/metadata/repository/Detail_PUT.java | 2 +- .../rdf/metadata/GenericMetadataRdfRepositoryTest.java | 2 +- .../metadata/catalog/CatalogMetadataServiceMockTest.java | 2 +- .../service/metadata/generic/GenericMetadataServiceTest.java | 4 ++-- .../fairdatapoint/service/search/SearchServiceTest.java | 2 +- .../fairdatapoint/{utils => testutils}/AuthHelper.java | 2 +- .../fairdatapoint/{utils => testutils}/CustomPageImpl.java | 2 +- .../fairdatapoint/{utils => testutils}/HttpUtilTest.java | 2 +- .../{utils => testutils}/TestIndexEntryFixtures.java | 2 +- .../{utils => testutils}/TestRdfMetadataFixtures.java | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{utils => testutils}/AuthHelper.java (97%) rename src/test/java/org/fairdatateam/fairdatapoint/{utils => testutils}/CustomPageImpl.java (97%) rename src/test/java/org/fairdatateam/fairdatapoint/{utils => testutils}/HttpUtilTest.java (98%) rename src/test/java/org/fairdatateam/fairdatapoint/{utils => testutils}/TestIndexEntryFixtures.java (98%) rename src/test/java/org/fairdatateam/fairdatapoint/{utils => testutils}/TestRdfMetadataFixtures.java (99%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java index 33b40a230..d9f6b4967 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 7b66b2ed3..1b037149d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; -import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index c8292cd03..30b4cd021 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index 3d237de1d..d96e6aa88 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -27,8 +27,8 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.utils.CustomPageImpl; -import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testutils.CustomPageImpl; +import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java index 903ab427e..2daca9056 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java index e70f4f7be..f2e76cac3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java index 96078fecc..27b6aff0b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java index db03cda14..e448e9715 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataMigration; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java index 0afe14903..54c46a336 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java index 8fd47c335..0c5e74784 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java index 631af56ae..8282c73bf 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java index 424480a51..0a5deb61d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java index 9fd4dedea..dc79de80d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java index e4de548e4..cf16efb75 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java @@ -25,7 +25,7 @@ import org.eclipse.rdf4j.model.Statement; import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.DCTERMS; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java index c75369670..9b400eea3 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataRdfRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataService; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Statement; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java index bb41b5392..6c90342c7 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java @@ -28,8 +28,8 @@ import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; -import org.fairdatateam.fairdatapoint.utils.AuthHelper; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.AuthHelper; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java index a96c5438a..5959c1b6c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java @@ -29,7 +29,7 @@ import org.fairdatateam.fairdatapoint.search.SearchFilterValue; import org.fairdatateam.fairdatapoint.search.SearchResult; import org.fairdatateam.fairdatapoint.search.SearchService; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/testutils/AuthHelper.java similarity index 97% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java rename to src/test/java/org/fairdatateam/fairdatapoint/testutils/AuthHelper.java index f1ad46133..10df4803c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testutils/AuthHelper.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.utils; +package org.fairdatateam.fairdatapoint.testutils; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/CustomPageImpl.java b/src/test/java/org/fairdatateam/fairdatapoint/testutils/CustomPageImpl.java similarity index 97% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/CustomPageImpl.java rename to src/test/java/org/fairdatateam/fairdatapoint/testutils/CustomPageImpl.java index 45773bdd7..fd1d7b068 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/CustomPageImpl.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testutils/CustomPageImpl.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.utils; +package org.fairdatateam.fairdatapoint.testutils; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/HttpUtilTest.java b/src/test/java/org/fairdatateam/fairdatapoint/testutils/HttpUtilTest.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/HttpUtilTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/testutils/HttpUtilTest.java index d8487e7c3..81cb501af 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/HttpUtilTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testutils/HttpUtilTest.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.utils; +package org.fairdatateam.fairdatapoint.testutils; import jakarta.servlet.http.HttpServletRequest; import org.eclipse.rdf4j.model.IRI; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestIndexEntryFixtures.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/testutils/TestIndexEntryFixtures.java index a73bbe575..ce82a8b5b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestIndexEntryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.utils; +package org.fairdatateam.fairdatapoint.testutils; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestRdfMetadataFixtures.java similarity index 99% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/testutils/TestRdfMetadataFixtures.java index f22230068..caa40f7b6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestRdfMetadataFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.utils; +package org.fairdatateam.fairdatapoint.testutils; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; From 17bbc2d787ed2f5a95f456e994dc73ee69b989ae Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:29:29 +0200 Subject: [PATCH 37/70] move HttpUtilTest into new util test package consistent with main file structure --- .../fairdatapoint/{testutils => util}/HttpUtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/test/java/org/fairdatateam/fairdatapoint/{testutils => util}/HttpUtilTest.java (98%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/testutils/HttpUtilTest.java b/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/testutils/HttpUtilTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java index 81cb501af..2d03c4c8b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/testutils/HttpUtilTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.testutils; +package org.fairdatateam.fairdatapoint.util; import jakarta.servlet.http.HttpServletRequest; import org.eclipse.rdf4j.model.IRI; From 3f42125c95076f547424f84027a2f3da39ac8745 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:41:41 +0200 Subject: [PATCH 38/70] move metadata service tests into rdf.metadata test package consistent with main file structure --- .../metadata/CatalogMetadataServiceTest.java} | 7 ++----- .../metadata}/GenericMetadataServiceTest.java | 3 +-- .../metadata}/MetricsMetadataServiceTest.java | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{service/metadata/catalog/CatalogMetadataServiceMockTest.java => rdf/metadata/CatalogMetadataServiceTest.java} (90%) rename src/test/java/org/fairdatateam/fairdatapoint/{service/metadata/generic => rdf/metadata}/GenericMetadataServiceTest.java (98%) rename src/test/java/org/fairdatateam/fairdatapoint/{service/metadata/metric => rdf/metadata}/MetricsMetadataServiceTest.java (92%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java similarity index 90% rename from src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java index 9b400eea3..19a58af93 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java @@ -20,12 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.catalog; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.rdf.metadata.CatalogMetadataService; -import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; @@ -51,7 +48,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -public class CatalogMetadataServiceMockTest extends BaseIntegrationTest { +public class CatalogMetadataServiceTest extends BaseIntegrationTest { @Autowired private TestRdfMetadataFixtures testMetadataFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java index 6c90342c7..fc18a386d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java @@ -20,14 +20,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.metadata.generic; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataService; import org.fairdatateam.fairdatapoint.testutils.AuthHelper; import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java similarity index 92% rename from src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java index 153fd966e..19574c6af 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java @@ -25,12 +25,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.service.metadata.metric; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.rdf.metadata.Metric; import org.eclipse.rdf4j.model.IRI; -import org.fairdatateam.fairdatapoint.rdf.metadata.MetricsMetadataService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; From 38d38dcbec90794c037d79185e2874769d51af61 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:42:53 +0200 Subject: [PATCH 39/70] move ping service test into ping test package consistent with main file structure --- .../fairdatapoint/{service => }/ping/PingServiceTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{service => }/ping/PingServiceTest.java (95%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java similarity index 95% rename from src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java index 85fd3d535..a1ba6b27b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java @@ -20,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.ping; +package org.fairdatateam.fairdatapoint.ping; import com.fasterxml.jackson.core.JsonProcessingException; import org.fairdatateam.fairdatapoint.config.InstanceProperties; -import org.fairdatateam.fairdatapoint.ping.PingProperties; -import org.fairdatateam.fairdatapoint.ping.PingService; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.junit.jupiter.api.BeforeEach; From d050dd878b48225b5a150122cae0773bf8f511cf Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:45:03 +0200 Subject: [PATCH 40/70] move StandaloneShaclValidator into rdf test package consistent with main file structure --- .../{service => }/rdf/StandaloneShaclValidatorTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{service => }/rdf/StandaloneShaclValidatorTest.java (95%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidatorTest.java similarity index 95% rename from src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidatorTest.java index 0f8418882..fd46dc528 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidatorTest.java @@ -20,14 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.rdf; +package org.fairdatateam.fairdatapoint.rdf; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.SHACL; import org.eclipse.rdf4j.rio.RDFFormat; import org.eclipse.rdf4j.rio.Rio; -import org.fairdatateam.fairdatapoint.rdf.RdfValidationException; -import org.fairdatateam.fairdatapoint.rdf.StandaloneShaclValidator; import org.junit.jupiter.api.Test; import java.io.IOException; From 27a48364e1262489099ed4fb942df8c99f825405 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:46:40 +0200 Subject: [PATCH 41/70] move ResourceDefinition tests into resource test package consistent with main file structure --- .../{service => }/resource/ResourceDefinitionCacheTest.java | 5 +---- .../resource/ResourceDefinitionValidatorTest.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{service => }/resource/ResourceDefinitionCacheTest.java (93%) rename src/test/java/org/fairdatateam/fairdatapoint/{service => }/resource/ResourceDefinitionValidatorTest.java (98%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCacheTest.java similarity index 93% rename from src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCacheTest.java index aa77e4a59..9eb2f1b49 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCacheTest.java @@ -20,13 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.resource; +package org.fairdatateam.fairdatapoint.resource; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java index 096f160eb..aa0e0b362 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java @@ -20,10 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.resource; +package org.fairdatateam.fairdatapoint.resource; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; From 7f4614beed5185b5a0f6221172e33f46e3666751 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:49:08 +0200 Subject: [PATCH 42/70] move SearchServiceTest into search test package consistent with main file structure --- .../{service => }/search/SearchServiceTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{service => }/search/SearchServiceTest.java (92%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java similarity index 92% rename from src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java index 5959c1b6c..e686f23a6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java @@ -20,15 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.service.search; +package org.fairdatateam.fairdatapoint.search; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.search.SearchFilterValue; -import org.fairdatateam.fairdatapoint.search.SearchResult; -import org.fairdatateam.fairdatapoint.search.SearchService; import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; From 5256d822ef163e751deef3300f15f06d91d87481 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 09:26:56 +0200 Subject: [PATCH 43/70] move CustomPageImpl from testutils into acceptance.index.entry where it is used --- .../{testutils => acceptance/index/entry}/CustomPageImpl.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_GET.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{testutils => acceptance/index/entry}/CustomPageImpl.java (97%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/testutils/CustomPageImpl.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/CustomPageImpl.java similarity index 97% rename from src/test/java/org/fairdatateam/fairdatapoint/testutils/CustomPageImpl.java rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/CustomPageImpl.java index fd1d7b068..a9bd0bdee 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/testutils/CustomPageImpl.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/CustomPageImpl.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.testutils; +package org.fairdatateam.fairdatapoint.acceptance.index.entry; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index d96e6aa88..42b5dcd3e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -27,7 +27,6 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.testutils.CustomPageImpl; import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From 83b773fd924ff2dc92efbd715c5d48c7d5b6b761 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 09:28:21 +0200 Subject: [PATCH 44/70] move AuthHelper into rdf.metadata test package where it is used --- .../fairdatapoint/{testutils => rdf/metadata}/AuthHelper.java | 2 +- .../fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{testutils => rdf/metadata}/AuthHelper.java (97%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/testutils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/AuthHelper.java similarity index 97% rename from src/test/java/org/fairdatateam/fairdatapoint/testutils/AuthHelper.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/AuthHelper.java index 10df4803c..ac6e2ac4c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/testutils/AuthHelper.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/AuthHelper.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.testutils; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java index fc18a386d..99d5baf91 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java @@ -27,7 +27,6 @@ import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.testutils.AuthHelper; import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; From 135724acf29578911de91de4b2aef589c8094dab Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 09:30:17 +0200 Subject: [PATCH 45/70] rename testutils to testfixtures --- .../fairdatapoint/acceptance/general/SecurityTest.java | 2 +- .../fairdatapoint/acceptance/index/admin/List_Trigger_POST.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_All_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_Info_GET.java | 2 +- .../fairdatapoint/acceptance/index/ping/List_POST.java | 2 +- .../fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java | 2 +- .../fairdatapoint/acceptance/metadata/catalog/List_POST.java | 2 +- .../fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java | 2 +- .../fairdatapoint/acceptance/metadata/dataset/List_POST.java | 2 +- .../acceptance/metadata/distribution/Detail_PUT.java | 2 +- .../acceptance/metadata/distribution/List_POST.java | 2 +- .../acceptance/metadata/repository/Detail_PUT.java | 2 +- .../fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java | 2 +- .../rdf/metadata/GenericMetadataRdfRepositoryTest.java | 2 +- .../fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java | 2 +- .../fairdatateam/fairdatapoint/search/SearchServiceTest.java | 2 +- .../{testutils => testfixtures}/TestIndexEntryFixtures.java | 2 +- .../{testutils => testfixtures}/TestRdfMetadataFixtures.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{testutils => testfixtures}/TestIndexEntryFixtures.java (98%) rename src/test/java/org/fairdatateam/fairdatapoint/{testutils => testfixtures}/TestRdfMetadataFixtures.java (99%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java index d9f6b4967..16f783cef 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ApiKeyFixtures; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 1b037149d..42def924c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; -import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index 30b4cd021..ea3b9b0c0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index 42b5dcd3e..6437bcd3a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java index 2daca9056..48cd8f5eb 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java index f2e76cac3..35b19d4e8 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.testutils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java index 27b6aff0b..05efcd914 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java index e448e9715..c4ebe44d1 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataMigration; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java index 54c46a336..3cfea2fbe 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java index 0c5e74784..fff40b723 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java index 8282c73bf..4c98666ee 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java index 0a5deb61d..0f3918fe6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java index dc79de80d..989196536 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java index 19a58af93..6c5f18827 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Statement; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java index cf16efb75..4e6016d9d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java @@ -25,7 +25,7 @@ import org.eclipse.rdf4j.model.Statement; import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.DCTERMS; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java index 99d5baf91..444c5ba86 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.exception.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java index e686f23a6..02e7723ce 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java @@ -26,7 +26,7 @@ import org.eclipse.rdf4j.model.Model; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.testutils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/testutils/TestIndexEntryFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java index ce82a8b5b..aa2e56222 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestIndexEntryFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.testutils; +package org.fairdatateam.fairdatapoint.testfixtures; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestRdfMetadataFixtures.java similarity index 99% rename from src/test/java/org/fairdatateam/fairdatapoint/testutils/TestRdfMetadataFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestRdfMetadataFixtures.java index caa40f7b6..73961a51e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/testutils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestRdfMetadataFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.testutils; +package org.fairdatateam.fairdatapoint.testfixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; From 55887b3942e270196d7483fdcd5947f7a557b0d2 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 09:32:48 +0200 Subject: [PATCH 46/70] move testIndexEntryFixtures into acceptance.index --- .../index}/TestIndexEntryFixtures.java | 2 +- .../fairdatapoint/acceptance/index/admin/List_Trigger_POST.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_All_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_Info_GET.java | 2 +- .../fairdatapoint/acceptance/index/ping/List_POST.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{testfixtures => acceptance/index}/TestIndexEntryFixtures.java (98%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/TestIndexEntryFixtures.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/TestIndexEntryFixtures.java index aa2e56222..8d88cfef1 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/TestIndexEntryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.testfixtures; +package org.fairdatateam.fairdatapoint.acceptance.index; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 42def924c..8c4935436 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; -import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index ea3b9b0c0..e09ebc1b7 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index 6437bcd3a..fabdc2545 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java index 48cd8f5eb..3e1ca50ce 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java index 35b19d4e8..166888e90 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; From 26cd43631be59c34c107c83a95bdddc69f9caa79 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 11:41:02 +0200 Subject: [PATCH 47/70] todo RdfMetadataFixtures --- .../migration/triplestore/development/RdfMetadataFixtures.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java index 30a3ca9a1..41ea8513e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java @@ -101,6 +101,7 @@ public Model catalog1(String fdpUrl, IRI fdp) { "catalog-1", Arrays.asList(THEME_THEATRE, THEME_EXAMPLE), fdpUrl, + // TODO: change catalogX method signatures to catalogX(String fdpUrl) and replace `fdp` by `i(fdpUrl)` fdp ); } From 6f878e14c93b6a741a45f28af549c34976b53326 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 11:42:03 +0200 Subject: [PATCH 48/70] replace TestRdfMetadataFixtures by RdfMetadataFixtures in SearchServiceTest --- .../fairdatapoint/search/SearchServiceTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java index 02e7723ce..eb9ea1bee 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java @@ -25,8 +25,8 @@ import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -40,16 +40,19 @@ public class SearchServiceTest extends BaseIntegrationTest { + @Autowired + private String persistentUrl; + @Autowired private SearchService searchService; @Autowired - private TestRdfMetadataFixtures testMetadataFixtures; + private RdfMetadataFixtures rdfMetadataFixtures; @Test public void findByLiteralWorks() throws MetadataRdfRepositoryException { // given - final Model catalog1 = testMetadataFixtures.catalog1(); + final Model catalog1 = rdfMetadataFixtures.catalog1(persistentUrl, i(persistentUrl)); final Literal title = getTitle(catalog1); // when From ab0460535710922a763e6950c7857f3970785235 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 11:47:32 +0200 Subject: [PATCH 49/70] Revert "move testIndexEntryFixtures into acceptance.index" This reverts commit 55887b3942e270196d7483fdcd5947f7a557b0d2. because it turns out we cannot easily move the other fixtures into the acceptance test package, so better to keep them both in one place... --- .../fairdatapoint/acceptance/index/admin/List_Trigger_POST.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_All_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_Info_GET.java | 2 +- .../fairdatapoint/acceptance/index/ping/List_POST.java | 2 +- .../index => testfixtures}/TestIndexEntryFixtures.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{acceptance/index => testfixtures}/TestIndexEntryFixtures.java (98%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 8c4935436..42def924c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; -import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index e09ebc1b7..ea3b9b0c0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index fabdc2545..6437bcd3a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java index 3e1ca50ce..48cd8f5eb 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java index 166888e90..35b19d4e8 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.acceptance.index.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/TestIndexEntryFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java index 8d88cfef1..aa2e56222 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/TestIndexEntryFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.acceptance.index; +package org.fairdatateam.fairdatapoint.testfixtures; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; From 91d24e09e549bf348ce21062d5e6e5720eb90255 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 12:37:18 +0200 Subject: [PATCH 50/70] fix @PreAuthorize for AbstractMetadataService.update - fix fully qualified reference to Metadata class in @PreAuthorize - use SpEL Type T() to ensure that the existence of the class is checked https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/types.html --- .../fairdatapoint/rdf/metadata/AbstractMetadataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index 880f2747d..188fee417 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -127,7 +127,7 @@ public Model store( @Override @PreAuthorize(""" hasPermission(#uri.stringValue(), - 'org.fairdatateam.fairdatapoint.entity.metadata.Metadata', 'WRITE') + T(org.fairdatateam.fairdatapoint.rdf.metadata.Metadata).getName(), 'WRITE') or hasRole('ADMIN') """) public Model update( From 783583fefe570537d58919dc8d78d39cb16cd49c Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 12:40:47 +0200 Subject: [PATCH 51/70] clarify test names for catalog/dataset/distribution PUT --- .../fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java | 4 ++-- .../fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java | 4 ++-- .../acceptance/metadata/distribution/Detail_PUT.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java index 05efcd914..8735ceddf 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java @@ -74,8 +74,8 @@ private String reqDto() { } @Test - @DisplayName("HTTP 200") - public void res200() { + @DisplayName("HTTP 200: User is owner") + public void res200_owner() { create_res200(ALBERT_TOKEN); } diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java index 3cfea2fbe..5a76cf620 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java @@ -74,8 +74,8 @@ private String reqDto(Model dataset) { } @Test - @DisplayName("HTTP 200") - public void res200() { + @DisplayName("HTTP 200: User is owner") + public void res200_owner() { create_res200(ALBERT_TOKEN); } diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java index 4c98666ee..b70e0083a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java @@ -74,8 +74,8 @@ private String reqDto(Model distribution) { } @Test - @DisplayName("HTTP 200") - public void res200() { + @DisplayName("HTTP 200: User is owner") + public void res200_owner() { create_res200(ALBERT_TOKEN); } From c89b33767b53bd2b14f1d2d678ca287e0d8c6a67 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 14:01:29 +0200 Subject: [PATCH 52/70] fix User class path in migration 0001 --- .../migration/mongodb/production/Migration_0001_Init.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java index fb14b6297..c062c7ed6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java @@ -74,7 +74,7 @@ private Document createUser(String uuid, String firstName, String lastName, Stri user.append("email", email); user.append("passwordHash", "$2a$10$t2foZfp7cZFQo2u/33ZqTu2WNitBqYd2EY2tQO0/rBUdf8QfsAxyW"); user.append("role", role); - user.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.users.User"); + user.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.user.User"); return user; } From 1e5b70555978e9af41e76ff4074a9ad17273e8dc Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 15:03:03 +0200 Subject: [PATCH 53/70] restore old package names in _class and className values in migration files migration content should not change, obviously we need a new migration to update these values to the new package names --- .../migration/mongodb/production/Migration_0001_Init.java | 4 ++-- .../mongodb/production/Migration_0002_CustomMetamodel.java | 4 ++-- .../mongodb/production/Migration_0004_ResourceDefinition.java | 4 ++-- .../mongodb/production/Migration_0011_ComplyFDPO.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java index c062c7ed6..42ec2f6df 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java @@ -74,7 +74,7 @@ private Document createUser(String uuid, String firstName, String lastName, Stri user.append("email", email); user.append("passwordHash", "$2a$10$t2foZfp7cZFQo2u/33ZqTu2WNitBqYd2EY2tQO0/rBUdf8QfsAxyW"); user.append("role", role); - user.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.user.User"); + user.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.user.User"); return user; } @@ -103,7 +103,7 @@ private Document createMembership(String uuid, String name, boolean owner) { } membership.append(FIELD_PERMISSIONS, permissions); membership.append("allowedEntities", allowedEntities); - membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.security.membership.Membership"); + membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.membership.Membership"); return membership; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java index 9b7881ae5..7b311e79d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java @@ -53,7 +53,7 @@ public void run(MongoDatabase database) { private void updateAcl(MongoDatabase database) { final MongoCollection aclCol = database.getCollection("ACL"); aclCol.updateMany( - new Document(), combine(set("className", "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata")) + new Document(), combine(set("className", "org.fairdatateam.fairdatapoint.entity.metadata.Metadata")) ); } @@ -133,7 +133,7 @@ private Document createDefinition(String uuid, String name, String prefix, Strin definition.append("child", child); definition.append("parentResourceDefinitionUuid", parentUuid); definition.append("childResourceDefinitionUuid", childUuid); - definition.append("_class", "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"); + definition.append("_class", "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition"); return definition; } } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java index 29e7b7d01..38ac33748 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java @@ -176,7 +176,7 @@ private Document createDefinition(String uuid, String name, String prefix, List< definition.append("targetClassUris", classes); definition.append("children", children); definition.append("externalLinks", links); - definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"); + definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition"); return definition; } @@ -205,7 +205,7 @@ private Document createMembership(String uuid, String name, boolean owner) { } membership.append(FIELD_PERMISSIONS, permissions); membership.append("allowedEntities", allowedEntities); - membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.security.membership.Membership"); + membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.membership.Membership"); return membership; } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java index ff4a49ea6..5a8ef7fe9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java @@ -132,7 +132,7 @@ private Document fdpResourceDefinition() { // External Links definition.append("externalLinks", List.of()); - definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"); + definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition"); return definition; } } From 3aa245266bb91bce8d251d1a69720c3fa76b666d Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 19 Aug 2026 17:58:45 +0200 Subject: [PATCH 54/70] add migration 0021 to update class names in existing mongo repos (wip) --- .../Migration_0021_UpdateClassNames.java | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java new file mode 100644 index 000000000..e008efd9d --- /dev/null +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java @@ -0,0 +1,132 @@ +/** + * The MIT License + * Copyright © 2017 FAIR Data Team + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.fairdatateam.fairdatapoint.migration.mongodb.production; + +import com.mongodb.client.MongoCollection; +import io.mongock.api.annotations.ChangeUnit; +import io.mongock.api.annotations.Execution; +import io.mongock.api.annotations.RollbackExecution; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.bson.Document; +import org.bson.conversions.Bson; +import org.fairdatateam.fairdatapoint.Profiles; +import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.springframework.context.annotation.Profile; +import org.springframework.data.mongodb.core.MongoTemplate; + +import java.util.List; +import java.util.Map; + +import static com.mongodb.client.model.Filters.*; +import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Updates.set; + +/** + * This migration updates existing _class and ACL.className fields to the new package names. + * Note that _class fields are automatically added by + * Spring Data MongoDB. + */ +@Slf4j +@ChangeUnit( + id = "Migration_0021_UpdateClassNames", + order = "0021", + author = "migrationBot" +) +@Profile(Profiles.PRODUCTION) +public class Migration_0021_UpdateClassNames { + + private static final Map> COLLECTIONS = Map.of( + "ACL", List.of( + // this case applies to the className field instead of the _class field + "org.fairdatateam.fairdatapoint.entity.metadata.Metadata", + "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata" + ), + "apiKey", List.of( + "org.fairdatateam.fairdatapoint.entity.apikey.ApiKey", + "org.fairdatateam.fairdatapoint.security.apikey.ApiKey" + ), + "indexEntry", List.of( + "org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry", + "org.fairdatateam.fairdatapoint.index.entry.IndexEntry" + ), + "membership", List.of( + "org.fairdatateam.fairdatapoint.entity.membership.Membership", + "org.fairdatateam.fairdatapoint.security.membership.Membership" + ), + "metadata", List.of( + "org.fairdatateam.fairdatapoint.entity.metadata.Metadata", + "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata" + ), + "metadataSchema", List.of( + "org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema", + "org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema" + ), + "resourceDefinition", List.of( + "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition", + "org.fairdatateam.fairdatapoint.resource.ResourceDefinition" + ), + "settings", List.of( + "org.fairdatateam.fairdatapoint.entity.settings.Settings", + "org.fairdatateam.fairdatapoint.settings.Settings" + ), + "user", List.of( + "org.fairdatateam.fairdatapoint.entity.user.User", + "org.fairdatateam.fairdatapoint.user.User" + ) + ); + + private final MongoTemplate database; + + /** + * Constructor (autowired) + */ + public Migration_0021_UpdateClassNames(MongoTemplate template) { + this.database = template; + } + + @Execution + public void run() { + COLLECTIONS.forEach(this::updateClassFields); + } + + /** + * Replaces the old class name by the new one in relevant documents in the specified collection. + */ + @SneakyThrows + private void updateClassFields(String collectionName, List classNames) { + // get the mongodb collection + final MongoCollection collection = database.getCollection(collectionName); + // the ACL class comes from an external package, so _class does not change, but className does + final String fieldName = (collectionName.matches("ACL")) ? "className" : "_class"; + // select documents where the field value matches the old class name + Bson filterByOldClassName = eq(fieldName, classNames.getFirst()); + // update field value to new class name + collection.updateMany(filterByOldClassName, set(fieldName, classNames.getLast())); + } + + @RollbackExecution + public void rollback() { + // todo + } +} From 78e7734486b98dcccfd3b744b063072b8df8be90 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 20 Aug 2026 16:23:40 +0200 Subject: [PATCH 55/70] todo non-existent FDPMetadata in FactoryDefaults --- .../org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java index 67c18e323..dd9a8474b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java @@ -403,6 +403,7 @@ public static Document aclRepository(String persistentUrl) { .append("name", USER_ALBERT.getUuid()) .append("isPrincipal", true); final Document acl = new Document(); + // TODO: there is no FDPMetadata class. This was already removed in 2020 (c37890f) acl.append("className", "org.fairdatateam.fairdatapoint.entity.metadata.FDPMetadata"); acl.append("instanceId", persistentUrl); acl.append("owner", owner); From 48ba14f01d851f6b415f51feb2ead6884660ebc7 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 20 Aug 2026 17:19:29 +0200 Subject: [PATCH 56/70] restore MongoConfig to the config package because it is not only related to migrations: although it does only define a mongock (migration) bean, it also configures mongodb itself via annotations --- .../MongoDbMigrationConfig.java => config/MongoConfig.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{migration/MongoDbMigrationConfig.java => config/MongoConfig.java} (97%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/MongoDbMigrationConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/MongoDbMigrationConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java index 13179ce9a..9eb9b925c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/MongoDbMigrationConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.migration; +package org.fairdatateam.fairdatapoint.config; import io.mongock.api.config.LegacyMigration; import io.mongock.driver.mongodb.springdata.v4.SpringDataMongoV4Driver; @@ -46,7 +46,7 @@ "org.fairdatateam.security.acls" } ) -public class MongoDbMigrationConfig { +public class MongoConfig { @Autowired private ResourceDefinitionCache resourceDefinitionCache; From f01af42a2daaffad160a9d46a967ee557b54dac4 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 27 Aug 2026 12:02:02 +0200 Subject: [PATCH 57/70] modify migration 0021 to handle both org.fairdatateam and nl.dtls package names simply by ignoring the old package names... --- .../Migration_0021_UpdateClassNames.java | 106 ++++++++---------- 1 file changed, 46 insertions(+), 60 deletions(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java index e008efd9d..918447c58 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java @@ -29,23 +29,20 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.bson.Document; -import org.bson.conversions.Bson; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; import java.util.List; -import java.util.Map; -import static com.mongodb.client.model.Filters.*; -import static com.mongodb.client.model.Filters.eq; import static com.mongodb.client.model.Updates.set; /** - * This migration updates existing _class and ACL.className fields to the new package names. - * Note that _class fields are automatically added by - * Spring Data MongoDB. + * This migration updates existing _class and ACL.className fields to the new package names + * that resulted from refactoring the project file structure in PR #941. + * Note that _class fields are also updated automatically when + * + * Spring Data MongoDB saves or updates documents. */ @Slf4j @ChangeUnit( @@ -56,77 +53,66 @@ @Profile(Profiles.PRODUCTION) public class Migration_0021_UpdateClassNames { - private static final Map> COLLECTIONS = Map.of( - "ACL", List.of( - // this case applies to the className field instead of the _class field - "org.fairdatateam.fairdatapoint.entity.metadata.Metadata", - "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata" - ), - "apiKey", List.of( - "org.fairdatateam.fairdatapoint.entity.apikey.ApiKey", - "org.fairdatateam.fairdatapoint.security.apikey.ApiKey" - ), - "indexEntry", List.of( - "org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry", - "org.fairdatateam.fairdatapoint.index.entry.IndexEntry" - ), - "membership", List.of( - "org.fairdatateam.fairdatapoint.entity.membership.Membership", - "org.fairdatateam.fairdatapoint.security.membership.Membership" - ), - "metadata", List.of( - "org.fairdatateam.fairdatapoint.entity.metadata.Metadata", - "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata" - ), - "metadataSchema", List.of( - "org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema", - "org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema" - ), - "resourceDefinition", List.of( - "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition", - "org.fairdatateam.fairdatapoint.resource.ResourceDefinition" - ), - "settings", List.of( - "org.fairdatateam.fairdatapoint.entity.settings.Settings", - "org.fairdatateam.fairdatapoint.settings.Settings" - ), - "user", List.of( - "org.fairdatateam.fairdatapoint.entity.user.User", - "org.fairdatateam.fairdatapoint.user.User" - ) + private static final String CLASS = "_class"; + + private static final String METADATA = "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata"; + + private static final List CHANGES = List.of( + // Note that the `_class` values for "ACL" and "rdfMigration" collections refer to external package names + // which have not changed. However, `ACL.className` does refer to an internal package that has changed. + new Change("ACL", "className", METADATA), + new Change("apiKey", CLASS, "org.fairdatateam.fairdatapoint.security.apikey.ApiKey"), + new Change("indexEntry", CLASS, "org.fairdatateam.fairdatapoint.index.entry.IndexEntry"), + new Change("membership", CLASS, "org.fairdatateam.fairdatapoint.security.membership.Membership"), + new Change("metadata", CLASS, METADATA), + new Change("metadataSchema", CLASS, "org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema"), + new Change("resourceDefinition", CLASS, "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"), + new Change("settings", CLASS, "org.fairdatateam.fairdatapoint.settings.Settings"), + new Change("user", CLASS, "org.fairdatateam.fairdatapoint.user.User") ); - private final MongoTemplate database; + private final MongoTemplate mongoTemplate; /** * Constructor (autowired) */ - public Migration_0021_UpdateClassNames(MongoTemplate template) { - this.database = template; + public Migration_0021_UpdateClassNames(MongoTemplate mongoTemplate) { + this.mongoTemplate = mongoTemplate; } + /** + * Applies all the changes + */ @Execution public void run() { - COLLECTIONS.forEach(this::updateClassFields); + CHANGES.forEach(this::applyChange); } /** - * Replaces the old class name by the new one in relevant documents in the specified collection. + * Applies a Change to all relevant documents in the mongodb database */ @SneakyThrows - private void updateClassFields(String collectionName, List classNames) { + private void applyChange(Change change) { // get the mongodb collection - final MongoCollection collection = database.getCollection(collectionName); - // the ACL class comes from an external package, so _class does not change, but className does - final String fieldName = (collectionName.matches("ACL")) ? "className" : "_class"; - // select documents where the field value matches the old class name - Bson filterByOldClassName = eq(fieldName, classNames.getFirst()); - // update field value to new class name - collection.updateMany(filterByOldClassName, set(fieldName, classNames.getLast())); + final MongoCollection collection = mongoTemplate.getCollection(change.collection()); + // apply the change to all documents in the collection + final Document filterAll = new Document(); + collection.updateMany(filterAll, set(change.field(), change.newValue())); } + /** + * Cannot roll back because we cannot be sure whether the old package names were either org.fairdatateam or nl.dtls. + * This is because migration immutability was not strictly maintained in the past. + */ @RollbackExecution public void rollback() { - // todo + // no-op } + + /** + * Defines a new value to be applied to the specified field, for all documents in the specified collection. + */ + private record Change(String collection, String field, String newValue) { + } + } From 5a0d73e94bcfcc90293f4086cb45f707615b5e0e Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 27 Aug 2026 14:04:40 +0200 Subject: [PATCH 58/70] rename migration to Migration_0021_UpdateMongoTypeMapperClassNames for clarity --- ... => Migration_0021_UpdateMongoTypeMapperClassNames.java} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/{Migration_0021_UpdateClassNames.java => Migration_0021_UpdateMongoTypeMapperClassNames.java} (95%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java index 918447c58..83b0fb38f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateClassNames.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java @@ -46,12 +46,12 @@ */ @Slf4j @ChangeUnit( - id = "Migration_0021_UpdateClassNames", + id = "Migration_0021_UpdateMongoTypeMapperClassNames", order = "0021", author = "migrationBot" ) @Profile(Profiles.PRODUCTION) -public class Migration_0021_UpdateClassNames { +public class Migration_0021_UpdateMongoTypeMapperClassNames { private static final String CLASS = "_class"; @@ -76,7 +76,7 @@ public class Migration_0021_UpdateClassNames { /** * Constructor (autowired) */ - public Migration_0021_UpdateClassNames(MongoTemplate mongoTemplate) { + public Migration_0021_UpdateMongoTypeMapperClassNames(MongoTemplate mongoTemplate) { this.mongoTemplate = mongoTemplate; } From e3f1e4a49eed6df4adf7c705e62c3dcc9593c5ed Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 27 Aug 2026 14:14:24 +0200 Subject: [PATCH 59/70] update migration 0021 to include changes for rdfMigration._class and ACL._class because these were altered in v1.17.3 but never migrated either --- ...igration_0021_UpdateMongoTypeMapperClassNames.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java index 83b0fb38f..dcb83590e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java @@ -53,14 +53,19 @@ @Profile(Profiles.PRODUCTION) public class Migration_0021_UpdateMongoTypeMapperClassNames { + private static final String ACL = "ACL"; + private static final String CLASS = "_class"; private static final String METADATA = "org.fairdatateam.fairdatapoint.rdf.metadata.Metadata"; private static final List CHANGES = List.of( - // Note that the `_class` values for "ACL" and "rdfMigration" collections refer to external package names - // which have not changed. However, `ACL.className` does refer to an internal package that has changed. - new Change("ACL", "className", METADATA), + // Note that the "ACL" and "rdfMigration" collections refer to external package names which were changed + // in v1.17.3. However, existing `_class` values were never migrated, so we fix that here as well. + new Change(ACL, CLASS, "org.fairdatateam.security.acls.domain.MongoAcl"), + new Change("rdfMigration", CLASS, "org.fairdatateam.rdf.migration.entity.RdfMigration"), + // The following changes are related to the current refactoring. + new Change(ACL, "className", METADATA), new Change("apiKey", CLASS, "org.fairdatateam.fairdatapoint.security.apikey.ApiKey"), new Change("indexEntry", CLASS, "org.fairdatateam.fairdatapoint.index.entry.IndexEntry"), new Change("membership", CLASS, "org.fairdatateam.fairdatapoint.security.membership.Membership"), From 5cb18c61041c9c7156ac1d4c1a1f081aeeadaeb0 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 09:33:10 +0200 Subject: [PATCH 60/70] rename ResourceReader to SpringResourceReader to remove ambiguity the ResourceReader is completely unrelated to the org.fairdatateam.fairdatapoint.resource package --- .../migration/mongodb/development/MetadataSchemaFixtures.java | 2 +- .../mongodb/production/Migration_0003_ShapeDefinition.java | 2 +- .../production/Migration_0005_UpdateShapeDefinition.java | 2 +- .../migration/mongodb/production/Migration_0011_ComplyFDPO.java | 2 +- .../migration/mongodb/production/Migration_0016_FixSchemas.java | 2 +- .../mongodb/production/Migration_0017_FixSchemaDateTimes.java | 2 +- .../production/Migration_0020_FixSchemaEndpointDescription.java | 2 +- src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java | 2 +- .../rdf/metadata/AbstractMetadataRdfRepository.java | 2 +- .../org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java | 2 +- .../org/fairdatateam/fairdatapoint/search/SearchService.java | 2 +- .../util/{ResourceReader.java => SpringResourceReader.java} | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/util/{ResourceReader.java => SpringResourceReader.java} (98%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java index 18e56733c..52074dc2a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Set; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; @Service public class MetadataSchemaFixtures { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java index 1ae830035..5c0a62b97 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java @@ -31,7 +31,7 @@ import org.bson.Document; import org.springframework.context.annotation.Profile; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; @ChangeLog(order = "0003") @Profile(Profiles.PRODUCTION) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java index be3b5face..f933a6772 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java @@ -31,7 +31,7 @@ import org.bson.Document; import org.springframework.context.annotation.Profile; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; @ChangeLog(order = "0005") @Profile(Profiles.PRODUCTION) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java index 5a8ef7fe9..cdb97b1b8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java @@ -37,7 +37,7 @@ import java.util.*; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; @ChangeLog(order = "0011") @Profile(Profiles.PRODUCTION) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java index 96bb00f77..f521e3ae7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java @@ -36,7 +36,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; @ChangeUnit( id = "Migration_0016_FixSchemas", diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java index 444ad76af..858bad3c4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java @@ -36,7 +36,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; /** * This migration updates the default metadata schemas defining the `fdp`, `dataset`, and `distribution` shapes. diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java index c99eb580f..a40b5eb7c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java @@ -40,7 +40,7 @@ import static com.mongodb.client.model.Filters.and; import static com.mongodb.client.model.Filters.eq; import static com.mongodb.client.model.Updates.set; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; /** * This migration creates a new version of the default metadata schema for the `DataServiceShape` and marks this as the diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java index f4cd81c09..fef1a3b1f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java @@ -47,7 +47,7 @@ import java.util.Objects; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getSubjectBy; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.getResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.getResource; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java index d47fc590b..4ca91d3bb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java @@ -35,7 +35,7 @@ import java.util.*; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadResource; @Slf4j public abstract class AbstractMetadataRdfRepository implements MetadataRdfRepository { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java index dd9a8474b..fe739fa70 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java @@ -50,7 +50,7 @@ import java.util.Collections; import java.util.List; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*; public class FactoryDefaults { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index f15da046d..53dfa3b9a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadResource; +import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadResource; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java b/src/main/java/org/fairdatateam/fairdatapoint/util/SpringResourceReader.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java rename to src/main/java/org/fairdatateam/fairdatapoint/util/SpringResourceReader.java index 6aa306ead..ef7e43b49 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/SpringResourceReader.java @@ -41,7 +41,7 @@ * Loads Spring Resources. * Beware: This has nothing to do with the concept of an FDP "Resource". */ -public class ResourceReader { +public class SpringResourceReader { public static String loadResource(String name) { return loadResource(getResource(name)); From 85ed049a9af09084cd904d1f92bce679370ea45b Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 10:07:13 +0200 Subject: [PATCH 61/70] rename (global) exception package to common.error --- .../{exception => common/error}/ErrorConverter.java | 2 +- .../fairdatapoint/{exception => common/error}/ErrorDTO.java | 2 +- .../error}/ExceptionControllerAdvice.java | 2 +- .../{exception => common/error}/ForbiddenException.java | 2 +- .../error}/ResourceNotFoundException.java | 2 +- .../{exception => common/error}/UnauthorizedException.java | 2 +- .../{exception => common/error}/ValidationException.java | 2 +- .../fairdatateam/fairdatapoint/config/ConverterConfig.java | 2 +- .../org/fairdatateam/fairdatapoint/config/WebMvcConfig.java | 2 +- .../fairdatapoint/index/entry/IndexEntryService.java | 2 +- .../fairdatapoint/index/exception/AbstractIndexException.java | 2 +- .../fairdatapoint/index/webhook/WebhookService.java | 2 +- .../fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java | 2 +- .../fairdatateam/fairdatapoint/profile/ProfileController.java | 2 +- .../java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java | 2 +- .../fairdatapoint/rdf/metadata/AbstractMetadataService.java | 2 +- .../fairdatapoint/rdf/metadata/GenericController.java | 4 ++-- .../fairdatapoint/rdf/metadata/GenericMemberController.java | 2 +- .../fairdatapoint/rdf/metadata/GenericMetadataService.java | 4 ++-- .../fairdatapoint/rdf/metadata/MetadataService.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataStateService.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataStateValidator.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataValidator.java | 2 +- .../fairdatapoint/rdf/schema/MetadataSchemaController.java | 4 ++-- .../fairdatapoint/rdf/schema/MetadataSchemaService.java | 4 ++-- .../fairdatapoint/rdf/schema/MetadataSchemaValidator.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionController.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionService.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionValidator.java | 2 +- .../fairdatapoint/search/SearchSavedQueryController.java | 2 +- .../fairdatapoint/search/SearchSavedQueryService.java | 2 +- .../org/fairdatateam/fairdatapoint/search/SearchService.java | 2 +- .../fairdatapoint/search/SparqlProxyController.java | 2 +- .../fairdatapoint/search/SparqlQueryValidator.java | 2 +- .../fairdatapoint/security/MongoUserDetailsService.java | 2 +- .../fairdatapoint/security/apikey/ApiKeyController.java | 2 +- .../fairdatapoint/security/apikey/ApiKeyService.java | 4 ++-- .../fairdatapoint/security/filter/JwtTokenFilter.java | 4 ++-- .../fairdatapoint/security/membership/MemberService.java | 2 +- .../fairdatateam/fairdatapoint/security/token/JwtService.java | 2 +- .../org/fairdatateam/fairdatapoint/user/UserController.java | 4 ++-- .../org/fairdatateam/fairdatapoint/user/UserValidator.java | 2 +- .../java/org/fairdatateam/fairdatapoint/util/HttpUtil.java | 2 +- .../fairdatapoint/acceptance/metadata/Common.java | 2 +- .../acceptance/metadata/catalog/member/Detail_PUT.java | 2 +- .../acceptance/metadata/catalog/member/List_GET.java | 2 +- .../acceptance/metadata/dataset/member/Detail_PUT.java | 2 +- .../acceptance/metadata/dataset/member/List_GET.java | 2 +- .../acceptance/metadata/distribution/member/Detail_PUT.java | 2 +- .../acceptance/metadata/distribution/member/List_GET.java | 2 +- .../fairdatapoint/acceptance/schema/Detail_DELETE.java | 2 +- .../acceptance/search/sparql/SparqlQueryValidatorTest.java | 2 +- .../fairdatapoint/acceptance/token/List_POST.java | 2 +- .../fairdatapoint/acceptance/user/Detail_Current_PUT.java | 2 +- .../fairdatapoint/acceptance/user/Detail_PUT.java | 2 +- .../fairdatateam/fairdatapoint/acceptance/user/List_POST.java | 2 +- .../rdf/metadata/GenericMetadataServiceTest.java | 4 ++-- .../resource/ResourceDefinitionValidatorTest.java | 2 +- 58 files changed, 66 insertions(+), 66 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{exception => common/error}/ErrorConverter.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{exception => common/error}/ErrorDTO.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{exception => common/error}/ExceptionControllerAdvice.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{exception => common/error}/ForbiddenException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{exception => common/error}/ResourceNotFoundException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{exception => common/error}/UnauthorizedException.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{exception => common/error}/ValidationException.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorConverter.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ErrorConverter.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorConverter.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ErrorConverter.java index 3c079a8ed..e24296e9e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorConverter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ErrorConverter.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.exception; +package org.fairdatateam.fairdatapoint.common.error; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.http.HttpInputMessage; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ErrorDTO.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ErrorDTO.java index 80a1ec093..9ca974f50 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/exception/ErrorDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ErrorDTO.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.exception; +package org.fairdatateam.fairdatapoint.common.error; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/exception/ExceptionControllerAdvice.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java index a15e7b16b..ec10d3c9a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.exception; +package org.fairdatateam.fairdatapoint.common.error; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/exception/ForbiddenException.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ForbiddenException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/exception/ForbiddenException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ForbiddenException.java index 7946374cd..d1ca6653e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/exception/ForbiddenException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ForbiddenException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.exception; +package org.fairdatateam.fairdatapoint.common.error; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/exception/ResourceNotFoundException.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ResourceNotFoundException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/exception/ResourceNotFoundException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ResourceNotFoundException.java index 600cefd83..474508a9f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/exception/ResourceNotFoundException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ResourceNotFoundException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.exception; +package org.fairdatateam.fairdatapoint.common.error; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/exception/UnauthorizedException.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/UnauthorizedException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/exception/UnauthorizedException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/UnauthorizedException.java index f59d74910..7ebb6307a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/exception/UnauthorizedException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/UnauthorizedException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.exception; +package org.fairdatateam.fairdatapoint.common.error; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/exception/ValidationException.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ValidationException.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/exception/ValidationException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ValidationException.java index c61fbe6fc..ec2f55bc1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/exception/ValidationException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ValidationException.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.exception; +package org.fairdatateam.fairdatapoint.common.error; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java index 4c5e2895a..7a7c4b0ef 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java @@ -27,7 +27,7 @@ */ package org.fairdatateam.fairdatapoint.config; -import org.fairdatateam.fairdatapoint.exception.ErrorConverter; +import org.fairdatateam.fairdatapoint.common.error.ErrorConverter; import org.fairdatateam.fairdatapoint.rdf.RdfConverter; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java index a5c3fc7b9..c9a735077 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.config; import com.fasterxml.jackson.annotation.JsonInclude; -import org.fairdatateam.fairdatapoint.exception.ErrorConverter; +import org.fairdatateam.fairdatapoint.common.error.ErrorConverter; import org.fairdatateam.fairdatapoint.rdf.RdfConverter; import org.jspecify.annotations.NonNull; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index c788df766..ce62a459d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.fairdatateam.fairdatapoint.index.entry.dto.*; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java index cecf9fe02..f44e14d1f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/exception/AbstractIndexException.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.index.exception; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.springframework.http.HttpStatus; public abstract class AbstractIndexException extends RuntimeException { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java index 4169280c0..e29081f5f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/WebhookService.java @@ -25,7 +25,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.index.event.EventRepository; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java index d1c9215dd..fbe925049 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java @@ -34,7 +34,7 @@ import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.tags.Tag; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java index 8f58c344d..1dcc93492 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java @@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java index fef1a3b1f..a6a917253 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.Statement; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index 188fee417..b772c1e76 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java index dce647062..128c69edd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java @@ -24,8 +24,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ForbiddenException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.user.User; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java index 39e21e466..6e95fea22 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java @@ -27,7 +27,7 @@ import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.security.membership.MemberService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java index 2a3befb43..346089e8e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ForbiddenException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.user.UserRole; import org.eclipse.rdf4j.model.IRI; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java index dcd2fef55..5e0a01a32 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java index 9afe7b1c9..b8ec7d05c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java index f11416663..bb75f6d04 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java index 08c1d32eb..0029a80b9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.rdf.StandaloneShaclValidator; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java index 97629fa07..30f1b1eeb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java @@ -25,8 +25,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.UnauthorizedException; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index 24d4d0f48..348521636 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java @@ -24,8 +24,8 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java index e65c4bf00..3d302f798 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java index 7705cefca..0e2162a8f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionController.java @@ -26,7 +26,7 @@ import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java index 6d3975524..6856f25dd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.security.membership.MembershipService; import org.fairdatateam.fairdatapoint.openapi.OpenApiService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java index 2261cbf15..0fed67b4c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.resource; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.validation.BindException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java index a1156e59b..0f4983ced 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryController.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java index 142f9c3cf..1a56f7251 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; -import org.fairdatateam.fairdatapoint.exception.ForbiddenException; +import org.fairdatateam.fairdatapoint.common.error.ForbiddenException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index 53dfa3b9a..88c334655 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.fairdatapoint.settings.SettingsSearchFilter; import org.fairdatateam.fairdatapoint.search.dto.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java index 96975ba42..5ff3e8f04 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlProxyController.java @@ -33,7 +33,7 @@ import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.http.HTTPRepository; import org.eclipse.rdf4j.repository.sparql.SPARQLRepository; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.hibernate.validator.constraints.URL; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java index fcee9b43c..1067b5e62 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java @@ -29,7 +29,7 @@ import org.eclipse.rdf4j.repository.RepositoryException; import org.eclipse.rdf4j.repository.sail.SailRepository; import org.eclipse.rdf4j.sail.memory.MemoryStore; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; /** * Custom validator for SPARQL query strings. Throws a ValidationException if validation fails. diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java index e8ee36c7f..53b02eeea 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.security; import org.fairdatateam.fairdatapoint.user.UserRepository; -import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.common.error.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java index ece135dbd..f68bbc704 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyController.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.security.apikey; import io.swagger.v3.oas.annotations.tags.Tag; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java index 6a2206ad1..c93c3cd9e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/apikey/ApiKeyService.java @@ -22,8 +22,8 @@ */ package org.fairdatateam.fairdatapoint.security.apikey; -import org.fairdatateam.fairdatapoint.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.common.error.ForbiddenException; +import org.fairdatateam.fairdatapoint.common.error.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java index 5cc3f8a09..1fa0212d9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java @@ -26,8 +26,8 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; -import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.UnauthorizedException; import org.fairdatateam.fairdatapoint.security.apikey.ApiKeyService; import org.fairdatateam.fairdatapoint.security.token.JwtService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java index d80d7e82d..b99be1fef 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MemberService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.security.membership; import org.fairdatateam.fairdatapoint.user.UserRepository; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java index 28e0752cb..516764608 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java @@ -26,7 +26,7 @@ import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; import org.fairdatateam.fairdatapoint.user.UserRepository; -import org.fairdatateam.fairdatapoint.exception.UnauthorizedException; +import org.fairdatateam.fairdatapoint.common.error.UnauthorizedException; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.security.auth.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java index 4bd975ccc..7f232b3d4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserController.java @@ -24,8 +24,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import org.fairdatateam.fairdatapoint.exception.ForbiddenException; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ForbiddenException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.fairdatateam.fairdatapoint.user.dto.*; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java index fd680a3ff..9c503a8c6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/user/UserValidator.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.user; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java index 18b6d18c6..07001633a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java @@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java index 192b3b4f6..054b41ce7 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.acceptance.metadata; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java index b8b6fac89..28016653d 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java index 650c4cff8..b2b98c71f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java index c761b253e..118e5a13f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java index daff4b2b5..f43258b08 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java index 30c0009fe..eb4007740 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java index 167b8a58f..836c57fe0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.MembershipFixtures; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java index 1b14d0b27..2522d689b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java index b7b84d0d0..c6528d69a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlQueryValidatorTest.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.search.SparqlQueryValidator; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java index 843379d30..2d657f43b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; import org.fairdatateam.fairdatapoint.security.token.TokenDTO; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java index 5bc5f8d9e..2941b08b5 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.user.dto.UserProfileChangeDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java index e9c06497b..6625c27f6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserChangeDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java index af60c5a37..5a32387eb 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.exception.ErrorDTO; +import org.fairdatateam.fairdatapoint.common.error.ErrorDTO; import org.fairdatateam.fairdatapoint.user.dto.UserCreateDTO; import org.fairdatateam.fairdatapoint.user.dto.UserDTO; import org.fairdatateam.fairdatapoint.migration.mongodb.development.UserFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java index 444c5ba86..b940fe870 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.BaseIntegrationTest; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java index aa0e0b362..8d178f7ca 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.resource; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; -import org.fairdatateam.fairdatapoint.exception.ValidationException; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; From 4d6cffc98699d53bff9934f7c3ffb5419bf258c3 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 10:17:05 +0200 Subject: [PATCH 62/70] move global congfig classes into new common.config package --- .../fairdatapoint/{ => common}/config/AsyncConfig.java | 2 +- .../fairdatapoint/{ => common}/config/CacheConfig.java | 2 +- .../fairdatapoint/{ => common}/config/ConverterConfig.java | 2 +- .../fairdatapoint/{ => common}/config/InstanceProperties.java | 2 +- .../fairdatapoint/{ => common}/config/MongoConfig.java | 2 +- .../fairdatapoint/{ => common}/config/PropertyConfig.java | 2 +- .../fairdatapoint/{ => common}/config/WebMvcConfig.java | 2 +- .../fairdatapoint/{ => common}/config/WorkerConfig.java | 2 +- .../org/fairdatateam/fairdatapoint/config/ConfigService.java | 1 + .../fairdatapoint/form/FormsAutocompleteCache.java | 2 +- .../fairdatateam/fairdatapoint/index/IndexFeatureAspect.java | 2 +- .../fairdatapoint/index/settings/IndexSettingsService.java | 2 +- .../org/fairdatateam/fairdatapoint/label/LabelService.java | 2 +- .../production/Rdf_Migration_0004_Cleanup_Index.java | 2 +- .../org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java | 2 +- .../java/org/fairdatateam/fairdatapoint/ping/PingService.java | 2 +- .../rdf/metadata/CatalogMetadataRdfRepository.java | 2 +- .../rdf/metadata/GenericMetadataRdfRepository.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataConfig.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionCache.java | 4 ++-- .../resource/ResourceDefinitionTargetClassesCache.java | 2 +- .../fairdatateam/fairdatapoint/search/SearchFilterCache.java | 2 +- .../fairdatateam/fairdatapoint/settings/SettingsCache.java | 2 +- .../fairdatateam/fairdatapoint/settings/SettingsMapper.java | 2 +- .../org/fairdatateam/fairdatapoint/ping/PingServiceTest.java | 2 +- .../rdf/metadata/CatalogMetadataRdfRepositoryTest.java | 2 +- .../rdf/metadata/GenericMetadataRdfRepositoryTest.java | 2 +- 27 files changed, 28 insertions(+), 27 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/AsyncConfig.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/CacheConfig.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/ConverterConfig.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/InstanceProperties.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/MongoConfig.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/PropertyConfig.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/WebMvcConfig.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/config/WorkerConfig.java (96%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/AsyncConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/AsyncConfig.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/AsyncConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/AsyncConfig.java index 589bbb36c..0235e3097 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/AsyncConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/AsyncConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import org.fairdatateam.fairdatapoint.Profiles; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/CacheConfig.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/CacheConfig.java index 6b5ced5eb..b266bfef3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/CacheConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/ConverterConfig.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/ConverterConfig.java index 7a7c4b0ef..04f448f9f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/ConverterConfig.java @@ -25,7 +25,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import org.fairdatateam.fairdatapoint.common.error.ErrorConverter; import org.fairdatateam.fairdatapoint.rdf.RdfConverter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/InstanceProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/InstanceProperties.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/config/InstanceProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/InstanceProperties.java index 2cb8b41c5..49e6e626e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/InstanceProperties.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/InstanceProperties.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/MongoConfig.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/MongoConfig.java index 9eb9b925c..3003ac9a7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/MongoConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import io.mongock.api.config.LegacyMigration; import io.mongock.driver.mongodb.springdata.v4.SpringDataMongoV4Driver; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/PropertyConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/PropertyConfig.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/config/PropertyConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/PropertyConfig.java index 3d8d17671..6d5ea7e7d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/PropertyConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/PropertyConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/WebMvcConfig.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/WebMvcConfig.java index c9a735077..f106a6ab4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/WebMvcConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import com.fasterxml.jackson.annotation.JsonInclude; import org.fairdatateam.fairdatapoint.common.error.ErrorConverter; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/WorkerConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/WorkerConfig.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/WorkerConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/WorkerConfig.java index e4fd6b1ca..43f5c67b3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/WorkerConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/WorkerConfig.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.config; +package org.fairdatateam.fairdatapoint.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java b/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java index 422dd5383..4451a23d6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java @@ -22,6 +22,7 @@ */ package org.fairdatateam.fairdatapoint.config; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; import org.fairdatateam.fairdatapoint.settings.SettingsService; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.java index 50230376f..fa44262f9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.java @@ -27,7 +27,7 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Component; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.FORMS_AUTOCOMPLETE_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.FORMS_AUTOCOMPLETE_CACHE; @Component public class FormsAutocompleteCache { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java index fb158ee3c..6910992f3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.index; import lombok.SneakyThrows; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.fairdatateam.fairdatapoint.index.exception.FeatureDisabledException; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java index 5ba2efd83..bdbee5161 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java @@ -26,7 +26,7 @@ import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java index ab6c07f4c..62c2f08d1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.label; import static java.util.function.Predicate.isEqual; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.LABEL_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.LABEL_CACHE; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import org.fairdatateam.rdf.resolver.api.ResourceResolver; import org.fairdatateam.rdf.resolver.core.ContentNegotiationStrategy; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index 505c0bd82..a806accf0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java index e0bd05f93..dfeaec344 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java index d4d346152..2f54c93f2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.ping; import lombok.extern.log4j.Log4j2; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java index 7a1ea2e7d..837a6f350 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java index e28d9617f..c730ac92b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java @@ -30,7 +30,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java index 94939843d..2e8a8d3e1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.eclipse.rdf4j.model.IRI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCache.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCache.java index 47c977f35..3cb371299 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCache.java @@ -34,8 +34,8 @@ import java.util.List; import java.util.Set; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_CACHE; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_PARENT_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.RESOURCE_DEFINITION_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.RESOURCE_DEFINITION_PARENT_CACHE; @Service public class ResourceDefinitionCache { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java index e4427303b..fb33c5c2d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.java @@ -32,7 +32,7 @@ import java.util.*; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_TARGET_CLASSES_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.RESOURCE_DEFINITION_TARGET_CLASSES_CACHE; @Service public class ResourceDefinitionTargetClassesCache { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java index cf6161981..9c6f94c55 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Component; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.SEARCH_FILTERS_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.SEARCH_FILTERS_CACHE; @Component @Slf4j diff --git a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.java index f3023f644..171a45e90 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.java @@ -28,7 +28,7 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Service; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.SETTINGS_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.SETTINGS_CACHE; @Service public class SettingsCache { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java index 3a7b76c57..7a3f31c3e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.fairdatateam.fairdatapoint.ping.PingProperties; import org.fairdatateam.fairdatapoint.rdf.RdfRepositoryProperties; import org.fairdatateam.fairdatapoint.search.SearchMapper; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java index a1ba6b27b..af637df28 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.ping; import com.fasterxml.jackson.core.JsonProcessingException; -import org.fairdatateam.fairdatapoint.config.InstanceProperties; +import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; import org.fairdatateam.fairdatapoint.settings.Settings; import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java index c12db8301..96965e3c6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java @@ -40,7 +40,7 @@ import java.util.Collections; import java.util.List; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; import static org.mockito.Mockito.*; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java index 4e6016d9d..1c00830f0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getLanguage; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; From 1644d5fe12cf2c4672167baf5a0712ba2d073370 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 11:21:34 +0200 Subject: [PATCH 63/70] remove @Document from MembershipPermission because it is only ever used as embedded in Membership no mongodb collection is ever created for MembershipPermission, there is no corresponding Repository class --- .../fairdatapoint/security/membership/MembershipPermission.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.java index 360bce215..aca8ff5b0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.java @@ -25,9 +25,7 @@ import lombok.*; import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; -@Document @NoArgsConstructor @AllArgsConstructor @Getter From aedbd6ff0a47805db44d286c854d3dc62489996f Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 11:31:08 +0200 Subject: [PATCH 64/70] add event, indexSettings, metadataSchemaDraft, searchSavedQuery, and webhook changes to migration 0021 --- .../Migration_0021_UpdateMongoTypeMapperClassNames.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java index dcb83590e..1bca30280 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java @@ -67,13 +67,18 @@ public class Migration_0021_UpdateMongoTypeMapperClassNames { // The following changes are related to the current refactoring. new Change(ACL, "className", METADATA), new Change("apiKey", CLASS, "org.fairdatateam.fairdatapoint.security.apikey.ApiKey"), + new Change("event", CLASS, "org.fairdatateam.fairdatapoint.index.event.Event"), new Change("indexEntry", CLASS, "org.fairdatateam.fairdatapoint.index.entry.IndexEntry"), + new Change("indexSettings", CLASS, "org.fairdatateam.fairdatapoint.index.settings.IndexSettings"), new Change("membership", CLASS, "org.fairdatateam.fairdatapoint.security.membership.Membership"), new Change("metadata", CLASS, METADATA), new Change("metadataSchema", CLASS, "org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema"), + new Change("metadataSchemaDraft", CLASS, "org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft"), new Change("resourceDefinition", CLASS, "org.fairdatateam.fairdatapoint.resource.ResourceDefinition"), + new Change("searchSavedQuery", CLASS, "org.fairdatateam.fairdatapoint.search.SearchSavedQuery"), new Change("settings", CLASS, "org.fairdatateam.fairdatapoint.settings.Settings"), - new Change("user", CLASS, "org.fairdatateam.fairdatapoint.user.User") + new Change("user", CLASS, "org.fairdatateam.fairdatapoint.user.User"), + new Change("webhook", CLASS, "org.fairdatateam.fairdatapoint.index.webhook.Webhook") ); private final MongoTemplate mongoTemplate; From 624c8a02cdb282033b4ef3ab5456dc2fbc0e1899 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 11:54:38 +0200 Subject: [PATCH 65/70] todo webhook --- .../org/fairdatateam/fairdatapoint/index/webhook/Webhook.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java index 3b356413c..0ae170fa9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java @@ -37,6 +37,7 @@ @Data @NoArgsConstructor @AllArgsConstructor +// TODO: looks like no webhooks are ever saved using the WebhookRepository, so no collection is ever created... @Document(collection = "webhook") public class Webhook { @Id From 1e3a63bbf8c02b3998c5f24fcd6c5e28c10f5c91 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 11:57:50 +0200 Subject: [PATCH 66/70] move IndexEntry* and IndexSettings* classes into corresponding subpackages for consistency and cohesion --- .../fairdatapoint/index/{ => entry}/HarvesterService.java | 2 +- .../index/{ => entry}/IndexEntryController.java | 4 +--- .../index/{ => entry}/IndexEntryRepository.java | 5 +---- .../fairdatapoint/index/entry/IndexEntryService.java | 2 -- .../fairdatateam/fairdatapoint/index/event/EventService.java | 2 +- .../index/{ => settings}/IndexSettingsController.java | 3 +-- .../index/{ => settings}/IndexSettingsRepository.java | 3 +-- .../fairdatapoint/index/settings/IndexSettingsService.java | 1 - .../migration/mongodb/development/IndexEntryMigration.java | 2 +- .../production/Rdf_Migration_0004_Cleanup_Index.java | 2 +- .../acceptance/index/admin/List_TriggerAll_POST.java | 2 +- .../acceptance/index/admin/List_Trigger_POST.java | 4 ++-- .../fairdatapoint/acceptance/index/entry/List_All_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_GET.java | 2 +- .../fairdatapoint/acceptance/index/entry/List_Info_GET.java | 2 +- .../fairdatapoint/acceptance/index/ping/List_POST.java | 4 ++-- .../fairdatapoint/acceptance/index/settings/List_DELETE.java | 2 +- .../fairdatapoint/acceptance/index/settings/List_GET.java | 2 +- .../fairdatapoint/acceptance/index/settings/List_PUT.java | 2 +- .../acceptance/search/sparql/SparqlProxyControllerTest.java | 2 +- .../fairdatapoint/index/HarvesterServiceTest.java | 1 + 21 files changed, 21 insertions(+), 30 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/index/{ => entry}/HarvesterService.java (99%) rename src/main/java/org/fairdatateam/fairdatapoint/index/{ => entry}/IndexEntryController.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/index/{ => entry}/IndexEntryRepository.java (91%) rename src/main/java/org/fairdatateam/fairdatapoint/index/{ => settings}/IndexSettingsController.java (95%) rename src/main/java/org/fairdatateam/fairdatapoint/index/{ => settings}/IndexSettingsRepository.java (92%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java similarity index 99% rename from src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java index 06dd8e098..ff90b8bf4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/HarvesterService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index; +package org.fairdatateam.fairdatapoint.index.entry; import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryController.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryController.java index 3d5657c55..614a9e839 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryController.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index; +package org.fairdatateam.fairdatapoint.index.entry; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; @@ -30,9 +30,7 @@ import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryUpdateDTO; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; -import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.index.event.Event; -import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; import org.fairdatateam.fairdatapoint.index.event.EventService; import org.fairdatateam.fairdatapoint.index.webhook.WebhookService; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryRepository.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryRepository.java index 5d1162612..e20092869 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexEntryRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryRepository.java @@ -20,11 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index; +package org.fairdatateam.fairdatapoint.index.entry; -import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; -import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; -import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index ce62a459d..f9a142668 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -24,7 +24,6 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; @@ -33,7 +32,6 @@ import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.fairdatateam.fairdatapoint.index.event.EventService; -import org.fairdatateam.fairdatapoint.index.HarvesterService; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.Model; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java index e4f8b5349..4fcdf17ce 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java @@ -26,7 +26,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsController.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsController.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsController.java index 95362da3f..9bd156cc0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsController.java @@ -20,13 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index; +package org.fairdatateam.fairdatapoint.index.settings; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRepository.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRepository.java index 0a327aea1..7fd1b8e05 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/IndexSettingsRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRepository.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index; +package org.fairdatateam.fairdatapoint.index.settings; -import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java index bdbee5161..cf3556f1e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsService.java @@ -27,7 +27,6 @@ import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; -import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java index afdfb3716..bf6898332 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.migration.Migration; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index a806accf0..18120eefb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; import org.fairdatateam.fairdatapoint.common.config.InstanceProperties; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java index c4a08630a..6dd2df716 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.event.EventRepository; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 42def924c..7c8c8fad1 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -25,8 +25,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; import org.fairdatateam.fairdatapoint.index.event.EventRepository; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.event.Event; import org.fairdatateam.fairdatapoint.index.event.EventType; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index ea3b9b0c0..0dd3380fd 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java index 6437bcd3a..661111c3a 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java index 48cd8f5eb..97989b843 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java index 35b19d4e8..d159c6cbd 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java @@ -24,8 +24,8 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; -import org.fairdatateam.fairdatapoint.index.IndexEntryRepository; -import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryRepository; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.entry.IndexEntry; import org.fairdatateam.fairdatapoint.testfixtures.TestIndexEntryFixtures; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java index 238b9d6c3..850554ada 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java index d79d53a03..2f2d50188 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.WebIntegrationTest; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsDTO; -import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java index ca866bf44..701db2fc0 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsPingDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsRetrievalDTO; import org.fairdatateam.fairdatapoint.index.settings.dto.IndexSettingsUpdateDTO; -import org.fairdatateam.fairdatapoint.index.IndexSettingsRepository; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRepository; import org.fairdatateam.fairdatapoint.index.settings.IndexSettings; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsPing; import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java index 35ce6a45f..5bf0212db 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/sparql/SparqlProxyControllerTest.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.acceptance.search.sparql; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.index.HarvesterService; +import org.fairdatateam.fairdatapoint.index.entry.HarvesterService; import org.fairdatateam.fairdatapoint.ping.PingService; import org.fairdatateam.fairdatapoint.search.SparqlProxyController; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java index c45414549..7a304496c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java @@ -22,6 +22,7 @@ */ package org.fairdatateam.fairdatapoint.index; +import org.fairdatateam.fairdatapoint.index.entry.HarvesterService; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactoryImpl; From bff1656c5a7547898b17f55b5b303b59bfcd9454 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 12:10:39 +0200 Subject: [PATCH 67/70] remove temporary todo file --- src/main/java/org/fairdatateam/fairdatapoint/index/todo.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 src/main/java/org/fairdatateam/fairdatapoint/index/todo.md diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/todo.md b/src/main/java/org/fairdatateam/fairdatapoint/index/todo.md deleted file mode 100644 index 7f4ac01ae..000000000 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/todo.md +++ /dev/null @@ -1,6 +0,0 @@ -# todo - -- [ ] clean up index file structure -- [ ] consistent index class names -- [ ] clearly separate index-server and index-client functionality, - for example, receiving pings vs sending pings From 326ed4b9b10706ba280dcc06468af14aa8ed197a Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 13:23:38 +0200 Subject: [PATCH 68/70] modify migration 0021 to apply change only when necessary --- .../Migration_0021_UpdateMongoTypeMapperClassNames.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java index 1bca30280..c4707c5ec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java @@ -29,12 +29,15 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.bson.Document; +import org.bson.conversions.Bson; import org.fairdatateam.fairdatapoint.Profiles; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; import java.util.List; +import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Filters.not; import static com.mongodb.client.model.Updates.set; /** @@ -105,9 +108,9 @@ public void run() { private void applyChange(Change change) { // get the mongodb collection final MongoCollection collection = mongoTemplate.getCollection(change.collection()); - // apply the change to all documents in the collection - final Document filterAll = new Document(); - collection.updateMany(filterAll, set(change.field(), change.newValue())); + // apply the change to documents in the collection that do not have the new value yet + final Bson filterNotNewValue = not(eq(change.field(), change.newValue())); + collection.updateMany(filterNotNewValue, set(change.field(), change.newValue())); } /** From caea85bf70544f7a2aa485cbca84137a8df3f7ac Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 14:01:01 +0200 Subject: [PATCH 69/70] move util into common --- .../common/error/ExceptionControllerAdvice.java | 2 +- .../fairdatapoint/{ => common}/util/HttpUtil.java | 4 ++-- .../fairdatapoint/{ => common}/util/IriValidator.java | 4 ++-- .../fairdatapoint/{ => common}/util/KnownUUIDs.java | 2 +- .../fairdatapoint/{ => common}/util/SemVer.java | 2 +- .../fairdatapoint/{ => common}/util/SemVerValidator.java | 2 +- .../{ => common}/util/SpringResourceReader.java | 2 +- .../fairdatapoint/{ => common}/util/ThrowingFunction.java | 2 +- .../fairdatapoint/{ => common}/util/ValidIri.java | 2 +- .../fairdatapoint/{ => common}/util/ValidSemVer.java | 2 +- .../fairdatapoint/{ => common}/util/ValidationUtil.java | 2 +- .../{ => common}/util/ValueFactoryHelper.java | 2 +- .../fairdatapoint/dashboard/DashboardController.java | 4 ++-- .../fairdatapoint/dashboard/DashboardService.java | 2 +- .../fairdatapoint/form/FormAutocompleteRequestDTO.java | 2 +- .../fairdatapoint/form/RdfEntitiesNamespaceRetriever.java | 2 +- .../fairdatapoint/index/entry/HarvesterService.java | 4 ++-- .../fairdatapoint/index/entry/IndexEntryService.java | 2 +- .../fairdatateam/fairdatapoint/label/LabelService.java | 2 +- .../migration/mongodb/development/MembershipFixtures.java | 2 +- .../mongodb/development/MetadataSchemaFixtures.java | 6 +++--- .../mongodb/development/ResourceDefinitionFixtures.java | 2 +- .../mongodb/development/SearchSavedQueryFixtures.java | 2 +- .../migration/mongodb/development/UserFixtures.java | 2 +- .../migration/mongodb/production/Migration_0001_Init.java | 2 +- .../production/Migration_0002_CustomMetamodel.java | 2 +- .../production/Migration_0003_ShapeDefinition.java | 4 ++-- .../production/Migration_0004_ResourceDefinition.java | 2 +- .../production/Migration_0005_UpdateShapeDefinition.java | 4 ++-- .../production/Migration_0008_ShapesInternalChange.java | 2 +- .../mongodb/production/Migration_0011_ComplyFDPO.java | 4 ++-- .../production/Migration_0012_MetadataSchemas.java | 4 ++-- .../production/Migration_0015_FixMetadataVersion.java | 4 ++-- .../mongodb/production/Migration_0016_FixSchemas.java | 4 ++-- .../production/Migration_0017_FixSchemaDateTimes.java | 4 ++-- .../Migration_0020_FixSchemaEndpointDescription.java | 4 ++-- .../triplestore/development/MetadataFactoryImpl.java | 6 +++--- .../triplestore/development/RdfMetadataMigration.java | 2 +- .../triplestore/production/Rdf_Migration_0003_FDPO.java | 4 ++-- .../production/Rdf_Migration_0004_Cleanup_Index.java | 2 +- .../production/Rdf_Migration_0005_FixMetadataVersion.java | 2 +- .../fairdatapoint/profile/ProfileController.java | 4 ++-- .../fairdatapoint/profile/ProfileService.java | 2 +- .../org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java | 8 ++++---- .../fairdatapoint/rdf/RdfRepositoryConfig.java | 2 +- .../java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java | 2 +- .../rdf/metadata/AbstractMetadataRdfRepository.java | 2 +- .../rdf/metadata/AbstractMetadataService.java | 4 ++-- .../rdf/metadata/CatalogMetadataRdfRepository.java | 2 +- .../fairdatapoint/rdf/metadata/GenericController.java | 4 ++-- .../rdf/metadata/GenericMemberController.java | 2 +- .../fairdatapoint/rdf/metadata/GenericMetaController.java | 4 ++-- .../fairdatapoint/rdf/metadata/MetadataConfig.java | 4 ++-- .../fairdatapoint/rdf/metadata/MetadataEnhancer.java | 6 +++--- .../fairdatapoint/rdf/metadata/MetadataGetter.java | 6 +++--- .../fairdatapoint/rdf/metadata/MetadataSetter.java | 4 ++-- .../fairdatapoint/rdf/metadata/MetadataStateService.java | 2 +- .../fairdatapoint/rdf/metadata/MetadataValidator.java | 2 +- .../rdf/metadata/MetricsMetadataService.java | 2 +- .../fairdatapoint/rdf/schema/MetadataSchema.java | 2 +- .../fairdatapoint/rdf/schema/MetadataSchemaMapper.java | 2 +- .../fairdatapoint/rdf/schema/MetadataSchemaService.java | 2 +- .../rdf/schema/MetadataSchemaShaclUtils.java | 2 +- .../rdf/schema/dto/MetadataSchemaReleaseDTO.java | 2 +- .../fairdatapoint/rdf/vocabulary/DATACITE.java | 2 +- .../fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java | 2 +- .../fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java | 2 +- .../fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java | 2 +- .../fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java | 2 +- .../fairdatateam/fairdatapoint/reset/FactoryDefaults.java | 8 ++++---- .../fairdatateam/fairdatapoint/reset/ResetService.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionChild.java | 2 +- .../resource/ResourceDefinitionChildListView.java | 2 +- .../resource/ResourceDefinitionChildListViewMetadata.java | 2 +- .../fairdatapoint/resource/ResourceDefinitionLink.java | 2 +- .../resource/ResourceDefinitionValidator.java | 2 +- .../fairdatateam/fairdatapoint/search/SearchService.java | 6 +++--- .../fairdatapoint/search/dto/SearchFilterDTO.java | 2 +- .../fairdatapoint/search/dto/SearchFilterItemDTO.java | 2 +- .../fairdatapoint/security/filter/JwtTokenFilter.java | 2 +- .../security/membership/MembershipService.java | 2 +- .../settings/dto/SettingsAutocompleteSourceDTO.java | 2 +- .../acceptance/metadata/catalog/Detail_PUT.java | 4 ++-- .../acceptance/metadata/dataset/Detail_PUT.java | 4 ++-- .../acceptance/metadata/distribution/Detail_PUT.java | 4 ++-- .../acceptance/metadata/repository/Detail_PUT.java | 4 ++-- .../fairdatapoint/acceptance/schema/Public_GET.java | 2 +- .../acceptance/search/query/saved/Detail_PUT.java | 2 +- .../acceptance/search/query/saved/List_POST.java | 2 +- .../fairdatapoint/index/HarvesterServiceTest.java | 2 +- .../rdf/metadata/CatalogMetadataRdfRepositoryTest.java | 2 +- .../rdf/metadata/CatalogMetadataServiceTest.java | 2 +- .../rdf/metadata/GenericMetadataRdfRepositoryTest.java | 2 +- .../rdf/metadata/GenericMetadataServiceTest.java | 2 +- .../rdf/metadata/MetricsMetadataServiceTest.java | 2 +- .../fairdatapoint/search/SearchServiceTest.java | 2 +- .../org/fairdatateam/fairdatapoint/util/HttpUtilTest.java | 2 +- .../org/fairdatateam/fairdatapoint/util/SemVerTest.java | 1 + 98 files changed, 137 insertions(+), 136 deletions(-) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/HttpUtil.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/IriValidator.java (92%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/KnownUUIDs.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/SemVer.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/SemVerValidator.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/SpringResourceReader.java (98%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/ThrowingFunction.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/ValidIri.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/ValidSemVer.java (96%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/ValidationUtil.java (97%) rename src/main/java/org/fairdatateam/fairdatapoint/{ => common}/util/ValueFactoryHelper.java (98%) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java index ec10d3c9a..571e1e8f6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java @@ -57,7 +57,7 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.getWriterConfig; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @ControllerAdvice @Slf4j diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/HttpUtil.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/HttpUtil.java index 07001633a..96a3ede56 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/HttpUtil.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -36,7 +36,7 @@ import static java.lang.String.format; import static java.util.Optional.of; import static java.util.Optional.ofNullable; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Slf4j public class HttpUtil { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/IriValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/IriValidator.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/util/IriValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/IriValidator.java index f97c64658..59c126fa2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/IriValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/IriValidator.java @@ -20,12 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; public class IriValidator implements ConstraintValidator { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/KnownUUIDs.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/KnownUUIDs.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/util/KnownUUIDs.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/KnownUUIDs.java index b8ecd0234..06147e953 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/KnownUUIDs.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/KnownUUIDs.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; public class KnownUUIDs { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/SemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/SemVer.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/util/SemVer.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/SemVer.java index 4f8d5a0f3..f5d8d676a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/SemVer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/SemVer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/SemVerValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/SemVerValidator.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/util/SemVerValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/SemVerValidator.java index 5739a4736..210ef3d61 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/SemVerValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/SemVerValidator.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/SpringResourceReader.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/SpringResourceReader.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/util/SpringResourceReader.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/SpringResourceReader.java index ef7e43b49..3a544a1bf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/SpringResourceReader.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/SpringResourceReader.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import com.google.common.base.Charsets; import com.google.common.io.Resources; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ThrowingFunction.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ThrowingFunction.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/util/ThrowingFunction.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/ThrowingFunction.java index 9993f0c0a..ecb742d08 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ThrowingFunction.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ThrowingFunction.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import java.util.function.Function; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ValidIri.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidIri.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/util/ValidIri.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidIri.java index bbeb8151b..c84a3551a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ValidIri.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidIri.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ValidSemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidSemVer.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/util/ValidSemVer.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidSemVer.java index 80c327224..fd3e0a741 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ValidSemVer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidSemVer.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ValidationUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidationUtil.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/util/ValidationUtil.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidationUtil.java index f8ec16cd8..cf3019449 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ValidationUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValidationUtil.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.validation.BindException; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ValueFactoryHelper.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValueFactoryHelper.java similarity index 98% rename from src/main/java/org/fairdatateam/fairdatapoint/util/ValueFactoryHelper.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/ValueFactoryHelper.java index f3f378d09..f08de7a0f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ValueFactoryHelper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/ValueFactoryHelper.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import org.eclipse.rdf4j.model.*; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java index abacea949..92871f790 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java @@ -37,9 +37,9 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRequestURL; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getRequestURL; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.removeLastPartOfIRI; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Tag(name = "Client") @RestController diff --git a/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java index 2e5aff17c..423e11c12 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java @@ -46,7 +46,7 @@ import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class DashboardService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java index 94cf36b6d..fa209397d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesNamespaceRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesNamespaceRetriever.java index 53faf96fc..245835780 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesNamespaceRetriever.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/RdfEntitiesNamespaceRetriever.java @@ -40,7 +40,7 @@ import java.util.Map; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getStringObjectBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Component public class RdfEntitiesNamespaceRetriever implements RdfEntitiesRetriever { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java index ff90b8bf4..ec3621fda 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java @@ -43,12 +43,12 @@ import static java.util.Optional.ofNullable; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getChildren; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRdfContentType; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getRdfContentType; import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.read; import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.readFile; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getSubjectsBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Slf4j @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java index f9a142668..eff59f99a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java @@ -50,7 +50,7 @@ import java.util.stream.StreamSupport; import static org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryStateDTO.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Slf4j @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java index 62c2f08d1..43bbcbbc0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.java @@ -24,7 +24,7 @@ import static java.util.function.Predicate.isEqual; import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.LABEL_CACHE; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import org.fairdatateam.rdf.resolver.api.ResourceResolver; import org.fairdatateam.rdf.resolver.core.ContentNegotiationStrategy; import org.fairdatateam.rdf.resolver.core.CoreResourceResolver; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java index 73dd46239..856e9bae9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.security.membership.Membership; import org.fairdatateam.fairdatapoint.security.membership.MembershipPermission; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java index 52074dc2a..3ce88d5e1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java @@ -26,8 +26,8 @@ import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaDraft; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.util.SemVer; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.springframework.stereotype.Service; import java.time.Instant; @@ -35,7 +35,7 @@ import java.util.List; import java.util.Set; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; @Service public class MetadataSchemaFixtures { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java index 6a7e06fcf..3d3f2fd19 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.mongodb.development; import org.fairdatateam.fairdatapoint.resource.*; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java index 31dad954b..3998879a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java @@ -25,7 +25,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java index 8cd58b874..89c288bf4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java @@ -24,7 +24,7 @@ import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java index 42ec2f6df..5904b7e26 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java @@ -27,7 +27,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.BasicBSONObject; import org.bson.Document; import org.bson.types.BasicBSONList; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java index 7b311e79d..546e1e73d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java @@ -27,7 +27,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.eclipse.rdf4j.model.vocabulary.DCAT; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java index 5c0a62b97..ff59e2969 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java @@ -27,11 +27,11 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; @ChangeLog(order = "0003") @Profile(Profiles.PRODUCTION) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java index 38ac33748..1438b9623 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java @@ -28,7 +28,7 @@ import com.mongodb.client.MongoDatabase; import org.fairdatateam.fairdatapoint.Profiles; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.BasicBSONObject; import org.bson.Document; import org.bson.types.BasicBSONList; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java index f933a6772..9f517fed5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java @@ -27,11 +27,11 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; @ChangeLog(order = "0005") @Profile(Profiles.PRODUCTION) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0008_ShapesInternalChange.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0008_ShapesInternalChange.java index 173b0dca7..d3044f3c6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0008_ShapesInternalChange.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0008_ShapesInternalChange.java @@ -29,7 +29,7 @@ import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java index cdb97b1b8..067383487 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0011_ComplyFDPO.java @@ -29,7 +29,7 @@ import org.fairdatateam.fairdatapoint.Profiles; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.bson.Document; import org.eclipse.rdf4j.model.vocabulary.DCAT; @@ -37,7 +37,7 @@ import java.util.*; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; @ChangeLog(order = "0011") @Profile(Profiles.PRODUCTION) diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java index 330078dcf..39d9a8ad9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java @@ -29,11 +29,11 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaShaclUtils; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java index 0efa8f440..a622f083d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java @@ -29,8 +29,8 @@ import io.mongock.api.annotations.Execution; import io.mongock.api.annotations.RollbackExecution; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.SemVer; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java index f521e3ae7..ad4b6c2b1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java @@ -30,13 +30,13 @@ import io.mongock.api.annotations.RollbackExecution; import lombok.SneakyThrows; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; @ChangeUnit( id = "Migration_0016_FixSchemas", diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java index 858bad3c4..578ea6bf5 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0017_FixSchemaDateTimes.java @@ -30,13 +30,13 @@ import io.mongock.api.annotations.RollbackExecution; import lombok.SneakyThrows; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.bson.Document; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; /** * This migration updates the default metadata schemas defining the `fdp`, `dataset`, and `distribution` shapes. diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java index a40b5eb7c..945b75e59 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java @@ -31,7 +31,7 @@ import org.bson.Document; import org.bson.conversions.Bson; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.springframework.context.annotation.Profile; import org.springframework.data.mongodb.core.MongoTemplate; @@ -40,7 +40,7 @@ import static com.mongodb.client.model.Filters.and; import static com.mongodb.client.model.Filters.eq; import static com.mongodb.client.model.Updates.set; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; /** * This migration creates a new version of the default metadata schema for the `DataServiceShape` and marks this as the diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java index b75b30d33..b963ae1c8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.migration.triplestore.development; import org.fairdatateam.fairdatapoint.rdf.metadata.Agent; -import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; +import org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; @@ -34,8 +34,8 @@ import java.util.stream.Collectors; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; @Service public class MetadataFactoryImpl implements MetadataFactory { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java index 004ad5da6..a060dcef6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java @@ -43,7 +43,7 @@ import org.springframework.stereotype.Service; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class RdfMetadataMigration implements Migration { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java index 728290d5f..ba08752d4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java @@ -41,8 +41,8 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.s; @RdfMigrationAnnotation( number = 3, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index 18120eefb..02c686936 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java @@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @RdfMigrationAnnotation( number = 4, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java index 94428195d..c549be5f1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java @@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.s; @RdfMigrationAnnotation( number = 5, diff --git a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java index 1dcc93492..bc6915787 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileController.java @@ -36,8 +36,8 @@ import java.util.Optional; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRequestURL; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getRequestURL; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Tag(name = "Client") @RestController diff --git a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java index fc2d79e3d..4f80702c2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java @@ -42,7 +42,7 @@ import java.util.Optional; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.*; @Service public class ProfileService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java index a6a917253..fc48fc045 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java @@ -36,7 +36,7 @@ import org.eclipse.rdf4j.rio.*; import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter; -import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; +import org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -47,9 +47,9 @@ import java.util.Objects; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getSubjectBy; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.getResource; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.getResource; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.s; public class RdfIOUtil { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryConfig.java index 07dd95f5a..4b1f0317d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfRepositoryConfig.java @@ -41,7 +41,7 @@ import java.io.File; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.removeLastSlash; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.removeLastSlash; @Slf4j @Configuration diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java index 0aa76d413..a8412a4e7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; public class RdfUtil { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java index 4ca91d3bb..1283c4c49 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java @@ -35,7 +35,7 @@ import java.util.*; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadResource; @Slf4j public abstract class AbstractMetadataRdfRepository implements MetadataRdfRepository { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index b772c1e76..92d247cad 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -46,8 +46,8 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getChildren; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; -import static org.fairdatateam.fairdatapoint.util.ThrowingFunction.suppress; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*; +import static org.fairdatateam.fairdatapoint.common.util.ThrowingFunction.suppress; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.*; @Slf4j public abstract class AbstractMetadataService implements MetadataService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java index 837a6f350..f4df0e2b1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class CatalogMetadataRdfRepository extends AbstractMetadataRdfRepository { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java index 128c69edd..508bc3609 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java @@ -53,11 +53,11 @@ import java.util.Optional; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.*; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.*; import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.changeBaseUri; import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.read; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Tag(name = "Metadata") @RestController diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java index 6e95fea22..cc8d8d663 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java @@ -41,7 +41,7 @@ import java.util.List; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getMetadataIdentifier; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getMetadataIRI; @Tag(name = "Authentication and Authorization") @RestController diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java index c3ebd7c12..035682e4d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java @@ -46,9 +46,9 @@ import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getMetadataIdentifier; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getMetadataIRI; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getStringObjectBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Tag(name = "Metadata") @RestController diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java index 2e8a8d3e1..3cde6b69a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java @@ -29,8 +29,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.removeLastSlash; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.removeLastSlash; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Configuration public class MetadataConfig { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java index a546580d7..7b6ad2bec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.profile.ProfileService; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; +import org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper; import org.fairdatateam.fairdatapoint.rdf.vocabulary.DATACITE; import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.IRI; @@ -50,8 +50,8 @@ import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.containsObject; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; @Service public class MetadataEnhancer { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java index 14b4e628e..85b9b93a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java @@ -22,7 +22,7 @@ */ package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; +import org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper; import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; @@ -38,8 +38,8 @@ import java.util.stream.Collectors; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; public class MetadataGetter { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java index 7dbecaeb3..055c3fa77 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java @@ -33,8 +33,8 @@ import java.util.List; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.update; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; public class MetadataSetter { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java index b8ec7d05c..c9751ff2f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java @@ -41,7 +41,7 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class MetadataStateService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java index 0029a80b9..e33c30f0e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java @@ -36,7 +36,7 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class MetadataValidator { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java index 595a3ee6a..4c2d01906 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java @@ -39,7 +39,7 @@ import java.util.List; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Slf4j @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java index 18d8f34a6..136223fe7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java @@ -26,7 +26,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; import org.bson.types.ObjectId; -import org.fairdatateam.fairdatapoint.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.annotation.Transient; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java index eb2602cc9..5379ca4a3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.rdf.schema; import org.fairdatateam.fairdatapoint.rdf.schema.dto.*; -import org.fairdatateam.fairdatapoint.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index 348521636..624044348 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java @@ -31,7 +31,7 @@ import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; -import org.fairdatateam.fairdatapoint.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java index ecb399440..b276e5f1d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java @@ -32,7 +32,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; public class MetadataSchemaShaclUtils { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java index d5c68141a..73e30dc0a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java @@ -27,7 +27,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.util.ValidSemVer; +import org.fairdatateam.fairdatapoint.common.util.ValidSemVer; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java index a5c02c029..d2984eccd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java @@ -24,7 +24,7 @@ import org.eclipse.rdf4j.model.IRI; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; public final class DATACITE { public static final String NAMESPACE = "http://purl.org/spar/datacite/"; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java index 005d2044b..bfa46b93e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java @@ -25,7 +25,7 @@ import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.vocabulary.DCAT; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; /** * Temporary solution for DCAT3 which currently not supported in RDR4J vocabularies diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java index 1c371a51e..d9af34a47 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java @@ -24,7 +24,7 @@ import org.eclipse.rdf4j.model.IRI; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; public final class FDP { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java index 488008ac7..ca87c32c6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java @@ -24,7 +24,7 @@ import org.eclipse.rdf4j.model.IRI; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; public final class R3D { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java index ba48e32a0..408a916a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java @@ -29,7 +29,7 @@ import org.eclipse.rdf4j.model.IRI; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; /** * Semanticscience Integrated Ontology diff --git a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java index fe739fa70..101851b1c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java @@ -28,12 +28,12 @@ import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; -import org.fairdatateam.fairdatapoint.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.fairdatateam.fairdatapoint.resource.*; import org.fairdatateam.fairdatapoint.user.User; import org.fairdatateam.fairdatapoint.user.UserRole; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaShaclUtils; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.fairdatateam.fairdatapoint.rdf.vocabulary.DATACITE; import org.fairdatateam.fairdatapoint.rdf.vocabulary.DCAT3; import org.fairdatateam.fairdatapoint.rdf.vocabulary.FDP; @@ -50,8 +50,8 @@ import java.util.Collections; import java.util.List; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadClassResource; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.*; public class FactoryDefaults { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java index c8db38071..8ea7ab7f4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java @@ -54,7 +54,7 @@ import java.util.List; import java.util.Optional; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Slf4j @Service diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java index f4a8a4847..89ae3ac64 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java @@ -25,7 +25,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java index f9846a8a7..20503b6c4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.java @@ -25,7 +25,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java index 85abcf4d9..789c376fa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java index c331c6a9c..d11f4d613 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java index 0fed67b4c..4bcc0190d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Optional; -import static org.fairdatateam.fairdatapoint.util.ValidationUtil.uniquenessValidationFailed; +import static org.fairdatateam.fairdatapoint.common.util.ValidationUtil.uniquenessValidationFailed; @Service public class ResourceDefinitionValidator { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index 88c334655..6a1e10a26 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -44,9 +44,9 @@ import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; -import static org.fairdatateam.fairdatapoint.util.SpringResourceReader.loadResource; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadResource; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; @Service public class SearchService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java index 77f651d4c..7196849d7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterDTO.java @@ -25,7 +25,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; import org.fairdatateam.fairdatapoint.search.SearchFilterType; import java.util.List; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java index e9295a7ba..41b22fbc9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/dto/SearchFilterItemDTO.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.search.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java index 1fa0212d9..6a680ef61 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.java @@ -41,7 +41,7 @@ import java.io.IOException; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.getToken; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getToken; @Component public class JwtTokenFilter extends OncePerRequestFilter { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.java index eac12be27..50c4acfb6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.java @@ -23,7 +23,7 @@ package org.fairdatateam.fairdatapoint.security.membership; import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java index 78801a83b..37a964fe7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/dto/SettingsAutocompleteSourceDTO.java @@ -24,7 +24,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.util.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java index 8735ceddf..8812ff07f 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java @@ -45,8 +45,8 @@ import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java index 5a76cf620..5f89a6075 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java @@ -45,8 +45,8 @@ import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java index b70e0083a..5e51de184 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java @@ -44,8 +44,8 @@ import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java index 989196536..b1e6a14dd 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java @@ -42,8 +42,8 @@ import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.l; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java index 692b05859..e04457657 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java @@ -27,7 +27,7 @@ import org.fairdatateam.fairdatapoint.migration.mongodb.development.MetadataSchemaFixtures; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.util.SemVer; +import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java index d0403c5d6..cf60f74b6 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java @@ -30,7 +30,7 @@ import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java index 204bc5ff8..2828d65ac 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java @@ -28,7 +28,7 @@ import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryRepository; import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.common.util.KnownUUIDs; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java index 7a304496c..5a7944628 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java @@ -43,7 +43,7 @@ import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.write; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java index 96965e3c6..9eab60242 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepositoryTest.java @@ -41,7 +41,7 @@ import java.util.List; import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java index 6c5f18827..e9f768287 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java @@ -41,7 +41,7 @@ import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getThemeTaxonomies; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java index 1c00830f0..1cf1a58f2 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java @@ -42,7 +42,7 @@ import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getLanguage; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java index b940fe870..bba105a53 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataServiceTest.java @@ -40,7 +40,7 @@ import static java.lang.String.format; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java index 19574c6af..d9140d952 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java @@ -34,7 +34,7 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java index eb9ea1bee..9c9d3425b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java @@ -33,7 +33,7 @@ import java.util.List; import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.core.Is.is; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java b/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java index 2d03c4c8b..c8317af58 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.*; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java index 10786811c..3d11b6428 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java @@ -22,6 +22,7 @@ */ package org.fairdatateam.fairdatapoint.util; +import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.junit.jupiter.api.Test; import java.util.Arrays; From fdaeeacadc93983edd6ca11608053f441266511d Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 28 Aug 2026 14:04:46 +0200 Subject: [PATCH 70/70] adapt test package names to latest changes --- .../fairdatapoint/{ => common}/util/HttpUtilTest.java | 2 +- .../fairdatapoint/{ => common}/util/SemVerTest.java | 3 +-- .../fairdatapoint/index/{ => entry}/HarvesterServiceTest.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) rename src/test/java/org/fairdatateam/fairdatapoint/{ => common}/util/HttpUtilTest.java (98%) rename src/test/java/org/fairdatateam/fairdatapoint/{ => common}/util/SemVerTest.java (96%) rename src/test/java/org/fairdatateam/fairdatapoint/index/{ => entry}/HarvesterServiceTest.java (98%) diff --git a/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java b/src/test/java/org/fairdatateam/fairdatapoint/common/util/HttpUtilTest.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/common/util/HttpUtilTest.java index c8317af58..57f729123 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/util/HttpUtilTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/common/util/HttpUtilTest.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.servlet.http.HttpServletRequest; import org.eclipse.rdf4j.model.IRI; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/common/util/SemVerTest.java similarity index 96% rename from src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/common/util/SemVerTest.java index 3d11b6428..c78c78293 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/util/SemVerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/common/util/SemVerTest.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.util; +package org.fairdatateam.fairdatapoint.common.util; -import org.fairdatateam.fairdatapoint.common.util.SemVer; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterServiceTest.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterServiceTest.java index 5a7944628..d33606524 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/index/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterServiceTest.java @@ -20,9 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.fairdatateam.fairdatapoint.index; +package org.fairdatateam.fairdatapoint.index.entry; -import org.fairdatateam.fairdatapoint.index.entry.HarvesterService; import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; import org.fairdatateam.fairdatapoint.migration.triplestore.development.MetadataFactoryImpl;