feature: api-165 move package from cp to cp.subscription

coling01 · coling01 · commit bf15390f1928 · 2025-12-16T07:28:43.000Z
diff --git a/src/apiTest/java/uk/gov/hmcts/cp/subscription/http/ActuatorApiTest.java b/src/apiTest/java/uk/gov/hmcts/cp/subscription/http/ActuatorApiTest.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.http;
+package uk.gov.hmcts.cp.subscription.http;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpEntity;
diff --git a/src/main/java/uk/gov/hmcts/cp/subscription/Application.java b/src/main/java/uk/gov/hmcts/cp/subscription/Application.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp;
+package uk.gov.hmcts.cp.subscription;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/uk/gov/hmcts/cp/subscription/controllers/SubscriptionController.java b/src/main/java/uk/gov/hmcts/cp/subscription/controllers/SubscriptionController.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.controllers;
+package uk.gov.hmcts.cp.subscription.controllers;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -8,7 +8,7 @@
 import uk.gov.hmcts.cp.openapi.api.SubscriptionApi;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscription;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
-import uk.gov.hmcts.cp.services.SubscriptionService;
+import uk.gov.hmcts.cp.subscription.services.SubscriptionService;
 
 import java.util.UUID;
 
diff --git a/src/main/java/uk/gov/hmcts/cp/subscription/entities/ClientSubscriptionEntity.java b/src/main/java/uk/gov/hmcts/cp/subscription/entities/ClientSubscriptionEntity.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.entities;
+package uk.gov.hmcts.cp.subscription.entities;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -9,7 +9,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import uk.gov.hmcts.cp.model.EntityEventType;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
 
 import java.time.OffsetDateTime;
 import java.util.List;
diff --git a/src/main/java/uk/gov/hmcts/cp/subscription/mappers/SubscriptionMapper.java b/src/main/java/uk/gov/hmcts/cp/subscription/mappers/SubscriptionMapper.java
@@ -1,11 +1,11 @@
-package uk.gov.hmcts.cp.mappers;
+package uk.gov.hmcts.cp.subscription.mappers;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.ReportingPolicy;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.model.EntityEventType;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscription;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
 import uk.gov.hmcts.cp.openapi.model.EventType;
diff --git a/src/main/java/uk/gov/hmcts/cp/subscription/model/EntityEventType.java b/src/main/java/uk/gov/hmcts/cp/subscription/model/EntityEventType.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.model;
+package uk.gov.hmcts.cp.subscription.model;
 
 public enum EntityEventType {
     PCR,
diff --git a/src/main/java/uk/gov/hmcts/cp/subscription/repositories/SubscriptionRepository.java b/src/main/java/uk/gov/hmcts/cp/subscription/repositories/SubscriptionRepository.java
@@ -1,8 +1,8 @@
-package uk.gov.hmcts.cp.repositories;
+package uk.gov.hmcts.cp.subscription.repositories;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
 
 import java.util.UUID;
 
diff --git a/src/main/java/uk/gov/hmcts/cp/subscription/services/SubscriptionService.java b/src/main/java/uk/gov/hmcts/cp/subscription/services/SubscriptionService.java
@@ -1,13 +1,13 @@
-package uk.gov.hmcts.cp.services;
+package uk.gov.hmcts.cp.subscription.services;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.mappers.SubscriptionMapper;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.mappers.SubscriptionMapper;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscription;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
-import uk.gov.hmcts.cp.repositories.SubscriptionRepository;
+import uk.gov.hmcts.cp.subscription.repositories.SubscriptionRepository;
 
 import java.util.UUID;
 
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/config/TestContainersInitialise.java b/src/test/java/uk/gov/hmcts/cp/subscription/config/TestContainersInitialise.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.config;
+package uk.gov.hmcts.cp.subscription.config;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/controllers/GlobalExceptionHandler.java b/src/test/java/uk/gov/hmcts/cp/subscription/controllers/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.controllers;
+package uk.gov.hmcts.cp.subscription.controllers;
 
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.http.HttpStatus;
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/controllers/SubscriptionControllerTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/controllers/SubscriptionControllerTest.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.controllers;
+package uk.gov.hmcts.cp.subscription.controllers;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -7,7 +7,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscription;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
-import uk.gov.hmcts.cp.services.SubscriptionService;
+import uk.gov.hmcts.cp.subscription.services.SubscriptionService;
 
 import java.util.UUID;
 
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/integration/IntegrationTestBase.java b/src/test/java/uk/gov/hmcts/cp/subscription/integration/IntegrationTestBase.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.cp.integration;
+package uk.gov.hmcts.cp.subscription.integration;
 
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -7,12 +7,12 @@
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
-import uk.gov.hmcts.cp.config.TestContainersInitialise;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.model.EntityEventType;
+import uk.gov.hmcts.cp.subscription.config.TestContainersInitialise;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
 import uk.gov.hmcts.cp.openapi.model.NotificationEndpoint;
-import uk.gov.hmcts.cp.repositories.SubscriptionRepository;
+import uk.gov.hmcts.cp.subscription.repositories.SubscriptionRepository;
 
 import java.time.OffsetDateTime;
 import java.util.List;
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionControllerValidationTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionControllerValidationTest.java
@@ -1,13 +1,12 @@
-package uk.gov.hmcts.cp.integration;
+package uk.gov.hmcts.cp.subscription.integration;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import tools.jackson.databind.ObjectMapper;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
 import uk.gov.hmcts.cp.openapi.model.NotificationEndpoint;
-import uk.gov.hmcts.cp.repositories.SubscriptionRepository;
+import uk.gov.hmcts.cp.subscription.repositories.SubscriptionRepository;
 
 import java.util.List;
 
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionDeleteControllerIntegrationTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionDeleteControllerIntegrationTest.java
@@ -1,11 +1,11 @@
-package uk.gov.hmcts.cp.integration;
+package uk.gov.hmcts.cp.subscription.integration;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.model.EntityEventType;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
 
 import java.util.List;
 
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionGetControllerIntegrationTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionGetControllerIntegrationTest.java
@@ -1,14 +1,10 @@
-package uk.gov.hmcts.cp.integration;
+package uk.gov.hmcts.cp.subscription.integration;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.model.EntityEventType;
-import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
-import uk.gov.hmcts.cp.openapi.model.NotificationEndpoint;
-import uk.gov.hmcts.cp.repositories.SubscriptionRepository;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
 
 import java.util.List;
 import java.util.UUID;
@@ -18,8 +14,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static uk.gov.hmcts.cp.openapi.model.EventType.CUSTODIAL_RESULT;
-import static uk.gov.hmcts.cp.openapi.model.EventType.PCR;
 
 class SubscriptionGetControllerIntegrationTest extends IntegrationTestBase {
 
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionSaveControllerIntegrationTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/integration/SubscriptionSaveControllerIntegrationTest.java
@@ -1,12 +1,12 @@
-package uk.gov.hmcts.cp.integration;
+package uk.gov.hmcts.cp.subscription.integration;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
 import tools.jackson.databind.ObjectMapper;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.model.EntityEventType;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
 
 import java.util.List;
 
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/mappers/SubscriptionMapperTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/mappers/SubscriptionMapperTest.java
@@ -1,8 +1,8 @@
-package uk.gov.hmcts.cp.mappers;
+package uk.gov.hmcts.cp.subscription.mappers;
 
 import org.junit.jupiter.api.Test;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.model.EntityEventType;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscription;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
 import uk.gov.hmcts.cp.openapi.model.NotificationEndpoint;
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/repositories/SubscriptionRepositoryTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/repositories/SubscriptionRepositoryTest.java
@@ -1,16 +1,16 @@
-package uk.gov.hmcts.cp.repositories;
+package uk.gov.hmcts.cp.subscription.repositories;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.annotation.Transactional;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.integration.IntegrationTestBase;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.integration.IntegrationTestBase;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static uk.gov.hmcts.cp.model.EntityEventType.CUSTODIAL_RESULT;
-import static uk.gov.hmcts.cp.model.EntityEventType.PCR;
+import static uk.gov.hmcts.cp.subscription.model.EntityEventType.CUSTODIAL_RESULT;
+import static uk.gov.hmcts.cp.subscription.model.EntityEventType.PCR;
 
 class SubscriptionRepositoryTest extends IntegrationTestBase {
 
diff --git a/src/test/java/uk/gov/hmcts/cp/subscription/services/SubscriptionServiceTest.java b/src/test/java/uk/gov/hmcts/cp/subscription/services/SubscriptionServiceTest.java
@@ -1,16 +1,16 @@
-package uk.gov.hmcts.cp.services;
+package uk.gov.hmcts.cp.subscription.services;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import uk.gov.hmcts.cp.entities.ClientSubscriptionEntity;
-import uk.gov.hmcts.cp.mappers.SubscriptionMapper;
-import uk.gov.hmcts.cp.mappers.SubscriptionMapperImpl;
+import uk.gov.hmcts.cp.subscription.entities.ClientSubscriptionEntity;
+import uk.gov.hmcts.cp.subscription.mappers.SubscriptionMapper;
+import uk.gov.hmcts.cp.subscription.mappers.SubscriptionMapperImpl;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscription;
 import uk.gov.hmcts.cp.openapi.model.ClientSubscriptionRequest;
-import uk.gov.hmcts.cp.repositories.SubscriptionRepository;
+import uk.gov.hmcts.cp.subscription.repositories.SubscriptionRepository;
 
 import java.util.UUID;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package uk.gov.hmcts.cp.http;`
	`1`	`+package uk.gov.hmcts.cp.subscription.http;`
`2`	`2`
`3`	`3`	`import org.junit.jupiter.api.Test;`
`4`	`4`	`import org.springframework.http.HttpEntity;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package uk.gov.hmcts.cp;`
	`1`	`+package uk.gov.hmcts.cp.subscription;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package uk.gov.hmcts.cp.model;`
	`1`	`+package uk.gov.hmcts.cp.subscription.model;`
`2`	`2`
`3`	`3`	`public enum EntityEventType {`
`4`	`4`	`PCR,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package uk.gov.hmcts.cp.config;`
	`1`	`+package uk.gov.hmcts.cp.subscription.config;`
`2`	`2`
`3`	`3`	`import lombok.SneakyThrows;`
`4`	`4`	`import lombok.extern.slf4j.Slf4j;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package uk.gov.hmcts.cp.controllers;`
	`1`	`+package uk.gov.hmcts.cp.subscription.controllers;`
`2`	`2`
`3`	`3`	`import jakarta.persistence.EntityNotFoundException;`
`4`	`4`	`import org.springframework.http.HttpStatus;`