From 385fa0a0a6c6baa5ff75d4731a00c2ee3935cff2 Mon Sep 17 00:00:00 2001 From: Joselee2908 Date: Tue, 19 May 2026 11:29:43 +0200 Subject: [PATCH] refactor(api-project-component-v0): renamed package name from project to projectcomponent to decrease confusion with api-project module. Also moved openapi generated files to target folder --- api-project-component-v0/pom.xml | 16 ++++++------- .../config/JsonNullableConfig.java | 2 +- .../controller/ComponentsResponseFactory.java | 6 ++--- .../ProjectComponentsController.java | 16 ++++++------- .../ProjectComponentsInternalController.java | 6 ++--- .../ProjectComponentsExceptionHandler.java | 22 ++++++++--------- .../CatalogItemNotFoundException.java | 2 +- .../ComponentAlreadyExistsException.java | 2 +- .../ComponentBadRequestException.java | 2 +- .../exception/ComponentCreationException.java | 2 +- .../exception/ComponentDeletionException.java | 2 +- .../exception/ComponentErrorKey.java | 2 +- .../exception/ComponentErrorMessage.java | 2 +- .../exception/ComponentNotFoundException.java | 2 +- .../ComponentRetrievalException.java | 2 +- .../facade/ComponentsFacade.java | 22 ++++++++--------- .../mapper/ComponentResponseMapper.java | 4 ++-- .../mapper/MarketplaceMapper.java | 8 +++---- .../mapper/StatusMap.java | 4 ++-- .../ProjectComponentsControllerTest.java | 18 +++++++------- ...ojectComponentsInternalControllerTest.java | 6 ++--- ...ProjectComponentsExceptionHandlerTest.java | 10 ++++---- .../facade/ComponentsFacadeTest.java | 24 +++++++++---------- .../mapper/MarketplaceMapperTest.java | 4 ++-- .../util/TestObjectsBuilder.java | 10 ++++---- 25 files changed, 98 insertions(+), 98 deletions(-) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/config/JsonNullableConfig.java (94%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/controller/ComponentsResponseFactory.java (91%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/controller/ProjectComponentsController.java (72%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/controller/ProjectComponentsInternalController.java (80%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/controller/advice/ProjectComponentsExceptionHandler.java (89%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/CatalogItemNotFoundException.java (80%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentAlreadyExistsException.java (81%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentBadRequestException.java (81%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentCreationException.java (80%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentDeletionException.java (80%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentErrorKey.java (93%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentErrorMessage.java (86%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentNotFoundException.java (80%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/exception/ComponentRetrievalException.java (80%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/facade/ComponentsFacade.java (89%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/mapper/ComponentResponseMapper.java (72%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/mapper/MarketplaceMapper.java (93%) rename api-project-component-v0/src/main/java/org/opendevstack/apiservice/{project => projectcomponent}/mapper/StatusMap.java (81%) rename api-project-component-v0/src/test/java/org/opendevstack/apiservice/{project => projectcomponent}/controller/ProjectComponentsControllerTest.java (85%) rename api-project-component-v0/src/test/java/org/opendevstack/apiservice/{project => projectcomponent}/controller/ProjectComponentsInternalControllerTest.java (90%) rename api-project-component-v0/src/test/java/org/opendevstack/apiservice/{project => projectcomponent}/controller/advice/ProjectComponentsExceptionHandlerTest.java (94%) rename api-project-component-v0/src/test/java/org/opendevstack/apiservice/{project => projectcomponent}/facade/ComponentsFacadeTest.java (85%) rename api-project-component-v0/src/test/java/org/opendevstack/apiservice/{project => projectcomponent}/mapper/MarketplaceMapperTest.java (97%) rename api-project-component-v0/src/test/java/org/opendevstack/apiservice/{project => projectcomponent}/util/TestObjectsBuilder.java (83%) diff --git a/api-project-component-v0/pom.xml b/api-project-component-v0/pom.xml index 495e438..0684363 100644 --- a/api-project-component-v0/pom.xml +++ b/api-project-component-v0/pom.xml @@ -139,12 +139,12 @@ spring - ${project.basedir} + ${project.basedir}/target/generated-sources/openapi spring-boot ${project.basedir}/openapi/api-project-component-v0.yaml - org.opendevstack.apiservice.project.api - org.opendevstack.apiservice.project.model - org.opendevstack.apiservice.project + org.opendevstack.apiservice.projectcomponent.client.api + org.opendevstack.apiservice.projectcomponent.client.model + org.opendevstack.apiservice.projectcomponent.client false false false @@ -168,12 +168,12 @@ spring - ${project.basedir} + ${project.basedir}/target/generated-sources/openapi spring-boot ${project.basedir}/openapi/api-project-component-v0-internal.yaml - org.opendevstack.apiservice.project.api - org.opendevstack.apiservice.project.model - org.opendevstack.apiservice.project + org.opendevstack.apiservice.projectcomponent.client.api + org.opendevstack.apiservice.projectcomponent.client.model + org.opendevstack.apiservice.projectcomponent.client false false false diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/config/JsonNullableConfig.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/config/JsonNullableConfig.java similarity index 94% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/config/JsonNullableConfig.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/config/JsonNullableConfig.java index 5230803..349fb05 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/config/JsonNullableConfig.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/config/JsonNullableConfig.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.config; +package org.opendevstack.apiservice.projectcomponent.config; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ComponentsResponseFactory.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ComponentsResponseFactory.java similarity index 91% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ComponentsResponseFactory.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ComponentsResponseFactory.java index 0feb0ad..de03178 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ComponentsResponseFactory.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ComponentsResponseFactory.java @@ -1,7 +1,7 @@ -package org.opendevstack.apiservice.project.controller; +package org.opendevstack.apiservice.projectcomponent.controller; -import org.opendevstack.apiservice.project.exception.ComponentErrorKey; -import org.opendevstack.apiservice.project.model.CreateComponentResponse; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentErrorKey; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse; import org.springframework.http.HttpStatus; public final class ComponentsResponseFactory { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsController.java similarity index 72% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsController.java index a78afeb..0da12c0 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsController.java @@ -1,14 +1,14 @@ -package org.opendevstack.apiservice.project.controller; +package org.opendevstack.apiservice.projectcomponent.controller; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.opendevstack.apiservice.project.api.ProjectComponentsApi; -import org.opendevstack.apiservice.project.exception.ComponentNotFoundException; -import org.opendevstack.apiservice.project.facade.ComponentsFacade; -import org.opendevstack.apiservice.project.mapper.ComponentResponseMapper; -import org.opendevstack.apiservice.project.model.Component; -import org.opendevstack.apiservice.project.model.CreateComponentRequest; -import org.opendevstack.apiservice.project.model.CreateComponentResponse; +import org.opendevstack.apiservice.projectcomponent.client.api.ProjectComponentsApi; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException; +import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade; +import org.opendevstack.apiservice.projectcomponent.mapper.ComponentResponseMapper; +import org.opendevstack.apiservice.projectcomponent.client.model.Component; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalController.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalController.java similarity index 80% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalController.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalController.java index 63c1f3d..9193f67 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalController.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalController.java @@ -1,9 +1,9 @@ -package org.opendevstack.apiservice.project.controller; +package org.opendevstack.apiservice.projectcomponent.controller; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.opendevstack.apiservice.project.api.ProjectComponentsInternalApi; -import org.opendevstack.apiservice.project.facade.ComponentsFacade; +import org.opendevstack.apiservice.projectcomponent.client.api.ProjectComponentsInternalApi; +import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandler.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandler.java similarity index 89% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandler.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandler.java index 5af8579..65a0510 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandler.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandler.java @@ -1,17 +1,17 @@ -package org.opendevstack.apiservice.project.controller.advice; +package org.opendevstack.apiservice.projectcomponent.controller.advice; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.opendevstack.apiservice.project.controller.ComponentsResponseFactory; -import org.opendevstack.apiservice.project.controller.ProjectComponentsController; -import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException; -import org.opendevstack.apiservice.project.exception.ComponentBadRequestException; -import org.opendevstack.apiservice.project.exception.ComponentCreationException; -import org.opendevstack.apiservice.project.exception.ComponentDeletionException; -import org.opendevstack.apiservice.project.exception.ComponentErrorKey; -import org.opendevstack.apiservice.project.exception.ComponentNotFoundException; -import org.opendevstack.apiservice.project.exception.ComponentRetrievalException; -import org.opendevstack.apiservice.project.model.CreateComponentResponse; +import org.opendevstack.apiservice.projectcomponent.controller.ComponentsResponseFactory; +import org.opendevstack.apiservice.projectcomponent.controller.ProjectComponentsController; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentBadRequestException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentErrorKey; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentRetrievalException; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotReadableException; diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/CatalogItemNotFoundException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/CatalogItemNotFoundException.java similarity index 80% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/CatalogItemNotFoundException.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/CatalogItemNotFoundException.java index 9b66377..e3611d5 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/CatalogItemNotFoundException.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/CatalogItemNotFoundException.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class CatalogItemNotFoundException extends RuntimeException { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentAlreadyExistsException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentAlreadyExistsException.java similarity index 81% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentAlreadyExistsException.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentAlreadyExistsException.java index 8435586..712a097 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentAlreadyExistsException.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentAlreadyExistsException.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class ComponentAlreadyExistsException extends RuntimeException { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentBadRequestException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentBadRequestException.java similarity index 81% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentBadRequestException.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentBadRequestException.java index 10deaec..c600658 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentBadRequestException.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentBadRequestException.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class ComponentBadRequestException extends RuntimeException { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentCreationException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentCreationException.java similarity index 80% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentCreationException.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentCreationException.java index dce8484..8eec7d8 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentCreationException.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentCreationException.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class ComponentCreationException extends RuntimeException { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentDeletionException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentDeletionException.java similarity index 80% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentDeletionException.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentDeletionException.java index f1eeffa..99c88e9 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentDeletionException.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentDeletionException.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class ComponentDeletionException extends RuntimeException { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorKey.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorKey.java similarity index 93% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorKey.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorKey.java index 9af565b..c28540a 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorKey.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorKey.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public enum ComponentErrorKey { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorMessage.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorMessage.java similarity index 86% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorMessage.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorMessage.java index 116d439..088a06c 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentErrorMessage.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentErrorMessage.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class ComponentErrorMessage { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentNotFoundException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentNotFoundException.java similarity index 80% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentNotFoundException.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentNotFoundException.java index 38caa87..b77b7e3 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentNotFoundException.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentNotFoundException.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class ComponentNotFoundException extends RuntimeException { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRetrievalException.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRetrievalException.java similarity index 80% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRetrievalException.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRetrievalException.java index 655c5be..419733b 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRetrievalException.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/exception/ComponentRetrievalException.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.exception; +package org.opendevstack.apiservice.projectcomponent.exception; public class ComponentRetrievalException extends RuntimeException { diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacade.java similarity index 89% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacade.java index 56cc6c3..17fb628 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacade.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.facade; +package org.opendevstack.apiservice.projectcomponent.facade; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -8,16 +8,16 @@ import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProvisionActionParameter; import org.opendevstack.apiservice.externalservice.marketplace.service.CatalogItemOperations; import org.opendevstack.apiservice.externalservice.marketplace.service.MarketplaceService; -import org.opendevstack.apiservice.project.exception.CatalogItemNotFoundException; -import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException; -import org.opendevstack.apiservice.project.exception.ComponentBadRequestException; -import org.opendevstack.apiservice.project.exception.ComponentCreationException; -import org.opendevstack.apiservice.project.exception.ComponentDeletionException; -import org.opendevstack.apiservice.project.exception.ComponentNotFoundException; -import org.opendevstack.apiservice.project.exception.ComponentRetrievalException; -import org.opendevstack.apiservice.project.mapper.MarketplaceMapper; -import org.opendevstack.apiservice.project.model.Component; -import org.opendevstack.apiservice.project.model.CreateComponentRequest; +import org.opendevstack.apiservice.projectcomponent.exception.CatalogItemNotFoundException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentBadRequestException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentRetrievalException; +import org.opendevstack.apiservice.projectcomponent.mapper.MarketplaceMapper; +import org.opendevstack.apiservice.projectcomponent.client.model.Component; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest; import org.springframework.stereotype.Service; import org.springframework.web.client.HttpClientErrorException; diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/ComponentResponseMapper.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/ComponentResponseMapper.java similarity index 72% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/ComponentResponseMapper.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/ComponentResponseMapper.java index 846f299..3a98a00 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/ComponentResponseMapper.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/ComponentResponseMapper.java @@ -1,7 +1,7 @@ -package org.opendevstack.apiservice.project.mapper; +package org.opendevstack.apiservice.projectcomponent.mapper; import org.mapstruct.Mapper; -import org.opendevstack.apiservice.project.model.CreateComponentResponse; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapper.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapper.java similarity index 93% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapper.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapper.java index 2a0eec4..a8231b8 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapper.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapper.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.mapper; +package org.opendevstack.apiservice.projectcomponent.mapper; import org.mapstruct.Mapper; import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException; @@ -7,9 +7,9 @@ import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItemUserActionParameter; import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProjectComponentExtendedInfo; import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProvisionActionParameter; -import org.opendevstack.apiservice.project.model.Component; -import org.opendevstack.apiservice.project.model.CreateComponentRequest; -import org.opendevstack.apiservice.project.model.EnvironmentsDTO; +import org.opendevstack.apiservice.projectcomponent.client.model.Component; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest; +import org.opendevstack.apiservice.projectcomponent.client.model.EnvironmentsDTO; import java.util.ArrayList; import java.util.HashMap; diff --git a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/StatusMap.java b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/StatusMap.java similarity index 81% rename from api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/StatusMap.java rename to api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/StatusMap.java index cf9816b..772230e 100644 --- a/api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/StatusMap.java +++ b/api-project-component-v0/src/main/java/org/opendevstack/apiservice/projectcomponent/mapper/StatusMap.java @@ -1,6 +1,6 @@ -package org.opendevstack.apiservice.project.mapper; +package org.opendevstack.apiservice.projectcomponent.mapper; -import org.opendevstack.apiservice.project.model.ComponentsStatusDTO; +import org.opendevstack.apiservice.projectcomponent.client.model.ComponentsStatusDTO; import java.util.HashMap; import java.util.Map; diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsControllerTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsControllerTest.java similarity index 85% rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsControllerTest.java rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsControllerTest.java index 3f69e77..4596197 100644 --- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsControllerTest.java +++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsControllerTest.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.controller; +package org.opendevstack.apiservice.projectcomponent.controller; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -7,12 +7,12 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException; -import org.opendevstack.apiservice.project.exception.ComponentNotFoundException; -import org.opendevstack.apiservice.project.facade.ComponentsFacade; -import org.opendevstack.apiservice.project.mapper.ComponentResponseMapper; -import org.opendevstack.apiservice.project.model.Component; -import org.opendevstack.apiservice.project.model.CreateComponentRequest; -import org.opendevstack.apiservice.project.model.CreateComponentResponse; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException; +import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade; +import org.opendevstack.apiservice.projectcomponent.mapper.ComponentResponseMapper; +import org.opendevstack.apiservice.projectcomponent.client.model.Component; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -23,8 +23,8 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestComponent; -import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCreateComponentRequest; +import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestComponent; +import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestCreateComponentRequest; class ProjectComponentsControllerTest { diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalControllerTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalControllerTest.java similarity index 90% rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalControllerTest.java rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalControllerTest.java index 4554359..1d47a79 100644 --- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsInternalControllerTest.java +++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/ProjectComponentsInternalControllerTest.java @@ -1,12 +1,12 @@ -package org.opendevstack.apiservice.project.controller; +package org.opendevstack.apiservice.projectcomponent.controller; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendevstack.apiservice.project.exception.ComponentDeletionException; -import org.opendevstack.apiservice.project.facade.ComponentsFacade; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException; +import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandlerTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandlerTest.java similarity index 94% rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandlerTest.java rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandlerTest.java index 92a0601..c8b9430 100644 --- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandlerTest.java +++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/controller/advice/ProjectComponentsExceptionHandlerTest.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.controller.advice; +package org.opendevstack.apiservice.projectcomponent.controller.advice; import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.AfterEach; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException; -import org.opendevstack.apiservice.project.exception.ComponentCreationException; -import org.opendevstack.apiservice.project.exception.ComponentNotFoundException; -import org.opendevstack.apiservice.project.model.CreateComponentResponse; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse; import org.springframework.core.MethodParameter; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsFacadeTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacadeTest.java similarity index 85% rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsFacadeTest.java rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacadeTest.java index 0507499..a8051fa 100644 --- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsFacadeTest.java +++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/facade/ComponentsFacadeTest.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.facade; +package org.opendevstack.apiservice.projectcomponent.facade; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -10,14 +10,14 @@ import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItem; import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProjectComponentExtendedInfo; import org.opendevstack.apiservice.externalservice.marketplace.service.MarketplaceService; -import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException; -import org.opendevstack.apiservice.project.exception.ComponentCreationException; -import org.opendevstack.apiservice.project.exception.ComponentDeletionException; -import org.opendevstack.apiservice.project.exception.ComponentNotFoundException; -import org.opendevstack.apiservice.project.mapper.MarketplaceMapper; -import org.opendevstack.apiservice.project.model.Component; -import org.opendevstack.apiservice.project.model.ComponentsStatusDTO; -import org.opendevstack.apiservice.project.model.CreateComponentRequest; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException; +import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException; +import org.opendevstack.apiservice.projectcomponent.mapper.MarketplaceMapper; +import org.opendevstack.apiservice.projectcomponent.client.model.Component; +import org.opendevstack.apiservice.projectcomponent.client.model.ComponentsStatusDTO; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.web.client.HttpClientErrorException; @@ -30,9 +30,9 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCatalogItem; -import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCreateComponentRequest; -import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestMarketplaceComponent; +import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestCatalogItem; +import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestCreateComponentRequest; +import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestMarketplaceComponent; @ExtendWith(MockitoExtension.class) class ComponentsFacadeTest { diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapperTest.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapperTest.java similarity index 97% rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapperTest.java rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapperTest.java index 6495d05..6017cf9 100644 --- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapperTest.java +++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/mapper/MarketplaceMapperTest.java @@ -1,4 +1,4 @@ -package org.opendevstack.apiservice.project.mapper; +package org.opendevstack.apiservice.projectcomponent.mapper; import org.junit.jupiter.api.Test; import org.mapstruct.factory.Mappers; @@ -6,7 +6,7 @@ import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItemUserAction; import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItemUserActionParameter; import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProvisionActionParameter; -import org.opendevstack.apiservice.project.model.CreateComponentRequest; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest; import java.util.List; import java.util.Map; diff --git a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/util/TestObjectsBuilder.java b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/util/TestObjectsBuilder.java similarity index 83% rename from api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/util/TestObjectsBuilder.java rename to api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/util/TestObjectsBuilder.java index a9c059f..29436d3 100644 --- a/api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/util/TestObjectsBuilder.java +++ b/api-project-component-v0/src/test/java/org/opendevstack/apiservice/projectcomponent/util/TestObjectsBuilder.java @@ -1,11 +1,11 @@ -package org.opendevstack.apiservice.project.util; +package org.opendevstack.apiservice.projectcomponent.util; import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItem; import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProjectComponentExtendedInfo; -import org.opendevstack.apiservice.project.model.Component; -import org.opendevstack.apiservice.project.model.ComponentsStatusDTO; -import org.opendevstack.apiservice.project.model.CreateComponentRequest; -import org.opendevstack.apiservice.project.model.EnvironmentsDTO; +import org.opendevstack.apiservice.projectcomponent.client.model.Component; +import org.opendevstack.apiservice.projectcomponent.client.model.ComponentsStatusDTO; +import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest; +import org.opendevstack.apiservice.projectcomponent.client.model.EnvironmentsDTO; import java.util.HashMap; import java.util.UUID;