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/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; - -} 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 95% rename from src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/CacheConfig.java index 106eec0bb..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; @@ -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/config/ConverterConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/common/config/ConverterConfig.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/ConverterConfig.java index 546a9d912..04f448f9f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/ConverterConfig.java @@ -25,10 +25,10 @@ * 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.api.converter.ErrorConverter; -import org.fairdatateam.fairdatapoint.api.converter.RdfConverter; +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; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/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/properties/InstanceProperties.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/InstanceProperties.java index 111891a6f..49e6e626e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/properties/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.properties; +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 87% rename from src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/MongoConfig.java index d1c4392dd..3003ac9a7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/MongoConfig.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.config; +package org.fairdatateam.fairdatapoint.common.config; import io.mongock.api.config.LegacyMigration; 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.service.settings.SettingsCache; +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; import org.springframework.context.annotation.Bean; @@ -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/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 96% rename from src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/config/WebMvcConfig.java index 26f4f9dc0..f106a6ab4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/WebMvcConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/config/WebMvcConfig.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.config; +package org.fairdatateam.fairdatapoint.common.config; import com.fasterxml.jackson.annotation.JsonInclude; -import org.fairdatateam.fairdatapoint.api.converter.ErrorConverter; -import org.fairdatateam.fairdatapoint.api.converter.RdfConverter; +import org.fairdatateam.fairdatapoint.common.error.ErrorConverter; +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/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/api/converter/ErrorConverter.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/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/common/error/ErrorConverter.java index 0ceb36c38..e24296e9e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/converter/ErrorConverter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/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.common.error; -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/common/error/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/common/error/ErrorDTO.java index e8e06193a..9ca974f50 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/error/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.api.dto.error; +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/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java index b08811f2f..571e1e8f6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/error/ExceptionControllerAdvice.java @@ -25,17 +25,16 @@ * 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.common.error; 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.entity.index.exception.AbstractIndexException; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; +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; import org.eclipse.rdf4j.query.MalformedQueryException; @@ -57,8 +56,8 @@ import java.util.Map; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.getWriterConfig; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.getWriterConfig; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @ControllerAdvice @Slf4j diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/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/entity/exception/ForbiddenException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ForbiddenException.java index 3f59ad0a4..d1ca6653e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.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/entity/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/entity/exception/ResourceNotFoundException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ResourceNotFoundException.java index 2a7a6d690..474508a9f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.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/entity/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/entity/exception/UnauthorizedException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/UnauthorizedException.java index 1d79cd0dc..7ebb6307a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.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/entity/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/entity/exception/ValidationException.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/error/ValidationException.java index b85dfcb2f..ec2f55bc1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.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/util/HttpUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/HttpUtil.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/HttpUtil.java index 01546a0b9..96a3ede56 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/HttpUtil.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.util; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.entity.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; @@ -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/api/validator/IriValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/IriValidator.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/validator/IriValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/IriValidator.java index eb27c90f0..59c126fa2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/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.api.validator; +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/entity/schema/SemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/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/common/util/SemVer.java index 5f91fa7d1..f5d8d676a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/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.entity.schema; +package org.fairdatateam.fairdatapoint.common.util; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/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/common/util/SemVerValidator.java index da23fe7bf..210ef3d61 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/common/util/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.common.util; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; public class SemVerValidator implements ConstraintValidator { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/SpringResourceReader.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java rename to src/main/java/org/fairdatateam/fairdatapoint/common/util/SpringResourceReader.java index 23eea69c2..3a544a1bf 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.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; @@ -37,7 +37,11 @@ import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; -public class ResourceReader { +/** + * Loads Spring Resources. + * Beware: This has nothing to do with the concept of an FDP "Resource". + */ +public class SpringResourceReader { public static String loadResource(String name) { return loadResource(getResource(name)); 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/api/validator/ValidIri.java b/src/main/java/org/fairdatateam/fairdatapoint/common/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/common/util/ValidIri.java index c16c32257..c84a3551a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/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.api.validator; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidSemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/common/util/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/common/util/ValidSemVer.java index 02d440381..fd3e0a741 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/validator/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.api.validator; +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/api/dto/config/BootstrapConfigDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/config/BootstrapConfigDTO.java similarity index 91% 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 6ff2c0e7a..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,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.config; +package org.fairdatateam.fairdatapoint.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/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 85% rename from src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java rename to src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.java index 57df4ddd9..4451a23d6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConfigService.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.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.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +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; 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/api/controller/dashboard/DashboardController.java b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.java similarity index 82% 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 0f113528b..92871f790 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardController.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.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.service.metadata.exception.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; @@ -39,9 +37,9 @@ 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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getRequestURL; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.removeLastPartOfIRI; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Tag(name = "Client") @RestController 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 88% 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 f8327c659..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,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.dashboard; +package org.fairdatateam.fairdatapoint.dashboard; import lombok.AllArgsConstructor; import lombok.Getter; 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.security.membership.MembershipDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import java.util.List; import java.util.Optional; 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 76% rename from src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java rename to src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java index 7356120ad..423e11c12 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/dashboard/DashboardService.java @@ -20,20 +20,19 @@ * 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.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.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.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.security.membership.MemberService; +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; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Value; @@ -45,9 +44,9 @@ import java.util.List; import java.util.Optional; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getTitle; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class DashboardService { 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 92% 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..fa209397d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormAutocompleteRequestDTO.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.form; +package org.fairdatateam.fairdatapoint.form; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor 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 89% 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..fa44262f9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteCache.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.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; 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/service/form/autocomplete/FormsAutocompleteService.java b/src/main/java/org/fairdatateam/fairdatapoint/form/FormsAutocompleteService.java similarity index 84% 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 41c603251..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,16 +20,10 @@ * 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.entity.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.Settings; +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 92% 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 4cf60ea91..245835780 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; @@ -40,8 +39,8 @@ import java.util.HashMap; import java.util.Map; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getStringObjectBy; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Component public class RdfEntitiesNamespaceRetriever implements RdfEntitiesRetriever { 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 93% 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 498171a15..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,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.form.autocomplete.retrieval; +package org.fairdatateam.fairdatapoint.form; -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/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, 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 86% 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 368746112..334fe2ea9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexAdminController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexAdminController.java @@ -20,19 +20,19 @@ * 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.database.rdf.repository.MetadataRepositoryException; -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.webhook.WebhookService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryService; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +import org.fairdatateam.fairdatapoint.index.event.Event; +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; @@ -62,7 +62,7 @@ public class IndexAdminController { public void triggerMetadataRetrieve( @RequestBody @Valid PingDTO reqDto, HttpServletRequest request - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { log.info("Received ping trigger request from {}", request.getRemoteAddr()); final Event event = eventService.acceptAdminTrigger(request, reqDto); webhookService.triggerWebhooks(event); 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 84% 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..6910992f3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/IndexFeatureAspect.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/IndexFeatureAspect.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.common; +package org.fairdatateam.fairdatapoint.index; import lombok.SneakyThrows; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.entity.exception.FeatureDisabledException; +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; import org.aspectj.lang.annotation.Aspect; @@ -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 88% 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 a5cff596a..e25a37177 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,12 +31,12 @@ 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.database.rdf.repository.MetadataRepositoryException; -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.webhook.WebhookService; +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.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; @@ -91,7 +91,7 @@ public class IndexPingController { public ResponseEntity receivePing( @RequestBody @Valid PingDTO reqDto, HttpServletRequest request - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { log.info("Received ping from {}", request.getRemoteAddr()); 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/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/service/index/harvester/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java similarity index 82% rename from src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.java index 806886b43..ec3621fda 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterService.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.harvester; +package org.fairdatateam.fairdatapoint.index.entry; 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.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; @@ -42,13 +42,13 @@ import java.util.*; import static java.util.Optional.ofNullable; -import static org.fairdatateam.fairdatapoint.entity.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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getChildren; +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.common.util.ValueFactoryHelper.i; @Slf4j @Service @@ -58,24 +58,26 @@ public class HarvesterService { private static final String DEFAULT_NAVIGATION_SHACL = "defaultNavigationShacl.ttl"; - private final GenericMetadataRepository genericMetadataRepository; + private final GenericMetadataRdfRepository genericMetadataRdfRepository; private final RestClient restClient; /** * Constructor (autowired) */ - public HarvesterService(GenericMetadataRepository genericMetadataRepository, RestClient.Builder restClientBuilder) { - this.genericMetadataRepository = genericMetadataRepository; + public HarvesterService( + GenericMetadataRdfRepository genericMetadataRdfRepository, RestClient.Builder restClientBuilder + ) { + this.genericMetadataRdfRepository = genericMetadataRdfRepository; this.restClient = restClientBuilder.build(); } - public void deleteHarvestedData(String clientUrl) throws MetadataRepositoryException { - genericMetadataRepository.remove(i(clientUrl)); + public void deleteHarvestedData(String clientUrl) throws MetadataRdfRepositoryException { + genericMetadataRdfRepository.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 @@ -90,7 +92,7 @@ public void harvest(String clientUrl) throws MetadataRepositoryException { // 3. Store data for (Map.Entry item : result.entrySet()) { - genericMetadataRepository.save(new ArrayList<>(item.getValue()), i(clientUrl)); + genericMetadataRdfRepository.save(new ArrayList<>(item.getValue()), i(clientUrl)); } log.info("Harvesting for '{}' completed", clientUrl); 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 95% 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..634cd41eb 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,11 @@ * 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; import lombok.*; import org.bson.types.ObjectId; +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/api/controller/index/IndexEntryController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryController.java similarity index 81% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryController.java index aaab95743..614a9e839 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryController.java @@ -20,22 +20,19 @@ * 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.entry; 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.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.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.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.index.event.Event; +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; @@ -88,7 +85,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(); @@ -106,13 +103,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/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..efe5ba2e3 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,13 @@ * 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.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/database/mongo/repository/IndexEntryRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/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/entry/IndexEntryRepository.java index d400611a3..e20092869 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/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.database.mongo.repository; +package org.fairdatateam.fairdatapoint.index.entry; -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.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/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/entry/IndexEntryService.java similarity index 87% 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..eff59f99a 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,25 +20,20 @@ * 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.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.service.security.CurrentUserProvider; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; +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; +import org.fairdatateam.fairdatapoint.index.RequiredEnabledIndexFeature; +import org.fairdatateam.fairdatapoint.index.event.EventService; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsService; +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; @@ -54,8 +49,8 @@ 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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryStateDTO.*; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Slf4j @Service @@ -79,7 +74,7 @@ public class IndexEntryService { private IndexEntryMapper mapper; @Autowired - private GenericMetadataRepository genericMetadataRepository; + private GenericMetadataRdfRepository genericMetadataRepository; @Autowired private HarvesterService harvesterService; @@ -253,7 +248,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()); @@ -261,7 +256,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) { @@ -277,7 +272,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/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..2f819e457 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.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..635a5c78c 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,9 @@ * 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.dto.EventDTO; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; 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 86% 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 56ec457c3..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.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.entry.IndexEntry; 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/event/EventService.java b/src/main/java/org/fairdatateam/fairdatapoint/index/event/EventService.java similarity index 88% 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 3ecf36ec3..4fcdf17ce 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,31 +20,28 @@ * 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.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.entry.IndexEntryRepository; +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.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.settings.IndexSettingsPing; +import org.fairdatateam.fairdatapoint.index.settings.IndexSettingsRetrieval; +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..f581e2557 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,12 @@ * 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.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 91% 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..1379999bc 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,19 +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; -import org.fairdatateam.fairdatapoint.vocabulary.DCAT3; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; -import org.fairdatateam.fairdatapoint.vocabulary.R3D; +package org.fairdatateam.fairdatapoint.index.event; + +import org.fairdatateam.fairdatapoint.index.RepositoryMetadata; +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.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/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 92% 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..f44e14d1f 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,9 +20,9 @@ * 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.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/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/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/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/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..d3a9a9b06 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.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexSettingsController.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/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/settings/IndexSettingsController.java index e109be41c..9bd156cc0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/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.api.controller.index; +package org.fairdatateam.fairdatapoint.index.settings; 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.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/service/index/settings/IndexSettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsMapper.java similarity index 86% 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..43b033a96 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,12 @@ * 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.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..618db613a 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.settings; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRepository.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/index/settings/IndexSettingsRepository.java index 9f338225f..7fd1b8e05 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/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.database.mongo.repository; +package org.fairdatateam.fairdatapoint.index.settings; -import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; 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..f1ecc2f61 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.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 80% 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..cf3556f1e 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,14 @@ * 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.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.event.dto.PingDTO; +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.RequiredEnabledIndexFeature; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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/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 92% 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..25985da98 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,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.settings; +package org.fairdatateam.fairdatapoint.index.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; 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/api/dto/index/settings/IndexSettingsRetrievalDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/index/settings/dto/IndexSettingsRetrievalDTO.java similarity index 92% 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..de872984d 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,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.settings; +package org.fairdatateam.fairdatapoint.index.settings.dto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; 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/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/entity/index/webhook/Webhook.java b/src/main/java/org/fairdatateam/fairdatapoint/index/webhook/Webhook.java similarity index 92% 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..0ae170fa9 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; @@ -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 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/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 326a3af45..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.entity.index.webhook.Webhook; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.Optional; 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 87% 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 7e6804ec3..e29081f5f 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,20 +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.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.service.index.common.RequiredEnabledIndexFeature; -import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService; +import org.fairdatateam.fairdatapoint.index.event.EventRepository; +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; +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/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 93% 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..43bbcbbc0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/label/LabelService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/label/LabelService.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.label; +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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.LABEL_CACHE; +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; @@ -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/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/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/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/AclMigration.java similarity index 87% 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/AclMigration.java index d09a325bc..8ac4c9ec8 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/AclMigration.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.database.mongo.migration.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.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.service.member.MemberService; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; + +import org.fairdatateam.fairdatapoint.migration.Migration; +import org.fairdatateam.fairdatapoint.rdf.metadata.Metadata; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; +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/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyFixtures.java similarity index 89% 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/ApiKeyFixtures.java index d5fa6c85d..ada36042d 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/ApiKeyFixtures.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.database.mongo.migration.development.apikey.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.database.mongo.migration.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/database/mongo/migration/development/apikey/ApiKeyMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ApiKeyMigration.java similarity index 82% 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/ApiKeyMigration.java index 5a82209aa..3b5fd2339 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/ApiKeyMigration.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.database.mongo.migration.development.apikey; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.ApiKeyRepository; +import org.fairdatateam.fairdatapoint.migration.Migration; +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/database/mongo/migration/development/MigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/DevelopmentMigrationRunner.java similarity index 67% 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 05041619e..dd9223d24 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,31 +20,21 @@ * 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.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache; -import org.fairdatateam.fairdatapoint.service.settings.SettingsCache; +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; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @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/index/event/EventMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/EventMigration.java similarity index 89% 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/EventMigration.java index d244d5dcc..41d7049ea 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/EventMigration.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.index.event; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryFixtures.java similarity index 95% 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/IndexEntryFixtures.java index bb53d980d..32d3cc721 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/IndexEntryFixtures.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.mongo.migration.development.index.entry.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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.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/development/index/entry/IndexEntryMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/IndexEntryMigration.java similarity index 84% 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/IndexEntryMigration.java index 01b4d8c34..bf6898332 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/IndexEntryMigration.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.database.mongo.migration.development.index.entry; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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.migration.Migration; +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/database/mongo/migration/development/membership/data/MembershipFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipFixtures.java similarity index 89% 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/MembershipFixtures.java index 341541db0..856e9bae9 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/MembershipFixtures.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.membership.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.entity.membership.Membership; -import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.security.membership.Membership; +import org.fairdatateam.fairdatapoint.security.membership.MembershipPermission; +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/database/mongo/migration/development/membership/MembershipMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MembershipMigration.java similarity index 82% 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/MembershipMigration.java index a1e4d1389..01a84f27d 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/MembershipMigration.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.database.mongo.migration.development.membership; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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.repository.MembershipRepository; +import org.fairdatateam.fairdatapoint.migration.Migration; +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/database/mongo/migration/development/metadata/data/MetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataFixtures.java similarity index 93% 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/MetadataFixtures.java index b06c49018..17a52967c 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/MetadataFixtures.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.metadata.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.entity.metadata.Metadata; -import org.fairdatateam.fairdatapoint.entity.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/database/mongo/migration/development/metadata/MetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataMigration.java similarity index 85% 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/MetadataMigration.java index e2c4da1c2..35ce432e6 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/MetadataMigration.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.metadata; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository; +import org.fairdatateam.fairdatapoint.migration.Migration; +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/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/MetadataSchemaFixtures.java similarity index 95% 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/MetadataSchemaFixtures.java index 3c8d13313..3ce88d5e1 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/MetadataSchemaFixtures.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.database.mongo.migration.development.schema.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; 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.util.KnownUUIDs; +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.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.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; @Service public class MetadataSchemaFixtures { 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/MetadataSchemaMigration.java similarity index 85% 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/MetadataSchemaMigration.java index f03badda9..59a70d261 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/MetadataSchemaMigration.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.database.mongo.migration.development.schema; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.database.common.migration.Migration; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.migration.Migration; +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/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionFixtures.java similarity index 94% 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/ResourceDefinitionFixtures.java index a80f057e8..3d3f2fd19 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/ResourceDefinitionFixtures.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.resource.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.entity.resource.*; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.resource.*; +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/database/mongo/migration/development/resource/ResourceDefinitionMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/ResourceDefinitionMigration.java similarity index 81% 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/ResourceDefinitionMigration.java index a5991e3a1..34a13f387 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/ResourceDefinitionMigration.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.database.mongo.migration.development.resource; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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.migration.Migration; +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/search/SearchSavedQueryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SearchSavedQueryFixtures.java similarity index 91% 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/SearchSavedQueryFixtures.java index 2fcf379e9..3998879a0 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/SearchSavedQueryFixtures.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.mongo.migration.development.search; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.search.dto.SearchQueryVariablesDTO; +import org.fairdatateam.fairdatapoint.search.SearchSavedQuery; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; +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/database/mongo/migration/development/settings/data/SettingsFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsFixtures.java similarity index 90% 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/SettingsFixtures.java index 43006a8d4..4386da6df 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/SettingsFixtures.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.mongo.migration.development.settings.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.entity.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.search.SearchFilterType; +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/development/settings/SettingsMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/SettingsMigration.java similarity index 84% 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/SettingsMigration.java index b510a98fe..db9f9ab99 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/SettingsMigration.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.database.mongo.migration.development.settings; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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/user/data/UserFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserFixtures.java similarity index 91% 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/UserFixtures.java index f33d3b3f4..89c288bf4 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/UserFixtures.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.user.data; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.user.User; +import org.fairdatateam.fairdatapoint.user.UserRole; +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/database/mongo/migration/development/user/UserMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/development/UserMigration.java similarity index 83% 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/UserMigration.java index dd1dd602e..1354d39d2 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/UserMigration.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.database.mongo.migration.development.user; +package org.fairdatateam.fairdatapoint.migration.mongodb.development; -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.migration.Migration; +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/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0001_Init.java similarity index 97% 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 342f7b681..5904b7e26 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,14 +20,14 @@ * 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; 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/database/mongo/migration/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0002_CustomMetamodel.java similarity index 97% 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 20d96b13d..546e1e73d 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,14 +20,14 @@ * 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; 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/database/mongo/migration/production/Migration_0003_ShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0003_ShapeDefinition.java similarity index 93% 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..ff59e2969 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,18 +20,18 @@ * 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; 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.ResourceReader.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/database/mongo/migration/production/Migration_0004_ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0004_ResourceDefinition.java similarity index 97% 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 8ee8c41c5..1438b9623 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,15 +20,15 @@ * 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; 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.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +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/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0005_UpdateShapeDefinition.java similarity index 94% 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..9f517fed5 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,18 +20,18 @@ * 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; 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.ResourceReader.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/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 95% 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..d3044f3c6 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; @@ -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/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0009_ShapeTargetClasses.java similarity index 92% 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 b10aeb361..82d38a92f 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; @@ -29,9 +29,9 @@ 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.service.schema.MetadataSchemaShaclUtils; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; +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/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 92% 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 ef65709aa..067383487 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,24 +20,24 @@ * 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; 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.util.KnownUUIDs; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionTargetClassesCache; +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; import org.springframework.context.annotation.Profile; import java.util.*; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.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/database/mongo/migration/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0012_MetadataSchemas.java similarity index 96% 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 7a6f61f3f..39d9a8ad9 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; @@ -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.entity.schema.SemVer; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +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.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/database/mongo/migration/production/Migration_0013_ComplexSearch.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0013_ComplexSearch.java similarity index 95% 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 a8d713e88..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; @@ -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/migration/mongodb/production/Migration_0014_FormsAutocomplete.java similarity index 95% 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 2a0fa4230..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; @@ -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_0015_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0015_FixMetadataVersion.java similarity index 96% 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..a622f083d 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; @@ -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.entity.schema.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/database/mongo/migration/production/Migration_0016_FixSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0016_FixSchemas.java similarity index 93% 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..ad4b6c2b1 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; @@ -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.ResourceReader.loadClassResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.loadClassResource; @ChangeUnit( id = "Migration_0016_FixSchemas", 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 94% 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..578ea6bf5 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; @@ -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.ResourceReader.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/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 95% 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 601fe3814..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; @@ -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/migration/production/Migration_0020_FixSchemaEndpointDescription.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0020_FixSchemaEndpointDescription.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java index 328d111e1..945b75e59 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0020_FixSchemaEndpointDescription.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0020_FixSchemaEndpointDescription.java @@ -20,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 io.mongock.api.annotations.ChangeUnit; @@ -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.ResourceReader.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/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java new file mode 100644 index 000000000..c4707c5ec --- /dev/null +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/mongodb/production/Migration_0021_UpdateMongoTypeMapperClassNames.java @@ -0,0 +1,131 @@ +/** + * 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.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; + +/** + * 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( + id = "Migration_0021_UpdateMongoTypeMapperClassNames", + order = "0021", + author = "migrationBot" +) +@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 "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("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("webhook", CLASS, "org.fairdatateam.fairdatapoint.index.webhook.Webhook") + ); + + private final MongoTemplate mongoTemplate; + + /** + * Constructor (autowired) + */ + public Migration_0021_UpdateMongoTypeMapperClassNames(MongoTemplate mongoTemplate) { + this.mongoTemplate = mongoTemplate; + } + + /** + * Applies all the changes + */ + @Execution + public void run() { + CHANGES.forEach(this::applyChange); + } + + /** + * Applies a Change to all relevant documents in the mongodb database + */ + @SneakyThrows + private void applyChange(Change change) { + // get the mongodb collection + final MongoCollection collection = mongoTemplate.getCollection(change.collection()); + // 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())); + } + + /** + * 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() { + // 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) { + } + +} diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/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/database/rdf/migration/development/metadata/factory/MetadataFactory.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactory.java index ef4bdcfd3..0682fb633 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/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.database.rdf.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/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.java index ff9c67457..b963ae1c8 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/MetadataFactoryImpl.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.rdf.migration.development.metadata.factory; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; -import org.fairdatateam.fairdatapoint.entity.metadata.Agent; -import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; +import org.fairdatateam.fairdatapoint.rdf.metadata.Agent; +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; @@ -33,9 +33,9 @@ import java.util.List; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; +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/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/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/migration/triplestore/development/RdfDevelopmentMigrationRunner.java index 832f5cce9..19b47927e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/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.database.rdf.migration.development; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; import jakarta.annotation.PostConstruct; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.database.rdf.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/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/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataFixtures.java index a7c927910..41ea8513e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/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.database.rdf.migration.development.metadata.data; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; -import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; @@ -102,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 ); } diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java similarity index 77% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java rename to src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java index 7ebafc3e8..a060dcef6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/development/RdfMetadataMigration.java @@ -20,21 +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; - -import org.fairdatateam.fairdatapoint.api.dto.metadata.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.entity.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.service.security.MongoAuthenticationService; +package org.fairdatateam.fairdatapoint.migration.triplestore.development; + +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.migration.Migration; +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; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +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.auth.MongoAuthenticationService; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; @@ -43,14 +42,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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class RdfMetadataMigration implements Migration { @Autowired - private GenericMetadataRepository metadataRepository; + private GenericMetadataRdfRepository metadataRepository; @Autowired private RdfMetadataFixtures rdfMetadataFixtures; @@ -92,7 +91,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/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.java similarity index 96% 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/migration/triplestore/production/Rdf_Migration_0001_Init.java index 00f2cb32c..1d2f87b02 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0001_Init.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.production; +package org.fairdatateam.fairdatapoint.migration.triplestore.production; 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/database/rdf/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 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/migration/triplestore/production/Rdf_Migration_0002_Metadata_Draft.java index 9b63a921e..ca06aed2b 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/migration/triplestore/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.migration.triplestore.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.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/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.java similarity index 95% 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/migration/triplestore/production/Rdf_Migration_0003_FDPO.java index 78d6b6fa5..ba08752d4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0003_FDPO.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.production; +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; @@ -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/database/rdf/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 86% 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/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.java index e0eced977..02c686936 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/migration/triplestore/production/Rdf_Migration_0004_Cleanup_Index.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.database.rdf.migration.production; +package org.fairdatateam.fairdatapoint.migration.triplestore.production; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties; -import org.fairdatateam.fairdatapoint.database.mongo.repository.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.common.config.InstanceProperties; +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; import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation; import org.fairdatateam.rdf.migration.runner.RdfProductionMigration; import org.eclipse.rdf4j.model.Value; @@ -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, @@ -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/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java similarity index 93% 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/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.java index 2d0966490..c549be5f1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/migration/triplestore/production/Rdf_Migration_0005_FixMetadataVersion.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.rdf.migration.production; +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; @@ -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/config/OpenApiConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/config/OpenApiConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiConfig.java index 7042de640..dfeaec344 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; @@ -31,9 +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.properties.OpenApiProperties; -import org.fairdatateam.fairdatapoint.service.openapi.OpenApiTagsUtils; +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/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 98% rename from src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiGenerator.java index 17cd6fd12..fbe925049 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; @@ -34,12 +34,12 @@ 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.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.entity.resource.ResourceDefinition; +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; +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/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 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiService.java index 9d6844824..44436633d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiService.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.openapi; +package org.fairdatateam.fairdatapoint.openapi; import io.swagger.v3.oas.models.OpenAPI; 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/openapi/OpenApiTagsUtils.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiTagsUtils.java index 8eae8beb5..450538ebb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/openapi/OpenApiTagsUtils.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.openapi; +package org.fairdatateam.fairdatapoint.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/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 91% rename from src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java rename to src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.java index dd25d87a5..2f54c93f2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/ping/PingService.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.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.entity.settings.Settings; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +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; import org.springframework.http.MediaType; import org.springframework.scheduling.annotation.Async; 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 88% 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..bc6915787 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.fairdatateam.fairdatapoint.common.error.ResourceNotFoundException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; @@ -37,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/service/profile/ProfileService.java b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java rename to src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.java index 2b969c2ad..4f80702c2 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/profile/ProfileService.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.service.profile; +package org.fairdatateam.fairdatapoint.profile; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +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; import org.eclipse.rdf4j.model.Resource; @@ -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/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 89% rename from src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.java index aa2b21fd6..fc48fc045 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfIOUtil.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.util; +package org.fairdatateam.fairdatapoint.rdf; -import org.fairdatateam.fairdatapoint.entity.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; @@ -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.common.util.ValueFactoryHelper; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -44,11 +46,10 @@ import java.util.List; import java.util.Objects; -import static org.fairdatateam.fairdatapoint.entity.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; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getSubjectBy; +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 { @@ -76,7 +77,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 97% rename from src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.java index 40faf5477..a8412a4e7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/RdfUtil.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.util; +package org.fairdatateam.fairdatapoint.rdf; import org.eclipse.rdf4j.model.*; 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/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/service/rdf/StandaloneShaclValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidator.java similarity index 91% rename from src/main/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidator.java index b322cbacd..f5b7acaec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidator.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.rdf; +package org.fairdatateam.fairdatapoint.rdf; import lombok.extern.slf4j.Slf4j; import org.eclipse.rdf4j.rio.RDFFormat; import org.eclipse.rdf4j.rio.Rio; import org.eclipse.rdf4j.sail.shacl.ShaclValidator; import org.eclipse.rdf4j.sail.shacl.results.ValidationReport; -import org.fairdatateam.fairdatapoint.entity.exception.RdfValidationException; import org.eclipse.rdf4j.model.Model; import org.springframework.stereotype.Service; @@ -38,7 +37,7 @@ public class StandaloneShaclValidator { /** - * Converts an RDF4J Model instance to a String, because ShaclValidator.Builder.withShapes() does not accept Model. + * Converts an RDF4J Model instance to a String because ShaclValidator.Builder.withShapes() does not accept Model. */ private String modelToString(Model model) { final StringWriter writer = new StringWriter(); diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/AbstractMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java similarity index 80% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/AbstractMetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataRdfRepository.java index 1fa0303e2..1283c4c49 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/AbstractMetadataRepository.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.database.rdf.repository; +package org.fairdatateam.fairdatapoint.rdf.metadata; import lombok.extern.slf4j.Slf4j; import org.eclipse.rdf4j.common.iteration.Iterations; @@ -35,10 +35,10 @@ import java.util.*; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadResource; +import static org.fairdatateam.fairdatapoint.common.util.SpringResourceReader.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/rdf/metadata/AbstractMetadataService.java similarity index 79% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java index bd4e92b00..92d247cad 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/AbstractMetadataService.java @@ -20,26 +20,18 @@ * 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.rdf.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.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.entity.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.service.security.CurrentUserProvider; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +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; +import org.fairdatateam.fairdatapoint.security.membership.MemberService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; +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; import org.eclipse.rdf4j.model.Statement; @@ -52,16 +44,16 @@ 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.util.ThrowingFunction.suppress; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getChildren; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.common.util.ThrowingFunction.suppress; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.*; @Slf4j 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()); } } @@ -135,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( @@ -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/rdf/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/rdf/metadata/AccessRights.java index c18c2e0c4..baa2a6635 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.metadata; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/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/rdf/metadata/Agent.java index 223bf11b2..72f580130 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.metadata; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/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/rdf/metadata/Authorization.java index 9556df014..b77672131 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.metadata; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/metadata/CatalogMetadataRdfRepository.java similarity index 85% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataRdfRepository.java index 479fcc6d4..f4df0e2b1 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/CatalogMetadataRepository.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.database.rdf.repository; +package org.fairdatateam.fairdatapoint.rdf.metadata; import jakarta.annotation.PostConstruct; import org.eclipse.rdf4j.model.IRI; @@ -33,11 +33,11 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.common.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/rdf/metadata/CatalogMetadataService.java similarity index 78% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataService.java index 0466c8f98..65fbf25ff 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.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.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; @@ -36,14 +32,14 @@ import jakarta.annotation.Nonnull; import java.util.List; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.setThemeTaxonomies; +import static org.fairdatateam.fairdatapoint.rdf.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/rdf/metadata/GenericController.java similarity index 90% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java index 954045fec..508bc3609 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericController.java @@ -20,28 +20,19 @@ * 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.rdf.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.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild; -import org.fairdatateam.fairdatapoint.entity.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.service.schema.MetadataSchemaService; -import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +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; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaService; +import org.fairdatateam.fairdatapoint.search.SearchFilterCache; +import org.fairdatateam.fairdatapoint.security.CurrentUserProvider; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Value; @@ -62,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.util.RdfIOUtil.changeBaseUri; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +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.common.util.ValueFactoryHelper.i; @Tag(name = "Metadata") @RestController @@ -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/rdf/metadata/GenericMemberController.java similarity index 85% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java index ca817fe6e..cc8d8d663 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMemberController.java @@ -20,19 +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.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.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.fairdatateam.fairdatapoint.security.membership.MemberCreateDTO; +import org.fairdatateam.fairdatapoint.security.membership.MemberDTO; +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; import org.springframework.beans.factory.annotation.Autowired; @@ -44,8 +40,8 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier; -import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getMetadataIdentifier; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getMetadataIRI; @Tag(name = "Authentication and Authorization") @RestController diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java similarity index 80% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java index 38d2b859b..035682e4d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetaController.java @@ -20,24 +20,19 @@ * 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.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.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.entity.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.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.security.membership.MemberService; +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; @@ -49,11 +44,11 @@ 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.util.HttpUtil.getMetadataIRI; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getMetadataIdentifier; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; +import static org.fairdatateam.fairdatapoint.common.util.HttpUtil.getMetadataIRI; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getStringObjectBy; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Tag(name = "Metadata") @RestController diff --git a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java similarity index 77% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepository.java index 9d3399e45..c730ac92b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepository.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.database.rdf.repository; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.eclipse.rdf4j.model.*; import org.eclipse.rdf4j.model.impl.LinkedHashModel; @@ -30,42 +30,42 @@ 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.common.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.rdf.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/rdf/metadata/GenericMetadataService.java similarity index 76% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataService.java index 0b7975d1b..346089e8e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.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.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; -import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; +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; 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.rdf.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/rdf/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/rdf/metadata/Identifier.java index 63e1fc34d..daddd6379 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.metadata; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/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/rdf/metadata/Metadata.java index b70d816d8..817bf56fc 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.metadata; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/metadata/MetadataConfig.java similarity index 88% rename from src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java index 3c3806013..3cde6b69a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataConfig.java @@ -20,17 +20,17 @@ * 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.rdf.metadata; -import org.fairdatateam.fairdatapoint.config.properties.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; 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/service/metadata/enhance/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java similarity index 84% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java index 6992132f4..7b6ad2bec 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataEnhancer.java @@ -20,19 +20,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -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.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.util.ValueFactoryHelper; -import org.fairdatateam.fairdatapoint.vocabulary.DATACITE; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +package org.fairdatateam.fairdatapoint.rdf.metadata; + +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionChild; +import org.fairdatateam.fairdatapoint.actuator.AppInfoContributor; +import org.fairdatateam.fairdatapoint.profile.ProfileService; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionCache; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionService; +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; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.vocabulary.*; @@ -48,12 +46,12 @@ 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.util.RdfUtil.containsObject; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; +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.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/entity/metadata/MetadataGetter.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.java index de21249f9..85b9b93a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataGetter.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.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +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; import org.eclipse.rdf4j.model.Model; @@ -37,9 +37,9 @@ import java.util.List; import java.util.stream.Collectors; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.*; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.*; +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/database/rdf/repository/MetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java similarity index 76% rename from src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepository.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataRdfRepository.java index b5e824fa4..8422ae34e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepository.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.database.rdf.repository; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.eclipse.rdf4j.model.*; import org.eclipse.rdf4j.query.BindingSet; @@ -33,24 +33,25 @@ 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/rdf/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/rdf/metadata/MetadataRdfRepositoryException.java index 41d8240b9..1f1fad10c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryException.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.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/rdf/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/rdf/metadata/MetadataRepository.java index 3b765d817..dd475146b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.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/rdf/metadata/MetadataService.java similarity index 85% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataService.java index 44a06e92f..5e0a01a32 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.metadata; -import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; +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/service/metadata/exception/MetadataServiceException.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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/rdf/metadata/MetadataServiceException.java index 9a1c786e1..9ea86653c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/exception/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.service.metadata.exception; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/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/rdf/metadata/MetadataServiceFactory.java index 2a7b243be..7a1f585fe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.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/rdf/metadata/MetadataSetter.java similarity index 94% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.java index eb223c169..055c3fa77 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataSetter.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.entity.metadata; +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,9 +32,9 @@ import java.util.List; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.update; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.update; +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/entity/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/entity/metadata/MetadataState.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataState.java index 3a3f0fc51..fe836942e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.metadata; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/metadata/MetadataStateService.java similarity index 82% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.java index de04da710..c9751ff2f 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateService.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.metadata.state; - -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.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.service.metadata.validator.MetadataStateValidator; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +package org.fairdatateam.fairdatapoint.rdf.metadata; + +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; +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; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.springframework.beans.factory.annotation.Autowired; @@ -44,8 +40,8 @@ import java.util.stream.Collectors; import static java.lang.String.format; -import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.RdfUtil.getObjectsBy; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class MetadataStateService { diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java similarity index 82% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataStateValidator.java index 96ce9e06b..bb75f6d04 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.metadata; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO; -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.rdf.metadata.dto.MetaStateChangeDTO; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; 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/rdf/metadata/MetadataValidator.java similarity index 77% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.java index 786935b8f..e33c30f0e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetadataValidator.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.metadata.validator; +package org.fairdatateam.fairdatapoint.rdf.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.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException; -import org.fairdatateam.fairdatapoint.service.rdf.StandaloneShaclValidator; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; -import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService; +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; +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; @@ -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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getParent; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; @Service public class MetadataValidator { @Autowired - @Qualifier("genericMetadataRepository") - private MetadataRepository metadataRepository; + @Qualifier("genericMetadataRdfRepository") + private MetadataRdfRepository metadataRepository; @Autowired private StandaloneShaclValidator standaloneShaclValidator; @@ -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/rdf/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/rdf/metadata/Metric.java index 2a552961b..9cc27b19b 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.metadata; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/metadata/MetricsMetadataService.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java index 82a525f68..4c2d01906 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataService.java @@ -25,12 +25,11 @@ * 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 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; @@ -40,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/api/dto/metadata/MetaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java similarity index 93% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaDTO.java index 3dac86b3a..dca4ca572 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/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.api.dto.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; @@ -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/api/dto/metadata/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/api/dto/metadata/MetaPathDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaPathDTO.java index e648f1d2f..e8b48f9aa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/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.api.dto.metadata; +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/api/dto/metadata/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/api/dto/metadata/MetaStateChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/metadata/dto/MetaStateChangeDTO.java index c70ee6b90..90a777905 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/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.api.dto.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.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/rdf/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/rdf/metadata/dto/MetaStateDTO.java index 48ef27dad..0a1a12e93 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/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.api.dto.metadata; +package org.fairdatateam.fairdatapoint.rdf.metadata.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataState; import java.util.Map; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java similarity index 97% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.java index 2a9e41004..136223fe7 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchema.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.entity.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; import org.bson.types.ObjectId; +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/api/controller/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.java index 8a0a73a79..30f1b1eeb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaController.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.api.controller.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.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.service.security.CurrentUserProvider; +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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/entity/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/entity/schema/MetadataSchemaDraft.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaDraft.java index 258f29807..8dd4a3c44 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.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/database/mongo/repository/MetadataSchemaDraftRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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/rdf/schema/MetadataSchemaDraftRepository.java index ae51b45f8..976af5605 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.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/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/service/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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/rdf/schema/MetadataSchemaMapper.java index 2f1b61de6..5379ca4a3 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaMapper.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaMapper.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.schema; +package org.fairdatateam.fairdatapoint.rdf.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.rdf.schema.dto.*; +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/database/mongo/repository/MetadataSchemaRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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/rdf/schema/MetadataSchemaRepository.java index 4e2b5c96b..94436ac2a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/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.rdf.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/rdf/schema/MetadataSchemaRetrievalUtils.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.java index 2122e0d04..7cf10d440 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaRetrievalUtils.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.schema; +package org.fairdatateam.fairdatapoint.rdf.schema; import lombok.extern.slf4j.Slf4j; -import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO; -import org.fairdatateam.fairdatapoint.entity.exception.MetadataSchemaImportException; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; import org.springframework.http.HttpHeaders; import tools.jackson.core.JacksonException; import tools.jackson.core.type.TypeReference; diff --git a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java similarity index 96% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.java index 21d1f7ebe..624044348 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaService.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.service.schema; +package org.fairdatateam.fairdatapoint.rdf.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.service.resource.ResourceDefinitionTargetClassesCache; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +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; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; +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/service/schema/MetadataSchemaShaclUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.java index a356421f5..b276e5f1d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaShaclUtils.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.service.schema; +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; @@ -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/entity/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/entity/schema/MetadataSchemaType.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaType.java index 313a1d9ee..be0a7d4df 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/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.entity.schema; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/schema/MetadataSchemaValidator.java similarity index 87% rename from src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.java index c6f4f781c..3d302f798 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/MetadataSchemaValidator.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.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.database.mongo.repository.ResourceDefinitionRepository; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; +package org.fairdatateam.fairdatapoint.rdf.schema; + +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.common.error.ValidationException; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +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/api/dto/schema/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/api/dto/schema/MetadataSchemaChangeDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaChangeDTO.java index 92b2c25d0..d661b25ca 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +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/api/dto/schema/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/api/dto/schema/MetadataSchemaDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDTO.java index c924ea052..571ccf590 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +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/api/dto/schema/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/api/dto/schema/MetadataSchemaDraftDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaDraftDTO.java index ed2f28bc7..a57fa7227 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +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/api/dto/schema/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/api/dto/schema/MetadataSchemaPreviewRequestDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaPreviewRequestDTO.java index 05bc416d3..17d3b9bf0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +package org.fairdatateam.fairdatapoint.rdf.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/rdf/schema/dto/MetadataSchemaReleaseDTO.java similarity index 92% rename from src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.java index dc2e543f1..73e30dc0a 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaReleaseDTO.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.schema; +package org.fairdatateam.fairdatapoint.rdf.schema.dto; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.fairdatateam.fairdatapoint.api.validator.ValidSemVer; +import org.fairdatateam.fairdatapoint.common.util.ValidSemVer; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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/api/dto/schema/MetadataSchemaRemoteDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteDTO.java index 2079e6e80..f070082e9 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +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/api/dto/schema/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/api/dto/schema/MetadataSchemaRemoteState.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaRemoteState.java index c0cb00f2c..f18decbba 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +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/api/dto/schema/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/api/dto/schema/MetadataSchemaUpdateDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaUpdateDTO.java index 13afcc5e3..8e3052286 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +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/api/dto/schema/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/api/dto/schema/MetadataSchemaVersionDTO.java rename to src/main/java/org/fairdatateam/fairdatapoint/rdf/schema/dto/MetadataSchemaVersionDTO.java index e734102de..94847b2e4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/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.api.dto.schema; +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.entity.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/vocabulary/DATACITE.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.java similarity index 91% 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..d2984eccd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DATACITE.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DATACITE.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.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; 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/vocabulary/DCAT3.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.java similarity index 91% 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..bfa46b93e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DCAT3.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/DCAT3.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.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; 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/vocabulary/FDP.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.java similarity index 93% 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..d9af34a47 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/FDP.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/FDP.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.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; 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/vocabulary/R3D.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.java similarity index 92% 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..ca87c32c6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/R3D.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/R3D.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.vocabulary; +package org.fairdatateam.fairdatapoint.rdf.vocabulary; 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/vocabulary/SIO.java b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java similarity index 93% 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..408a916a0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/SIO.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/rdf/vocabulary/SIO.java @@ -25,11 +25,11 @@ * 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; -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/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java similarity index 95% rename from src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java rename to src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java index 4303bb5eb..101851b1c 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/FactoryDefaults.java @@ -20,24 +20,24 @@ * 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; -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.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; -import org.fairdatateam.fairdatapoint.service.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.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; +import org.fairdatateam.fairdatapoint.rdf.schema.MetadataSchemaType; +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.common.util.KnownUUIDs; +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; @@ -50,8 +50,8 @@ import java.util.Collections; import java.util.List; -import static org.fairdatateam.fairdatapoint.util.ResourceReader.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 { @@ -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); 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 88% rename from src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java rename to src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java index 7afd99597..8ea7ab7f4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/reset/ResetService.java @@ -20,24 +20,28 @@ * 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.entity.resource.ResourceDefinition; -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.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinitionRepository; +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.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; import org.eclipse.rdf4j.model.Statement; 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; @@ -50,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/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 89% 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..3cb371299 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; @@ -36,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/entity/resource/ResourceDefinitionChild.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.java similarity index 92% 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..89ae3ac64 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChild.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChild.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.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor 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 93% 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..20503b6c4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListView.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.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; import java.util.List; 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 92% 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..789c376fa 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionChildListViewMetadata.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.entity.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor 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 91% 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..0e2162a8f 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.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; +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/entity/resource/ResourceDefinitionLink.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.java similarity index 92% 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..d11f4d613 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionLink.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionLink.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.entity.resource; +package org.fairdatateam.fairdatapoint.resource; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor 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 92% 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..6856f25dd 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionService.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.service.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.entity.exception.ResourceNotFoundException; -import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.service.membership.MembershipService; -import org.fairdatateam.fairdatapoint.service.openapi.OpenApiService; +package org.fairdatateam.fairdatapoint.resource; + +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionChangeDTO; +import org.fairdatateam.fairdatapoint.resource.dto.ResourceDefinitionDTO; +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; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.access.prepost.PreAuthorize; 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 89% 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..fb33c5c2d 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionTargetClassesCache.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 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.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; @@ -34,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/service/resource/ResourceDefinitionValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidator.java similarity index 88% 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..4bcc0190d 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.fairdatateam.fairdatapoint.common.error.ValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.validation.BindException; @@ -33,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/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/api/controller/search/SearchController.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchController.java similarity index 89% 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..b4987a302 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.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.search.dto.*; import org.eclipse.rdf4j.query.MalformedQueryException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -51,7 +50,7 @@ public class SearchController { ) public ResponseEntity> search( @RequestBody @Valid SearchQueryDTO reqDto - ) throws MetadataRepositoryException { + ) throws MetadataRdfRepositoryException { return ResponseEntity.ok(searchService.search(reqDto)); } @@ -70,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/service/search/SearchFilterCache.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java similarity index 89% 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..9c6f94c55 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchFilterCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchFilterCache.java @@ -20,20 +20,19 @@ * 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.fairdatateam.fairdatapoint.label.LabelService; +import org.fairdatateam.fairdatapoint.settings.SettingsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; 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/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 90% 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..d534b385a 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.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; +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 87% 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..0f4983ced 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.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.fairdatateam.fairdatapoint.search.dto.SearchResultDTO; +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.common.error.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -77,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/service/search/query/SearchSavedQueryMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryMapper.java similarity index 89% 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 d3f9c43a7..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,13 +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.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.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; +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.user.UserRole; import org.springframework.stereotype.Component; import java.time.Instant; 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 87% 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 266112681..1a56f7251 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchSavedQueryService.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.search.query; - -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.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.service.security.CurrentUserProvider; +package org.fairdatateam.fairdatapoint.search; + +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; +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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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 85% rename from src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java rename to src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java index c692e7ccc..6a1e10a26 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/search/SearchService.java @@ -20,20 +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.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.service.metadata.state.MetadataStateService; -import org.fairdatateam.fairdatapoint.service.settings.SettingsService; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; +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.*; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataStateService; +import org.fairdatateam.fairdatapoint.settings.SettingsService; import org.apache.commons.text.StrSubstitutor; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; @@ -48,9 +44,9 @@ 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.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 { @@ -64,7 +60,7 @@ public class SearchService { private static String queryTemplate; - private final GenericMetadataRepository metadataRepository; + private final GenericMetadataRdfRepository metadataRepository; private final MetadataStateService metadataStateService; @@ -81,7 +77,7 @@ public class SearchService { * Constructor (autowired) */ public SearchService( - GenericMetadataRepository metadataRepository, + GenericMetadataRdfRepository metadataRepository, MetadataStateService metadataStateService, String persistentUrl, SearchMapper searchMapper, @@ -102,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); } @@ -114,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 @@ -181,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); } } @@ -236,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() @@ -251,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/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 98% 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 9b4ec2981..5ff3e8f04 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; @@ -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.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/api/controller/search/SparqlQueryValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/search/SparqlQueryValidator.java similarity index 95% 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..1067b5e62 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; @@ -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.common.error.ValidationException; /** * Custom validator for SPARQL query strings. Throws a ValidationException if validation fails. 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 89% 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..7196849d7 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.common.util.ValidIri; +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 92% 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..41b22fbc9 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,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.search; +package org.fairdatateam.fairdatapoint.search.dto; import lombok.*; -import org.fairdatateam.fairdatapoint.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor 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 90% 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 5b15ef74b..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,15 +20,15 @@ * 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; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +import org.fairdatateam.fairdatapoint.search.SearchSavedQueryType; import java.time.Instant; 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 92% rename from src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/CurrentUserProvider.java index 5b6989c36..978fcca76 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/security/CurrentUserProvider.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/CurrentUserProvider.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.security; +package org.fairdatateam.fairdatapoint.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/security/MongoUserDetailsService.java similarity index 89% rename from src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.java index aea55fc01..53b02eeea 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/MongoUserDetailsService.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.security; +package org.fairdatateam.fairdatapoint.security; -import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository; -import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.UserRepository; +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; import org.springframework.security.core.userdetails.UserDetails; 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 97% rename from src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclConfig.java index d4271af85..8f129643e 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/acl/AclConfig.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.acl; -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/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 90% 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..f68bbc704 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.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/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 84% 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 7ccc0162d..c93c3cd9e 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.entity.user.User; -import org.fairdatateam.fairdatapoint.entity.user.UserRole; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +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; +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/service/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/service/security/MongoAuthenticationService.java rename to src/main/java/org/fairdatateam/fairdatapoint/security/auth/MongoAuthenticationService.java index b91ea6304..14e631dcb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/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.service.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/config/PasswordConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/security/auth/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/auth/PasswordConfig.java index d1bb7e874..4c3522deb 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/config/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.config; +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/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 89% 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..6a680ef61 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/api/filter/JwtTokenFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/JwtTokenFilter.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.filter; +package org.fairdatateam.fairdatapoint.security.filter; import jakarta.servlet.FilterChain; 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.service.apikey.ApiKeyService; -import org.fairdatateam.fairdatapoint.service.jwt.JwtService; +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; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -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/api/filter/LoggingFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/security/filter/LoggingFilter.java similarity index 97% 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 13c9fc347..83ae952ae 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 87% 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 fb25f2440..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,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.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.api.dto.user.UserSimpleDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserSimpleDTO; @Data @AllArgsConstructor 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 81% 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 e1477ec45..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,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.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.entity.user.User; -import org.fairdatateam.fairdatapoint.service.membership.MembershipMapper; -import org.fairdatateam.fairdatapoint.service.user.UserMapper; +import org.fairdatateam.fairdatapoint.user.User; +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 92% 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 97971e0f2..b99be1fef 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; - -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.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.service.membership.PermissionService; -import org.fairdatateam.fairdatapoint.service.security.CurrentUserProvider; +package org.fairdatateam.fairdatapoint.security.membership; + +import org.fairdatateam.fairdatapoint.user.UserRepository; +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; 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 92% 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..aca8ff5b0 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/MembershipPermission.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipPermission.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.membership; +package org.fairdatateam.fairdatapoint.security.membership; 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 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 89% 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 2e7487fd1..50c4acfb6 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/MembershipService.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.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.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.util.KnownUUIDs; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +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/service/membership/PermissionService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/membership/PermissionService.java similarity index 91% 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 bcad51986..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,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.membership; +package org.fairdatateam.fairdatapoint.security.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/jwt/JwtService.java b/src/main/java/org/fairdatateam/fairdatapoint/security/token/JwtService.java similarity index 91% 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 0969084ec..516764608 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.database.mongo.repository.UserRepository; -import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException; -import org.fairdatateam.fairdatapoint.entity.user.User; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; +import org.fairdatateam.fairdatapoint.security.auth.AuthDTO; +import org.fairdatateam.fairdatapoint.user.UserRepository; +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; 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/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 88% 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..171a45e90 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsCache.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsCache.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.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; 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/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 89% rename from src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsMapper.java index 70e2c8c2d..7a3f31c3e 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; - -import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterDTO; -import org.fairdatateam.fairdatapoint.api.dto.search.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; +package org.fairdatateam.fairdatapoint.settings; + +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterItemDTO; +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; +import org.fairdatateam.fairdatapoint.settings.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -43,7 +42,7 @@ public class SettingsMapper { private PingProperties pingProperties; @Autowired - private RepositoryProperties repositoryProperties; + private RdfRepositoryProperties rdfRepositoryProperties; @Autowired private SearchMapper searchMapper; @@ -132,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/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 92% rename from src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilter.java index 69bdd3ad9..1371102e4 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsSearchFilter.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.settings; +package org.fairdatateam.fairdatapoint.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/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 86% rename from src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java rename to src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsService.java index d895b12ff..6fc73cebe 100644 --- a/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java +++ b/src/main/java/org/fairdatateam/fairdatapoint/settings/SettingsService.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.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.service.search.SearchFilterCache; +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 92% 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..37a964fe7 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,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.api.validator.ValidIri; +import org.fairdatateam.fairdatapoint.common.util.ValidIri; @NoArgsConstructor @AllArgsConstructor 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 91% 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 fad52a8bb..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,12 +20,12 @@ * 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; 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/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/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 92% 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..7f232b3d4 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.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; 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 92% 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..cecb66f95 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.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; 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 86% 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..9c503a8c6 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.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/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/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/0020_shape-data-service.ttl b/src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0020_shape-data-service.ttl similarity index 100% rename from src/main/resources/org/fairdatateam/fairdatapoint/database/mongo/migration/production/0020_shape-data-service.ttl rename to src/main/resources/org/fairdatateam/fairdatapoint/migration/mongodb/production/0020_shape-data-service.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/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 diff --git a/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java index 380fa9a4f..d5a89018b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java @@ -22,9 +22,9 @@ */ 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.service.rdf.StandaloneShaclValidator; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.DevelopmentMigrationRunner; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfDevelopmentMigrationRunner; +import org.fairdatateam.fairdatapoint.rdf.StandaloneShaclValidator; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; @@ -55,7 +55,7 @@ public abstract class WebIntegrationTest { protected TestRestTemplate client; @Autowired - protected MigrationRunner migrationRunner; + protected DevelopmentMigrationRunner developmentMigrationRunner; @Autowired protected RdfDevelopmentMigrationRunner rdfDevelopmentMigrationRunner; @@ -65,7 +65,7 @@ public abstract class WebIntegrationTest { @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..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,8 +23,8 @@ 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.entity.apikey.ApiKey; +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; 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 51b4637e1..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.apikey; 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.security.apikey.ApiKeyDTO; +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/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/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; 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..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 @@ -23,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.dashboard; 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.service.member.MemberService; +import org.fairdatateam.fairdatapoint.dashboard.DashboardItemDTO; +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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; 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..16f783cef 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java @@ -23,9 +23,9 @@ 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.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ApiKeyFixtures; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +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_TriggerAll_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java index 105120493..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 @@ -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.event.EventRepository; +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; 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..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 @@ -23,14 +23,14 @@ 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.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.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +import org.fairdatateam.fairdatapoint.index.event.EventRepository; +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; +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/utils/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/utils/CustomPageImpl.java rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/CustomPageImpl.java index 45773bdd7..a9bd0bdee 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/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.utils; +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_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java index 42b9e1ac8..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 @@ -23,11 +23,11 @@ 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.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; +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; 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 b378a7525..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 @@ -23,12 +23,11 @@ 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.utils.CustomPageImpl; -import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryDTO; +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; 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 7f4580b66..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 @@ -23,10 +23,10 @@ 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.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.index.entry.dto.IndexEntryInfoDTO; +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; 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 5dca9395a..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 @@ -23,11 +23,11 @@ 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.utils.TestIndexEntryFixtures; +import org.fairdatateam.fairdatapoint.index.event.dto.PingDTO; +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; 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_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java index 733d7dff5..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 @@ -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.settings.IndexSettingsRepository; +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 2b5ae3fab..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 @@ -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.settings.IndexSettingsRepository; +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 77848b8c2..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 @@ -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.settings.IndexSettingsRepository; +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/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 a6ced9335..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.membership; 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.security.membership.MembershipDTO; +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/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java index 8760ca3a5..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,11 +22,11 @@ */ 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.api.dto.metadata.MetaStateChangeDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO; -import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState; +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; +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 363de98df..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; @@ -43,10 +43,10 @@ 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.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; +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; @@ -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/catalog/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java index 20bf1f61a..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 @@ -23,9 +23,9 @@ 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.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataMigration; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +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/catalog/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java index 3d00d6841..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.database.mongo.migration.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 a829d3519..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,12 +23,12 @@ 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.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.service.member.MemberMapper; +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; +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; 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 56720dce5..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,11 +23,11 @@ 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.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.service.member.MemberMapper; +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; +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 28b349494..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 @@ -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.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.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.service.member.MemberMapper; +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.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; import org.springframework.beans.factory.annotation.Autowired; 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..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 @@ -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.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.rdf.metadata.dto.MetaStateChangeDTO; +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; 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..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; @@ -43,10 +43,10 @@ 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.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; +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; @@ -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/dataset/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java index 7fd3a0bbe..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +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/dataset/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java index 3ff77db66..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.database.mongo.migration.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 f352aa814..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,12 +23,12 @@ 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.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.service.member.MemberMapper; +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; +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; 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 88442e19f..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,11 +23,11 @@ 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.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.service.member.MemberMapper; +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; +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 f9c5e2de3..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 @@ -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.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.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.service.member.MemberMapper; +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.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; import org.springframework.beans.factory.annotation.Autowired; 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..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 @@ -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.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.rdf.metadata.dto.MetaStateChangeDTO; +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; 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..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; @@ -42,10 +42,10 @@ 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.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; +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; @@ -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); } 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..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +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/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java index 707d8100b..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.database.mongo.migration.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 10222c60f..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,12 +23,12 @@ 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.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.service.member.MemberMapper; +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; +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; 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 b2d8446cb..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,11 +23,11 @@ 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.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.service.member.MemberMapper; +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; +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 4fb39589a..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 @@ -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.api.dto.metadata.MetaDTO; -import org.fairdatateam.fairdatapoint.api.dto.metadata.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.service.member.MemberMapper; +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.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; import org.springframework.beans.factory.annotation.Autowired; 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..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 @@ -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.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.rdf.metadata.dto.MetaStateChangeDTO; +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; 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..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.metadata.repository; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.util.RdfIOUtil; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.RdfIOUtil; +import org.fairdatateam.fairdatapoint.testfixtures.TestRdfMetadataFixtures; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.rio.RDFFormat; @@ -40,10 +40,10 @@ 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.util.ValueFactoryHelper.i; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; +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/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java index 2fcda35a2..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 @@ -23,9 +23,9 @@ 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.database.mongo.migration.development.metadata.data.MetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaDTO; +import org.fairdatateam.fairdatapoint.rdf.metadata.dto.MetaStateDTO; +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 5ba9fbf6b..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 @@ -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.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.rdf.metadata.dto.MetaStateChangeDTO; +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; 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_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java index 55c0650c1..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,8 +23,8 @@ 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.entity.resource.ResourceDefinition; +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; 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..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,8 +23,8 @@ 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.entity.resource.ResourceDefinition; +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; 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..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 @@ -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.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.dto.ResourceDefinitionChangeDTO; +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; 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..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,8 +23,8 @@ 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.entity.resource.ResourceDefinition; +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; 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..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 @@ -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.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.dto.ResourceDefinitionChangeDTO; +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; 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 794bc3e5b..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.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.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/Content_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java index 2f86b0924..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,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.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..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,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.schema; 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.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +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; 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 448ef276d..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 @@ -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.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDTO; +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; 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 c5d3a30c0..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,9 +23,9 @@ 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.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; +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; 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 f263dafb5..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 @@ -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.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; +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; 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 4f8f010da..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 @@ -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.database.mongo.migration.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.rdf.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; +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; +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 dad5f54f5..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 @@ -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.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; +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; 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 111e3b54a..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 @@ -23,11 +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.database.mongo.migration.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.rdf.schema.dto.MetadataSchemaDTO; +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; 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..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 @@ -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.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaChangeDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaDraftDTO; +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; 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 5ead03273..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 @@ -23,13 +23,11 @@ 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.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; -import org.fairdatateam.fairdatapoint.entity.schema.SemVer; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; +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.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/schema/Version_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java index 43456e26e..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,9 +23,9 @@ 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.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +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; 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 f6d345778..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 @@ -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.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; +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; 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 90c13e128..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 @@ -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.database.mongo.migration.development.schema.data.MetadataSchemaFixtures; -import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; -import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaUpdateDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaVersionDTO; +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; 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 50bb9a806..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 @@ -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.database.mongo.migration.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.rdf.schema.dto.MetadataSchemaDTO; +import org.fairdatateam.fairdatapoint.rdf.schema.dto.MetadataSchemaReleaseDTO; +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; +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/search/Filters_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java index c3910afc4..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 @@ -23,10 +23,8 @@ 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.database.mongo.repository.SettingsRepository; +import org.fairdatateam.fairdatapoint.search.dto.SearchFilterDTO; +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/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..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,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.migration.mongodb.development.SearchSavedQueryFixtures; +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..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 @@ -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.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.dto.SearchSavedQueryDTO; +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; 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..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 @@ -23,14 +23,14 @@ 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.dto.SearchQueryVariablesDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryChangeDTO; +import org.fairdatateam.fairdatapoint.search.dto.SearchSavedQueryDTO; +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; +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_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java index f7ceadb2e..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 @@ -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.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.dto.SearchSavedQueryDTO; +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; 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..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 @@ -23,14 +23,12 @@ 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.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.common.util.KnownUUIDs; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -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 888cfa3a4..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,9 +23,9 @@ package org.fairdatateam.fairdatapoint.acceptance.search.sparql; import org.fairdatateam.fairdatapoint.Profiles; -import org.fairdatateam.fairdatapoint.api.controller.search.SparqlProxyController; -import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService; -import org.fairdatateam.fairdatapoint.service.ping.PingService; +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; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -47,8 +47,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..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.search.sparql; -import org.fairdatateam.fairdatapoint.api.controller.search.SparqlQueryValidator; -import org.fairdatateam.fairdatapoint.entity.exception.ValidationException; +import org.fairdatateam.fairdatapoint.search.SparqlQueryValidator; +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/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/acceptance/token/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java index e03f229f6..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 @@ -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.security.auth.AuthDTO; +import org.fairdatateam.fairdatapoint.security.token.TokenDTO; +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; 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..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 @@ -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.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +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; 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..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,10 +23,10 @@ package org.fairdatateam.fairdatapoint.acceptance.user; 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.database.mongo.migration.development.user.data.UserFixtures; +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; 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 56c0e92c2..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 @@ -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.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; +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; 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..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,8 +23,8 @@ 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.entity.user.User; +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; 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..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 @@ -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.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +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; 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..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,12 +23,12 @@ package org.fairdatateam.fairdatapoint.acceptance.user; 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.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.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; +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..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 @@ -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.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +import org.fairdatateam.fairdatapoint.user.dto.UserPasswordDTO; +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; 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..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 @@ -23,8 +23,8 @@ package org.fairdatateam.fairdatapoint.acceptance.user; import org.fairdatateam.fairdatapoint.WebIntegrationTest; -import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; +import org.fairdatateam.fairdatapoint.user.dto.UserDTO; +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 38293af12..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,11 +23,11 @@ package org.fairdatateam.fairdatapoint.acceptance.user; 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.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.entity.user.User; +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; +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/utils/HttpUtilTest.java b/src/test/java/org/fairdatateam/fairdatapoint/common/util/HttpUtilTest.java similarity index 96% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/HttpUtilTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/common/util/HttpUtilTest.java index d8487e7c3..57f729123 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/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.utils; +package org.fairdatateam.fairdatapoint.common.util; import jakarta.servlet.http.HttpServletRequest; import org.eclipse.rdf4j.model.IRI; @@ -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/entity/schema/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/common/util/SemVerTest.java similarity index 98% rename from src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/common/util/SemVerTest.java index 4e25684f0..c78c78293 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/common/util/SemVerTest.java @@ -20,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.common.util; import org.junit.jupiter.api.Test; 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 6d4caba17..000000000 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/GenericMetadataRepositoryTest.java +++ /dev/null @@ -1,127 +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.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.entity.metadata.MetadataGetter.getLanguage; -import static org.fairdatateam.fairdatapoint.entity.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 GenericMetadataRepository metadataRepository; - - @Autowired - private CatalogMetadataRepository catalogMetadataRepository; - - @Test - @DisplayName("'save' should evict cache") - public void saveEvictsCache() throws MetadataRepositoryException { - // 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 MetadataRepositoryException { - // 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 MetadataRepositoryException { - // 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 21cb49839..000000000 --- a/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/MetadataRepositoryTest.java +++ /dev/null @@ -1,154 +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.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.entity.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 GenericMetadataRepository 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 MetadataRepositoryException { - // 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/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterServiceTest.java similarity index 77% rename from src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterServiceTest.java index 4d0945d96..d33606524 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/index/entry/HarvesterServiceTest.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.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.entity.resource.ResourceDefinition; -import org.fairdatateam.fairdatapoint.vocabulary.FDP; +package org.fairdatateam.fairdatapoint.index.entry; + +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; +import org.fairdatateam.fairdatapoint.rdf.metadata.GenericMetadataRdfRepository; +import org.fairdatateam.fairdatapoint.resource.ResourceDefinition; +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; @@ -40,9 +40,9 @@ import org.springframework.test.web.client.ExpectedCount; import org.springframework.test.web.client.MockRestServiceServer; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri; -import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.write; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.RdfIOUtil.write; +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; @@ -60,7 +60,7 @@ public class HarvesterServiceTest { private HarvesterService harvesterService; @MockitoBean - private GenericMetadataRepository genericMetadataRepository; + private GenericMetadataRdfRepository genericMetadataRdfRepository; private final String repositoryUrl = "http://fairdatapoint.example"; @@ -88,7 +88,7 @@ public void setup() { } @Test - public void harvestSucceeded() throws MetadataRepositoryException { + public void harvestSucceeded() throws MetadataRdfRepositoryException { // GIVEN: Mock webserver mockEndpoint(repositoryUrl, repository); mockEndpoint(catalogUrl, catalog); @@ -98,11 +98,11 @@ public void harvestSucceeded() throws MetadataRepositoryException { // THEN: mockRemoteServer.verify(); - verify(genericMetadataRepository, times(2)).save(anyList(), eq(i(repositoryUrl))); + verify(genericMetadataRdfRepository, times(2)).save(anyList(), eq(i(repositoryUrl))); } @Test - public void harvestFailedDueToServerError() throws MetadataRepositoryException { + public void harvestFailedDueToServerError() throws MetadataRdfRepositoryException { // GIVEN: Mock webserver mockRemoteServer .expect(ExpectedCount.once(), requestTo(repositoryUrl)) @@ -114,11 +114,11 @@ public void harvestFailedDueToServerError() throws MetadataRepositoryException { // THEN: mockRemoteServer.verify(); - verify(genericMetadataRepository, never()).save(any(), any()); + verify(genericMetadataRdfRepository, never()).save(any(), any()); } @Test - public void harvestFailedForLinkedChildren() throws MetadataRepositoryException { + public void harvestFailedForLinkedChildren() throws MetadataRdfRepositoryException { // GIVEN: Mock webserver mockEndpoint(repositoryUrl, repository); mockRemoteServer @@ -131,7 +131,7 @@ public void harvestFailedForLinkedChildren() throws MetadataRepositoryException // 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) { 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 91% rename from src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.java index 9f3615625..af637df28 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/ping/PingServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/ping/PingServiceTest.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.service.ping; +package org.fairdatateam.fairdatapoint.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.common.config.InstanceProperties; +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/rdf/StandaloneShaclValidatorTest.java similarity index 96% rename from src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidatorTest.java index eaee36c57..fd46dc528 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/rdf/StandaloneShaclValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/StandaloneShaclValidatorTest.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.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.entity.exception.RdfValidationException; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/AuthHelper.java similarity index 89% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java rename to src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/AuthHelper.java index b245c3c13..ac6e2ac4c 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/AuthHelper.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.utils; +package org.fairdatateam.fairdatapoint.rdf.metadata; -import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures; -import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService; +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; import org.springframework.security.core.context.SecurityContextHolder; 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 78% 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 7f6e25cd5..9eab60242 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,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.rdf.metadata; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.query.TupleQuery; @@ -40,12 +40,12 @@ import java.util.Collections; import java.util.List; -import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.common.config.CacheConfig.CATALOG_THEMES_CACHE; +import static org.fairdatateam.fairdatapoint.common.util.ValueFactoryHelper.i; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -public class CatalogMetadataRepositoryTest { +public class CatalogMetadataRdfRepositoryTest { private final IRI catalogUri = i("http://localhost/textmining"); @@ -69,25 +69,25 @@ public class CatalogMetadataRepositoryTest { @Spy @InjectMocks - private CatalogMetadataRepository catalogMetadataRepository; + private CatalogMetadataRdfRepository catalogMetadataRdfRepository; @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()); // WHEN: - catalogMetadataRepository.getDatasetThemesForCatalog(catalogUri); + catalogMetadataRdfRepository.getDatasetThemesForCatalog(catalogUri); // THEN: - verify(catalogMetadataRepository, never()).runSparqlQueryFromFile(any(), any()); + verify(catalogMetadataRdfRepository, never()).runSparqlQueryFromFile(any(), any()); } @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); @@ -95,10 +95,10 @@ public void themesNotInCache() throws MetadataRepositoryException { 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/service/metadata/catalog/CatalogMetadataServiceMockTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/CatalogMetadataServiceTest.java similarity index 81% 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 c7a2431e2..e9f768287 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,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.rdf.metadata; 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.utils.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; @@ -41,25 +39,25 @@ 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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getThemeTaxonomies; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; +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; import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -public class CatalogMetadataServiceMockTest extends BaseIntegrationTest { +public class CatalogMetadataServiceTest extends BaseIntegrationTest { @Autowired 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/rdf/metadata/GenericMetadataRdfRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/GenericMetadataRdfRepositoryTest.java new file mode 100644 index 000000000..1cf1a58f2 --- /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.testfixtures.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.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.common.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))); + } + +} 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 90% 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 009b73aea..bba105a53 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,16 +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.generic; +package org.fairdatateam.fairdatapoint.rdf.metadata; import org.fairdatateam.fairdatapoint.BaseIntegrationTest; -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.service.metadata.common.MetadataService; -import org.fairdatateam.fairdatapoint.utils.AuthHelper; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; +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; import org.eclipse.rdf4j.model.Model; import org.junit.jupiter.api.BeforeEach; @@ -40,9 +38,9 @@ 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.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.*; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataSetter.*; +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/service/metadata/metric/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/rdf/metadata/MetricsMetadataServiceTest.java similarity index 87% 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 54ca9b936..d9140d952 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,19 +25,16 @@ * 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.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; 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/service/resource/ResourceDefinitionCacheTest.java b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCacheTest.java similarity index 91% rename from src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCacheTest.java index 024550ff2..9eb2f1b49 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionCacheTest.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 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.migration.mongodb.development.ResourceDefinitionFixtures; 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 93% rename from src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.java index 905737408..8d178f7ca 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/resource/ResourceDefinitionValidatorTest.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.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures; -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.fairdatateam.fairdatapoint.migration.mongodb.development.ResourceDefinitionFixtures; +import org.fairdatateam.fairdatapoint.common.error.ValidationException; 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/service/search/SearchServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java similarity index 74% rename from src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java rename to src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java index 32c1e100b..9c9d3425b 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/service/search/SearchServiceTest.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/search/SearchServiceTest.java @@ -20,38 +20,39 @@ * 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.database.rdf.repository.MetadataRepositoryException; -import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue; -import org.fairdatateam.fairdatapoint.entity.search.SearchResult; -import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.migration.triplestore.development.RdfMetadataFixtures; +import org.fairdatateam.fairdatapoint.rdf.metadata.MetadataRdfRepositoryException; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getTitle; -import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getTitle; +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; 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 MetadataRepositoryException { + 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 @@ -62,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/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java similarity index 93% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.java index a0d9009dc..aa2e56222 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestIndexEntryFixtures.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.utils; +package org.fairdatateam.fairdatapoint.testfixtures; -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.entry.IndexEntry; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryPermit; +import org.fairdatateam.fairdatapoint.index.entry.IndexEntryState; import java.time.Instant; import java.util.ArrayList; diff --git a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestRdfMetadataFixtures.java similarity index 89% rename from src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java rename to src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestRdfMetadataFixtures.java index e206cf097..73961a51e 100644 --- a/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java +++ b/src/test/java/org/fairdatateam/fairdatapoint/testfixtures/TestRdfMetadataFixtures.java @@ -20,19 +20,19 @@ * 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.testfixtures; -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.service.metadata.enhance.MetadataEnhancer; +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; +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.entity.metadata.MetadataGetter.getUri; +import static org.fairdatateam.fairdatapoint.rdf.metadata.MetadataGetter.getUri; @Service public class TestRdfMetadataFixtures extends RdfMetadataFixtures {