From 47eb55920041a0bf9ef4f153dbb47f4776ac8ea6 Mon Sep 17 00:00:00 2001 From: Michael Rasch Date: Sat, 10 May 2025 18:32:20 -0400 Subject: [PATCH 1/2] Make new module, move httpurl validation over --- pom.xml | 1 + server-contract/pom.xml | 57 +++++++++++++++++++ .../validations/annotations}/HttpUrl.java | 4 +- .../handlers}/HttpUrlValidationHandler.java | 4 +- .../requests}/HeartbeatRequest.java | 4 +- .../HttpUrlValidationHandlerTest.java | 2 +- server/pom.xml | 6 ++ .../controller/HeartbeatController.java | 2 +- .../heartbeat/service/HeartbeatService.java | 2 +- .../model/RegisterServiceRequest.java | 2 +- .../registry/model/RemoveServiceRequest.java | 2 +- .../registry/model/UpdateStatusRequest.java | 2 +- .../controller/HeartbeatControllerTest.java | 2 +- .../service/HeartbeatServiceTest.java | 2 +- 14 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 server-contract/pom.xml rename {server/src/main/java/com/michael/container/validation/annotation => server-contract/src/main/java/com/michael/contract/resources/validations/annotations}/HttpUrl.java (84%) rename {server/src/main/java/com/michael/container/validation/handler => server-contract/src/main/java/com/michael/contract/resources/validations/handlers}/HttpUrlValidationHandler.java (91%) rename {server/src/main/java/com/michael/container/heartbeat/model => server-contract/src/main/java/com/michael/contract/resources/validations/requests}/HeartbeatRequest.java (88%) rename server/src/test/java/com/michael/container/validation/handler/HttpHttpUrlValidationHandlerTest.java => server-contract/src/test/java/com/michael/contract/resources/validations/handlers/HttpUrlValidationHandlerTest.java (93%) diff --git a/pom.xml b/pom.xml index 5826395..d50869b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ server registry-server-runner spring-utils + server-contract diff --git a/server-contract/pom.xml b/server-contract/pom.xml new file mode 100644 index 0000000..ceefc17 --- /dev/null +++ b/server-contract/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.michael + service-container-parent + 1.0.0 + + + contract + + + 23 + 23 + UTF-8 + + + + + + com.michael + service-container-server-bom + ${project.version} + pom + import + + + + + + + org.hibernate.validator + hibernate-validator + + + org.apache.commons + commons-lang3 + + + org.junit.jupiter + junit-jupiter-params + test + + + org.mockito + mockito-junit-jupiter + test + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + + + \ No newline at end of file diff --git a/server/src/main/java/com/michael/container/validation/annotation/HttpUrl.java b/server-contract/src/main/java/com/michael/contract/resources/validations/annotations/HttpUrl.java similarity index 84% rename from server/src/main/java/com/michael/container/validation/annotation/HttpUrl.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/annotations/HttpUrl.java index e2d9f9b..672f6ac 100644 --- a/server/src/main/java/com/michael/container/validation/annotation/HttpUrl.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/annotations/HttpUrl.java @@ -1,6 +1,6 @@ -package com.michael.container.validation.annotation; +package com.michael.contract.resources.validations.annotations; -import com.michael.container.validation.handler.HttpUrlValidationHandler; +import com.michael.contract.resources.validations.handlers.HttpUrlValidationHandler; import jakarta.validation.Constraint; import jakarta.validation.Payload; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/com/michael/container/validation/handler/HttpUrlValidationHandler.java b/server-contract/src/main/java/com/michael/contract/resources/validations/handlers/HttpUrlValidationHandler.java similarity index 91% rename from server/src/main/java/com/michael/container/validation/handler/HttpUrlValidationHandler.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/handlers/HttpUrlValidationHandler.java index 0c6f20c..c0a066e 100644 --- a/server/src/main/java/com/michael/container/validation/handler/HttpUrlValidationHandler.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/handlers/HttpUrlValidationHandler.java @@ -1,6 +1,6 @@ -package com.michael.container.validation.handler; +package com.michael.contract.resources.validations.handlers; -import com.michael.container.validation.annotation.HttpUrl; +import com.michael.contract.resources.validations.annotations.HttpUrl; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import java.net.URI; diff --git a/server/src/main/java/com/michael/container/heartbeat/model/HeartbeatRequest.java b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/HeartbeatRequest.java similarity index 88% rename from server/src/main/java/com/michael/container/heartbeat/model/HeartbeatRequest.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/requests/HeartbeatRequest.java index e87b5d0..e8c6a68 100644 --- a/server/src/main/java/com/michael/container/heartbeat/model/HeartbeatRequest.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/HeartbeatRequest.java @@ -1,6 +1,6 @@ -package com.michael.container.heartbeat.model; +package com.michael.contract.resources.validations.requests; -import com.michael.container.validation.annotation.HttpUrl; +import com.michael.contract.resources.validations.annotations.HttpUrl; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/server/src/test/java/com/michael/container/validation/handler/HttpHttpUrlValidationHandlerTest.java b/server-contract/src/test/java/com/michael/contract/resources/validations/handlers/HttpUrlValidationHandlerTest.java similarity index 93% rename from server/src/test/java/com/michael/container/validation/handler/HttpHttpUrlValidationHandlerTest.java rename to server-contract/src/test/java/com/michael/contract/resources/validations/handlers/HttpUrlValidationHandlerTest.java index 279ed80..1801252 100644 --- a/server/src/test/java/com/michael/container/validation/handler/HttpHttpUrlValidationHandlerTest.java +++ b/server-contract/src/test/java/com/michael/contract/resources/validations/handlers/HttpUrlValidationHandlerTest.java @@ -1,4 +1,4 @@ -package com.michael.container.validation.handler; +package com.michael.contract.resources.validations.handlers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/server/pom.xml b/server/pom.xml index 57d96dd..fd1c89b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -102,6 +102,12 @@ 1.0.0 compile + + com.michael + contract + 1.0.0 + compile + diff --git a/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java b/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java index 12562b5..ce494bd 100644 --- a/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java +++ b/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java @@ -1,8 +1,8 @@ package com.michael.container.heartbeat.controller; -import com.michael.container.heartbeat.model.HeartbeatRequest; import com.michael.container.heartbeat.model.HeartbeatResponse; import com.michael.container.heartbeat.service.HeartbeatService; +import com.michael.contract.resources.validations.requests.HeartbeatRequest; import com.michael.spring.utils.logger.annotations.ExecutionTime; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; diff --git a/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java b/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java index 06c2369..6addd99 100644 --- a/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java +++ b/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java @@ -1,10 +1,10 @@ package com.michael.container.heartbeat.service; import com.michael.container.heartbeat.enums.HeartbeatEvent; -import com.michael.container.heartbeat.model.HeartbeatRequest; import com.michael.container.heartbeat.model.HeartbeatResponse; import com.michael.container.registry.cache.crud.CrudRegistry; import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.requests.HeartbeatRequest; import jakarta.annotation.Nonnull; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/com/michael/container/registry/model/RegisterServiceRequest.java b/server/src/main/java/com/michael/container/registry/model/RegisterServiceRequest.java index 10d3cfa..ae63ba6 100644 --- a/server/src/main/java/com/michael/container/registry/model/RegisterServiceRequest.java +++ b/server/src/main/java/com/michael/container/registry/model/RegisterServiceRequest.java @@ -1,7 +1,7 @@ package com.michael.container.registry.model; import com.michael.container.registry.enums.Tag; -import com.michael.container.validation.annotation.HttpUrl; +import com.michael.contract.resources.validations.annotations.HttpUrl; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/com/michael/container/registry/model/RemoveServiceRequest.java b/server/src/main/java/com/michael/container/registry/model/RemoveServiceRequest.java index 917dbc3..953ad20 100644 --- a/server/src/main/java/com/michael/container/registry/model/RemoveServiceRequest.java +++ b/server/src/main/java/com/michael/container/registry/model/RemoveServiceRequest.java @@ -1,6 +1,6 @@ package com.michael.container.registry.model; -import com.michael.container.validation.annotation.HttpUrl; +import com.michael.contract.resources.validations.annotations.HttpUrl; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/com/michael/container/registry/model/UpdateStatusRequest.java b/server/src/main/java/com/michael/container/registry/model/UpdateStatusRequest.java index e81715b..4813184 100644 --- a/server/src/main/java/com/michael/container/registry/model/UpdateStatusRequest.java +++ b/server/src/main/java/com/michael/container/registry/model/UpdateStatusRequest.java @@ -1,7 +1,7 @@ package com.michael.container.registry.model; import com.michael.container.registry.enums.Status; -import com.michael.container.validation.annotation.HttpUrl; +import com.michael.contract.resources.validations.annotations.HttpUrl; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/server/src/test/java/com/michael/container/heartbeat/controller/HeartbeatControllerTest.java b/server/src/test/java/com/michael/container/heartbeat/controller/HeartbeatControllerTest.java index 5814b46..befa1eb 100644 --- a/server/src/test/java/com/michael/container/heartbeat/controller/HeartbeatControllerTest.java +++ b/server/src/test/java/com/michael/container/heartbeat/controller/HeartbeatControllerTest.java @@ -4,8 +4,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.michael.container.heartbeat.model.HeartbeatRequest; import com.michael.container.heartbeat.service.HeartbeatService; +import com.michael.contract.resources.validations.requests.HeartbeatRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java b/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java index 7fee71c..1b0ea5f 100644 --- a/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java +++ b/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java @@ -3,11 +3,11 @@ import static org.mockito.ArgumentMatchers.*; import com.michael.container.heartbeat.enums.HeartbeatEvent; -import com.michael.container.heartbeat.model.HeartbeatRequest; import com.michael.container.heartbeat.model.HeartbeatResponse; import com.michael.container.registry.cache.crud.CrudRegistry; import com.michael.container.registry.enums.Status; import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.requests.HeartbeatRequest; import java.util.HashMap; import java.util.HashSet; import java.util.Optional; From 2c78af218038526d5ab12d2333f94ed4136cbfcf Mon Sep 17 00:00:00 2001 From: Michael Rasch Date: Sat, 10 May 2025 18:59:18 -0400 Subject: [PATCH 2/2] Moved the rest of the requests and responses to contract --- .../resources/validations}/enums/HeartbeatEvent.java | 2 +- .../contract/resources/validations}/enums/Status.java | 2 +- .../contract/resources/validations}/enums/Tag.java | 2 +- .../validations/requests}/RegisterServiceRequest.java | 6 +++--- .../validations/requests}/RemoveServiceRequest.java | 2 +- .../validations/requests}/UpdateStatusRequest.java | 4 ++-- .../validations/responses/HeartbeatResponse.java | 6 ++++++ .../responses}/RegisterServiceResponse.java | 6 +++--- .../container/health/routines/HealthCheckRoutine.java | 2 +- .../container/health/service/HealthCheckService.java | 2 +- .../heartbeat/controller/HeartbeatController.java | 2 +- .../container/heartbeat/model/HeartbeatResponse.java | 6 ------ .../container/heartbeat/service/HeartbeatService.java | 9 +++++---- .../notifications/enums/StatusStateEvent.java | 2 +- .../container/notifications/fsm/status/FailState.java | 4 ++-- .../fsm/status/StatusChangeOrchestrator.java | 2 +- .../service/RegisterNotificationService.java | 2 +- .../container/registry/cache/crud/CrudRegistry.java | 4 ++-- .../registry/cache/entity/InstanceEntity.java | 4 ++-- .../cache/listener/key/ExpiredKeyListener.java | 2 +- .../registry/controller/ServiceRegistryController.java | 8 ++++---- .../InstanceEntityToRegisterServiceResponseMapper.java | 2 +- ...rServiceRequestToRegisterServiceResponseMapper.java | 6 +++--- .../RegisterServiceResponseToInstanceEntityMapper.java | 2 +- .../container/registry/model/StatusChangeEvent.java | 2 +- .../registry/service/ServiceRegistryService.java | 8 ++++---- .../health/routines/HealthCheckRoutineTest.java | 2 +- .../heartbeat/service/HeartbeatServiceTest.java | 8 ++++---- .../integration/suite/MultipleServiceTestSuite.java | 8 ++++---- .../integration/suite/SingleServiceTestSuite.java | 10 +++++----- .../status/StatusChangeHandlerOrchestratorTest.java | 2 +- .../service/RegisterNotificationServiceTest.java | 4 ++-- .../registry/cache/crud/CrudRegistryTest.java | 4 ++-- .../controller/ServiceRegistryControllerTest.java | 2 +- .../registry/service/ServiceRegistryServiceTest.java | 8 ++++---- 35 files changed, 74 insertions(+), 73 deletions(-) rename {server/src/main/java/com/michael/container/heartbeat => server-contract/src/main/java/com/michael/contract/resources/validations}/enums/HeartbeatEvent.java (83%) rename {server/src/main/java/com/michael/container/registry => server-contract/src/main/java/com/michael/contract/resources/validations}/enums/Status.java (83%) rename {server/src/main/java/com/michael/container/registry => server-contract/src/main/java/com/michael/contract/resources/validations}/enums/Tag.java (86%) rename {server/src/main/java/com/michael/container/registry/model => server-contract/src/main/java/com/michael/contract/resources/validations/requests}/RegisterServiceRequest.java (91%) rename {server/src/main/java/com/michael/container/registry/model => server-contract/src/main/java/com/michael/contract/resources/validations/requests}/RemoveServiceRequest.java (94%) rename {server/src/main/java/com/michael/container/registry/model => server-contract/src/main/java/com/michael/contract/resources/validations/requests}/UpdateStatusRequest.java (89%) create mode 100644 server-contract/src/main/java/com/michael/contract/resources/validations/responses/HeartbeatResponse.java rename {server/src/main/java/com/michael/container/registry/model => server-contract/src/main/java/com/michael/contract/resources/validations/responses}/RegisterServiceResponse.java (65%) delete mode 100644 server/src/main/java/com/michael/container/heartbeat/model/HeartbeatResponse.java diff --git a/server/src/main/java/com/michael/container/heartbeat/enums/HeartbeatEvent.java b/server-contract/src/main/java/com/michael/contract/resources/validations/enums/HeartbeatEvent.java similarity index 83% rename from server/src/main/java/com/michael/container/heartbeat/enums/HeartbeatEvent.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/enums/HeartbeatEvent.java index 81cb893..89b0e10 100644 --- a/server/src/main/java/com/michael/container/heartbeat/enums/HeartbeatEvent.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/enums/HeartbeatEvent.java @@ -1,4 +1,4 @@ -package com.michael.container.heartbeat.enums; +package com.michael.contract.resources.validations.enums; public enum HeartbeatEvent { FOUND("Heartbeat Found"), diff --git a/server/src/main/java/com/michael/container/registry/enums/Status.java b/server-contract/src/main/java/com/michael/contract/resources/validations/enums/Status.java similarity index 83% rename from server/src/main/java/com/michael/container/registry/enums/Status.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/enums/Status.java index aad5eeb..1445aaf 100644 --- a/server/src/main/java/com/michael/container/registry/enums/Status.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/enums/Status.java @@ -1,4 +1,4 @@ -package com.michael.container.registry.enums; +package com.michael.contract.resources.validations.enums; import java.util.Set; diff --git a/server/src/main/java/com/michael/container/registry/enums/Tag.java b/server-contract/src/main/java/com/michael/contract/resources/validations/enums/Tag.java similarity index 86% rename from server/src/main/java/com/michael/container/registry/enums/Tag.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/enums/Tag.java index 65ba549..4450142 100644 --- a/server/src/main/java/com/michael/container/registry/enums/Tag.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/enums/Tag.java @@ -1,4 +1,4 @@ -package com.michael.container.registry.enums; +package com.michael.contract.resources.validations.enums; public enum Tag { LANGUAGE, diff --git a/server/src/main/java/com/michael/container/registry/model/RegisterServiceRequest.java b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/RegisterServiceRequest.java similarity index 91% rename from server/src/main/java/com/michael/container/registry/model/RegisterServiceRequest.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/requests/RegisterServiceRequest.java index ae63ba6..4364804 100644 --- a/server/src/main/java/com/michael/container/registry/model/RegisterServiceRequest.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/RegisterServiceRequest.java @@ -1,12 +1,12 @@ -package com.michael.container.registry.model; +package com.michael.contract.resources.validations.requests; -import com.michael.container.registry.enums.Tag; import com.michael.contract.resources.validations.annotations.HttpUrl; +import com.michael.contract.resources.validations.enums.Tag; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import java.util.Map; import java.util.Set; +import org.springframework.lang.Nullable; public record RegisterServiceRequest( @NotNull diff --git a/server/src/main/java/com/michael/container/registry/model/RemoveServiceRequest.java b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/RemoveServiceRequest.java similarity index 94% rename from server/src/main/java/com/michael/container/registry/model/RemoveServiceRequest.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/requests/RemoveServiceRequest.java index 953ad20..b90f39d 100644 --- a/server/src/main/java/com/michael/container/registry/model/RemoveServiceRequest.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/RemoveServiceRequest.java @@ -1,4 +1,4 @@ -package com.michael.container.registry.model; +package com.michael.contract.resources.validations.requests; import com.michael.contract.resources.validations.annotations.HttpUrl; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/server/src/main/java/com/michael/container/registry/model/UpdateStatusRequest.java b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/UpdateStatusRequest.java similarity index 89% rename from server/src/main/java/com/michael/container/registry/model/UpdateStatusRequest.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/requests/UpdateStatusRequest.java index 4813184..89de46b 100644 --- a/server/src/main/java/com/michael/container/registry/model/UpdateStatusRequest.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/requests/UpdateStatusRequest.java @@ -1,7 +1,7 @@ -package com.michael.container.registry.model; +package com.michael.contract.resources.validations.requests; -import com.michael.container.registry.enums.Status; import com.michael.contract.resources.validations.annotations.HttpUrl; +import com.michael.contract.resources.validations.enums.Status; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/server-contract/src/main/java/com/michael/contract/resources/validations/responses/HeartbeatResponse.java b/server-contract/src/main/java/com/michael/contract/resources/validations/responses/HeartbeatResponse.java new file mode 100644 index 0000000..0229b6a --- /dev/null +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/responses/HeartbeatResponse.java @@ -0,0 +1,6 @@ +package com.michael.contract.resources.validations.responses; + +import com.michael.contract.resources.validations.enums.HeartbeatEvent; +import org.springframework.lang.NonNull; + +public record HeartbeatResponse(@NonNull HeartbeatEvent event, @NonNull String description) {} diff --git a/server/src/main/java/com/michael/container/registry/model/RegisterServiceResponse.java b/server-contract/src/main/java/com/michael/contract/resources/validations/responses/RegisterServiceResponse.java similarity index 65% rename from server/src/main/java/com/michael/container/registry/model/RegisterServiceResponse.java rename to server-contract/src/main/java/com/michael/contract/resources/validations/responses/RegisterServiceResponse.java index 20a48c5..4c66902 100644 --- a/server/src/main/java/com/michael/container/registry/model/RegisterServiceResponse.java +++ b/server-contract/src/main/java/com/michael/contract/resources/validations/responses/RegisterServiceResponse.java @@ -1,7 +1,7 @@ -package com.michael.container.registry.model; +package com.michael.contract.resources.validations.responses; -import com.michael.container.registry.enums.Status; -import com.michael.container.registry.enums.Tag; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.enums.Tag; import java.util.Map; import java.util.Set; import org.springframework.lang.NonNull; diff --git a/server/src/main/java/com/michael/container/health/routines/HealthCheckRoutine.java b/server/src/main/java/com/michael/container/health/routines/HealthCheckRoutine.java index f36ed03..3b48368 100644 --- a/server/src/main/java/com/michael/container/health/routines/HealthCheckRoutine.java +++ b/server/src/main/java/com/michael/container/health/routines/HealthCheckRoutine.java @@ -1,6 +1,6 @@ package com.michael.container.health.routines; -import static com.michael.container.registry.enums.Status.STATUSES_TO_SKIP_HEARTBEAT; +import static com.michael.contract.resources.validations.enums.Status.STATUSES_TO_SKIP_HEARTBEAT; import com.google.common.collect.Lists; import com.michael.container.annotations.SkipIfAutomationEnvironment; diff --git a/server/src/main/java/com/michael/container/health/service/HealthCheckService.java b/server/src/main/java/com/michael/container/health/service/HealthCheckService.java index 1fd9648..e79510e 100644 --- a/server/src/main/java/com/michael/container/health/service/HealthCheckService.java +++ b/server/src/main/java/com/michael/container/health/service/HealthCheckService.java @@ -4,8 +4,8 @@ import com.michael.container.health.exception.HealthCheckInvalidException; import com.michael.container.health.repositories.HealthQueueRepository; import com.michael.container.registry.cache.entity.HealthQueueEntity; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.model.StatusChangeEvent; +import com.michael.contract.resources.validations.enums.Status; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java b/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java index ce494bd..8814256 100644 --- a/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java +++ b/server/src/main/java/com/michael/container/heartbeat/controller/HeartbeatController.java @@ -1,8 +1,8 @@ package com.michael.container.heartbeat.controller; -import com.michael.container.heartbeat.model.HeartbeatResponse; import com.michael.container.heartbeat.service.HeartbeatService; import com.michael.contract.resources.validations.requests.HeartbeatRequest; +import com.michael.contract.resources.validations.responses.HeartbeatResponse; import com.michael.spring.utils.logger.annotations.ExecutionTime; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; diff --git a/server/src/main/java/com/michael/container/heartbeat/model/HeartbeatResponse.java b/server/src/main/java/com/michael/container/heartbeat/model/HeartbeatResponse.java deleted file mode 100644 index f3fcb88..0000000 --- a/server/src/main/java/com/michael/container/heartbeat/model/HeartbeatResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.michael.container.heartbeat.model; - -import com.michael.container.heartbeat.enums.HeartbeatEvent; -import jakarta.annotation.Nonnull; - -public record HeartbeatResponse(@Nonnull HeartbeatEvent event, @Nonnull String description) {} diff --git a/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java b/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java index 6addd99..6091693 100644 --- a/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java +++ b/server/src/main/java/com/michael/container/heartbeat/service/HeartbeatService.java @@ -1,10 +1,11 @@ package com.michael.container.heartbeat.service; -import com.michael.container.heartbeat.enums.HeartbeatEvent; -import com.michael.container.heartbeat.model.HeartbeatResponse; import com.michael.container.registry.cache.crud.CrudRegistry; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.enums.HeartbeatEvent; +import com.michael.contract.resources.validations.enums.Status; import com.michael.contract.resources.validations.requests.HeartbeatRequest; +import com.michael.contract.resources.validations.responses.HeartbeatResponse; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import jakarta.annotation.Nonnull; import org.springframework.stereotype.Service; @@ -22,7 +23,7 @@ public HeartbeatService(CrudRegistry crudRegistry) { * If the application is not found in the registry, this method responds with {@link HeartbeatEvent#RE_REGISTER}. * If the application is found, it refreshes the Time-to-Live (TTL) of the service in the registry and returns * {@link HeartbeatEvent#FOUND}. Additionally, the service is transitioned from either the {@link com.michael.container.registry.enums.Status#STARTING} - * or {@link com.michael.container.registry.enums.Status#DOWN} state to {@link com.michael.container.registry.enums.Status#HEALTHY}. + * or {@link Status#DOWN} state to {@link Status#HEALTHY}. *

* * @param heartbeatRequest the {@link HeartbeatRequest} containing details about the service diff --git a/server/src/main/java/com/michael/container/notifications/enums/StatusStateEvent.java b/server/src/main/java/com/michael/container/notifications/enums/StatusStateEvent.java index 82c6294..207becc 100644 --- a/server/src/main/java/com/michael/container/notifications/enums/StatusStateEvent.java +++ b/server/src/main/java/com/michael/container/notifications/enums/StatusStateEvent.java @@ -1,6 +1,6 @@ package com.michael.container.notifications.enums; -import com.michael.container.registry.enums.Status; +import com.michael.contract.resources.validations.enums.Status; import jakarta.annotation.Nonnull; import java.util.Optional; diff --git a/server/src/main/java/com/michael/container/notifications/fsm/status/FailState.java b/server/src/main/java/com/michael/container/notifications/fsm/status/FailState.java index 0a278b2..4f7b25d 100644 --- a/server/src/main/java/com/michael/container/notifications/fsm/status/FailState.java +++ b/server/src/main/java/com/michael/container/notifications/fsm/status/FailState.java @@ -4,10 +4,10 @@ import com.michael.container.notifications.enums.StatusStateEvent; import com.michael.container.notifications.model.ServiceNotificationRequest; import com.michael.container.notifications.service.NotificationService; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.model.StatusChangeEvent; -import com.michael.container.registry.model.UpdateStatusRequest; import com.michael.container.registry.service.ServiceRegistryService; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.requests.UpdateStatusRequest; import jakarta.annotation.Nonnull; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/server/src/main/java/com/michael/container/notifications/fsm/status/StatusChangeOrchestrator.java b/server/src/main/java/com/michael/container/notifications/fsm/status/StatusChangeOrchestrator.java index c5184c7..be25e23 100644 --- a/server/src/main/java/com/michael/container/notifications/fsm/status/StatusChangeOrchestrator.java +++ b/server/src/main/java/com/michael/container/notifications/fsm/status/StatusChangeOrchestrator.java @@ -2,8 +2,8 @@ import com.michael.container.notifications.enums.StatusStateEvent; import com.michael.container.registry.cache.entity.InstanceEntity; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.model.StatusChangeEvent; +import com.michael.contract.resources.validations.enums.Status; import jakarta.annotation.Nonnull; import java.util.Map; import java.util.Set; diff --git a/server/src/main/java/com/michael/container/notifications/service/RegisterNotificationService.java b/server/src/main/java/com/michael/container/notifications/service/RegisterNotificationService.java index e8fdab4..3464fae 100644 --- a/server/src/main/java/com/michael/container/notifications/service/RegisterNotificationService.java +++ b/server/src/main/java/com/michael/container/notifications/service/RegisterNotificationService.java @@ -8,7 +8,7 @@ import com.michael.container.notifications.repositories.PendingServiceNotificationQueueRepository; import com.michael.container.registry.cache.crud.CrudRegistry; import com.michael.container.registry.cache.entity.PendingServiceNotificationEntity; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import com.michael.spring.utils.logger.annotations.ExecutionTime; import jakarta.annotation.Nonnull; import java.util.Set; diff --git a/server/src/main/java/com/michael/container/registry/cache/crud/CrudRegistry.java b/server/src/main/java/com/michael/container/registry/cache/crud/CrudRegistry.java index dc0ea09..b790acc 100644 --- a/server/src/main/java/com/michael/container/registry/cache/crud/CrudRegistry.java +++ b/server/src/main/java/com/michael/container/registry/cache/crud/CrudRegistry.java @@ -5,11 +5,11 @@ import com.michael.container.registry.cache.entity.InstanceEntity; import com.michael.container.registry.cache.repositories.ApplicationRepository; import com.michael.container.registry.cache.repositories.InstanceRepository; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.model.DeregisterEvent; -import com.michael.container.registry.model.RegisterServiceResponse; import com.michael.container.registry.model.StatusChangeEvent; import com.michael.container.utils.ContainerConstants; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import jakarta.annotation.Nonnull; import java.util.HashMap; import java.util.HashSet; diff --git a/server/src/main/java/com/michael/container/registry/cache/entity/InstanceEntity.java b/server/src/main/java/com/michael/container/registry/cache/entity/InstanceEntity.java index 01c8863..8eae790 100644 --- a/server/src/main/java/com/michael/container/registry/cache/entity/InstanceEntity.java +++ b/server/src/main/java/com/michael/container/registry/cache/entity/InstanceEntity.java @@ -1,8 +1,8 @@ package com.michael.container.registry.cache.entity; -import com.michael.container.registry.enums.Status; -import com.michael.container.registry.enums.Tag; import com.michael.container.utils.ContainerConstants; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.enums.Tag; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/server/src/main/java/com/michael/container/registry/cache/listener/key/ExpiredKeyListener.java b/server/src/main/java/com/michael/container/registry/cache/listener/key/ExpiredKeyListener.java index 029d7fe..ebb2e87 100644 --- a/server/src/main/java/com/michael/container/registry/cache/listener/key/ExpiredKeyListener.java +++ b/server/src/main/java/com/michael/container/registry/cache/listener/key/ExpiredKeyListener.java @@ -2,8 +2,8 @@ import com.michael.container.distributed.election.enums.MethodAccess; import com.michael.container.registry.enums.Key; -import com.michael.container.registry.model.RemoveServiceRequest; import com.michael.container.registry.service.ServiceRegistryService; +import com.michael.contract.resources.validations.requests.RemoveServiceRequest; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/server/src/main/java/com/michael/container/registry/controller/ServiceRegistryController.java b/server/src/main/java/com/michael/container/registry/controller/ServiceRegistryController.java index 19f4db0..7ef882f 100644 --- a/server/src/main/java/com/michael/container/registry/controller/ServiceRegistryController.java +++ b/server/src/main/java/com/michael/container/registry/controller/ServiceRegistryController.java @@ -1,10 +1,10 @@ package com.michael.container.registry.controller; -import com.michael.container.registry.model.RegisterServiceRequest; -import com.michael.container.registry.model.RegisterServiceResponse; -import com.michael.container.registry.model.RemoveServiceRequest; -import com.michael.container.registry.model.UpdateStatusRequest; import com.michael.container.registry.service.ServiceRegistryService; +import com.michael.contract.resources.validations.requests.RegisterServiceRequest; +import com.michael.contract.resources.validations.requests.RemoveServiceRequest; +import com.michael.contract.resources.validations.requests.UpdateStatusRequest; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import com.michael.spring.utils.logger.annotations.ExecutionTime; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; diff --git a/server/src/main/java/com/michael/container/registry/mapper/InstanceEntityToRegisterServiceResponseMapper.java b/server/src/main/java/com/michael/container/registry/mapper/InstanceEntityToRegisterServiceResponseMapper.java index f919c21..41cde5c 100644 --- a/server/src/main/java/com/michael/container/registry/mapper/InstanceEntityToRegisterServiceResponseMapper.java +++ b/server/src/main/java/com/michael/container/registry/mapper/InstanceEntityToRegisterServiceResponseMapper.java @@ -1,7 +1,7 @@ package com.michael.container.registry.mapper; import com.michael.container.registry.cache.entity.InstanceEntity; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import jakarta.annotation.Nonnull; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceRequestToRegisterServiceResponseMapper.java b/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceRequestToRegisterServiceResponseMapper.java index eedd18d..c2a4534 100644 --- a/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceRequestToRegisterServiceResponseMapper.java +++ b/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceRequestToRegisterServiceResponseMapper.java @@ -1,8 +1,8 @@ package com.michael.container.registry.mapper; -import com.michael.container.registry.enums.Status; -import com.michael.container.registry.model.RegisterServiceRequest; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.requests.RegisterServiceRequest; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import jakarta.annotation.Nonnull; import java.util.HashMap; import java.util.HashSet; diff --git a/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceResponseToInstanceEntityMapper.java b/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceResponseToInstanceEntityMapper.java index 3f97f9b..8fbb40b 100644 --- a/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceResponseToInstanceEntityMapper.java +++ b/server/src/main/java/com/michael/container/registry/mapper/RegisterServiceResponseToInstanceEntityMapper.java @@ -1,7 +1,7 @@ package com.michael.container.registry.mapper; import com.michael.container.registry.cache.entity.InstanceEntity; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import jakarta.annotation.Nonnull; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/server/src/main/java/com/michael/container/registry/model/StatusChangeEvent.java b/server/src/main/java/com/michael/container/registry/model/StatusChangeEvent.java index b051f74..3a51470 100644 --- a/server/src/main/java/com/michael/container/registry/model/StatusChangeEvent.java +++ b/server/src/main/java/com/michael/container/registry/model/StatusChangeEvent.java @@ -1,6 +1,6 @@ package com.michael.container.registry.model; -import com.michael.container.registry.enums.Status; +import com.michael.contract.resources.validations.enums.Status; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; diff --git a/server/src/main/java/com/michael/container/registry/service/ServiceRegistryService.java b/server/src/main/java/com/michael/container/registry/service/ServiceRegistryService.java index bdcdc6e..1c69997 100644 --- a/server/src/main/java/com/michael/container/registry/service/ServiceRegistryService.java +++ b/server/src/main/java/com/michael/container/registry/service/ServiceRegistryService.java @@ -1,10 +1,10 @@ package com.michael.container.registry.service; import com.michael.container.registry.cache.crud.CrudRegistry; -import com.michael.container.registry.model.RegisterServiceRequest; -import com.michael.container.registry.model.RegisterServiceResponse; -import com.michael.container.registry.model.RemoveServiceRequest; -import com.michael.container.registry.model.UpdateStatusRequest; +import com.michael.contract.resources.validations.requests.RegisterServiceRequest; +import com.michael.contract.resources.validations.requests.RemoveServiceRequest; +import com.michael.contract.resources.validations.requests.UpdateStatusRequest; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import jakarta.annotation.Nonnull; import java.util.HashSet; import java.util.Map; diff --git a/server/src/test/java/com/michael/container/health/routines/HealthCheckRoutineTest.java b/server/src/test/java/com/michael/container/health/routines/HealthCheckRoutineTest.java index 86c9461..9acb5f7 100644 --- a/server/src/test/java/com/michael/container/health/routines/HealthCheckRoutineTest.java +++ b/server/src/test/java/com/michael/container/health/routines/HealthCheckRoutineTest.java @@ -7,7 +7,7 @@ import com.michael.container.registry.cache.entity.ApplicationEntity; import com.michael.container.registry.cache.entity.InstanceEntity; import com.michael.container.registry.cache.repositories.ApplicationRepository; -import com.michael.container.registry.enums.Status; +import com.michael.contract.resources.validations.enums.Status; import java.util.Collections; import java.util.Set; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java b/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java index 1b0ea5f..221ec4d 100644 --- a/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java +++ b/server/src/test/java/com/michael/container/heartbeat/service/HeartbeatServiceTest.java @@ -2,12 +2,12 @@ import static org.mockito.ArgumentMatchers.*; -import com.michael.container.heartbeat.enums.HeartbeatEvent; -import com.michael.container.heartbeat.model.HeartbeatResponse; import com.michael.container.registry.cache.crud.CrudRegistry; -import com.michael.container.registry.enums.Status; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.enums.HeartbeatEvent; +import com.michael.contract.resources.validations.enums.Status; import com.michael.contract.resources.validations.requests.HeartbeatRequest; +import com.michael.contract.resources.validations.responses.HeartbeatResponse; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import java.util.HashMap; import java.util.HashSet; import java.util.Optional; diff --git a/server/src/test/java/com/michael/container/integration/suite/MultipleServiceTestSuite.java b/server/src/test/java/com/michael/container/integration/suite/MultipleServiceTestSuite.java index a003efc..f3cd7b6 100644 --- a/server/src/test/java/com/michael/container/integration/suite/MultipleServiceTestSuite.java +++ b/server/src/test/java/com/michael/container/integration/suite/MultipleServiceTestSuite.java @@ -6,11 +6,11 @@ import com.michael.container.IntegrationTestExtension; import com.michael.container.distributed.election.enums.Role; import com.michael.container.distributed.election.state.ElectionState; -import com.michael.container.registry.enums.Status; -import com.michael.container.registry.model.RegisterServiceRequest; -import com.michael.container.registry.model.RemoveServiceRequest; -import com.michael.container.registry.model.UpdateStatusRequest; import com.michael.container.registry.service.ServiceRegistryService; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.requests.RegisterServiceRequest; +import com.michael.contract.resources.validations.requests.RemoveServiceRequest; +import com.michael.contract.resources.validations.requests.UpdateStatusRequest; import java.util.HashMap; import java.util.HashSet; import java.util.Set; diff --git a/server/src/test/java/com/michael/container/integration/suite/SingleServiceTestSuite.java b/server/src/test/java/com/michael/container/integration/suite/SingleServiceTestSuite.java index 3862ed4..c68fb0c 100644 --- a/server/src/test/java/com/michael/container/integration/suite/SingleServiceTestSuite.java +++ b/server/src/test/java/com/michael/container/integration/suite/SingleServiceTestSuite.java @@ -10,12 +10,12 @@ import com.michael.container.distributed.election.state.ElectionState; import com.michael.container.health.routines.HealthCheckRoutine; import com.michael.container.health.service.HealthCheckService; -import com.michael.container.registry.enums.Status; -import com.michael.container.registry.model.RegisterServiceRequest; -import com.michael.container.registry.model.RegisterServiceResponse; -import com.michael.container.registry.model.RemoveServiceRequest; -import com.michael.container.registry.model.UpdateStatusRequest; import com.michael.container.registry.service.ServiceRegistryService; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.requests.RegisterServiceRequest; +import com.michael.contract.resources.validations.requests.RemoveServiceRequest; +import com.michael.contract.resources.validations.requests.UpdateStatusRequest; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/server/src/test/java/com/michael/container/notifications/fsm/status/StatusChangeHandlerOrchestratorTest.java b/server/src/test/java/com/michael/container/notifications/fsm/status/StatusChangeHandlerOrchestratorTest.java index 6b322df..f76845d 100644 --- a/server/src/test/java/com/michael/container/notifications/fsm/status/StatusChangeHandlerOrchestratorTest.java +++ b/server/src/test/java/com/michael/container/notifications/fsm/status/StatusChangeHandlerOrchestratorTest.java @@ -1,7 +1,7 @@ package com.michael.container.notifications.fsm.status; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.model.StatusChangeEvent; +import com.michael.contract.resources.validations.enums.Status; import java.util.Set; import java.util.stream.Stream; import org.junit.jupiter.api.AfterEach; diff --git a/server/src/test/java/com/michael/container/notifications/service/RegisterNotificationServiceTest.java b/server/src/test/java/com/michael/container/notifications/service/RegisterNotificationServiceTest.java index cc968ee..24000df 100644 --- a/server/src/test/java/com/michael/container/notifications/service/RegisterNotificationServiceTest.java +++ b/server/src/test/java/com/michael/container/notifications/service/RegisterNotificationServiceTest.java @@ -15,10 +15,10 @@ import com.michael.container.registry.cache.entity.PendingServiceNotificationEntity; import com.michael.container.registry.cache.repositories.ApplicationRepository; import com.michael.container.registry.cache.repositories.InstanceRepository; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.mapper.InstanceEntityToRegisterServiceResponseMapper; import com.michael.container.registry.mapper.RegisterServiceResponseToInstanceEntityMapper; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import java.util.HashMap; import java.util.HashSet; import java.util.Set; diff --git a/server/src/test/java/com/michael/container/registry/cache/crud/CrudRegistryTest.java b/server/src/test/java/com/michael/container/registry/cache/crud/CrudRegistryTest.java index 67b5532..dcb96fd 100644 --- a/server/src/test/java/com/michael/container/registry/cache/crud/CrudRegistryTest.java +++ b/server/src/test/java/com/michael/container/registry/cache/crud/CrudRegistryTest.java @@ -5,10 +5,10 @@ import com.michael.container.distributed.election.state.ElectionState; import com.michael.container.registry.cache.repositories.ApplicationRepository; import com.michael.container.registry.cache.repositories.InstanceRepository; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.mapper.InstanceEntityToRegisterServiceResponseMapper; import com.michael.container.registry.mapper.RegisterServiceResponseToInstanceEntityMapper; -import com.michael.container.registry.model.RegisterServiceResponse; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; diff --git a/server/src/test/java/com/michael/container/registry/controller/ServiceRegistryControllerTest.java b/server/src/test/java/com/michael/container/registry/controller/ServiceRegistryControllerTest.java index 80e67b7..fab0efc 100644 --- a/server/src/test/java/com/michael/container/registry/controller/ServiceRegistryControllerTest.java +++ b/server/src/test/java/com/michael/container/registry/controller/ServiceRegistryControllerTest.java @@ -5,8 +5,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.michael.container.registry.model.RegisterServiceRequest; import com.michael.container.registry.service.ServiceRegistryService; +import com.michael.contract.resources.validations.requests.RegisterServiceRequest; import java.util.HashMap; import java.util.HashSet; import org.junit.jupiter.api.BeforeEach; diff --git a/server/src/test/java/com/michael/container/registry/service/ServiceRegistryServiceTest.java b/server/src/test/java/com/michael/container/registry/service/ServiceRegistryServiceTest.java index 166d7f3..e656869 100644 --- a/server/src/test/java/com/michael/container/registry/service/ServiceRegistryServiceTest.java +++ b/server/src/test/java/com/michael/container/registry/service/ServiceRegistryServiceTest.java @@ -1,11 +1,11 @@ package com.michael.container.registry.service; import com.michael.container.registry.cache.crud.CrudRegistry; -import com.michael.container.registry.enums.Status; import com.michael.container.registry.mapper.RegisterServiceRequestToRegisterServiceResponseMapper; -import com.michael.container.registry.model.RegisterServiceRequest; -import com.michael.container.registry.model.RegisterServiceResponse; -import com.michael.container.registry.model.RemoveServiceRequest; +import com.michael.contract.resources.validations.enums.Status; +import com.michael.contract.resources.validations.requests.RegisterServiceRequest; +import com.michael.contract.resources.validations.requests.RemoveServiceRequest; +import com.michael.contract.resources.validations.responses.RegisterServiceResponse; import java.util.Collection; import java.util.HashMap; import java.util.HashSet;