Refactor to use common enums and util classes

ministryofjustice · Jan 12, 2024 · 556165a · 556165a
1 parent 7f981eb
commit 556165a
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 108 deletions.
diff --git a/crime-evidence/build.gradle b/crime-evidence/build.gradle
@@ -61,6 +61,7 @@ dependencies {
     implementation "io.micrometer:micrometer-registry-prometheus"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springDocWebMVCVersion"
     implementation "org.apache.commons:commons-lang3:$versions.commonsLang3Version"
+    implementation "uk.gov.justice.service.laa-crime:crime-commons-classes:$versions.crimeCommonsVersion"
 
     implementation "uk.gov.justice.service.laa-crime:crime-commons-spring-boot-starter-rest-client:$versions.crimeCommonsVersion"
 

diff --git a/crime-evidence/src/main/java/uk/gov/justice/laa/crime/evidence/service/EvidenceService.java b/crime-evidence/src/main/java/uk/gov/justice/laa/crime/evidence/service/EvidenceService.java
@@ -9,7 +9,7 @@
 import uk.gov.justice.laa.crime.evidence.dto.EvidenceFeeRulesDTO;
 import uk.gov.justice.laa.crime.evidence.model.common.ApiCalculateEvidenceFeeResponse;
 import uk.gov.justice.laa.crime.evidence.model.common.ApiEvidenceFee;
-import uk.gov.justice.laa.crime.evidence.staticdata.enums.EvidenceFeeLevel;
+import uk.gov.justice.laa.crime.enums.EvidenceFeeLevel;
 import uk.gov.justice.laa.crime.evidence.staticdata.enums.EvidenceFeeRules;
 
 @Slf4j

diff --git a/...ce/src/main/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeLevel.java b/...ce/src/main/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeLevel.java
diff --git a/...ce/src/main/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeRules.java b/...ce/src/main/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeRules.java
@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
+import uk.gov.justice.laa.crime.enums.EvidenceFeeLevel;
 import uk.gov.justice.laa.crime.evidence.dto.EvidenceFeeRulesDTO;
 
 import java.util.stream.Stream;

diff --git a/.../src/test/java/uk/gov/justice/laa/crime/evidence/builder/CrimeEvidenceDTOBuilderTest.java b/.../src/test/java/uk/gov/justice/laa/crime/evidence/builder/CrimeEvidenceDTOBuilderTest.java
@@ -8,7 +8,7 @@
 import uk.gov.justice.laa.crime.evidence.data.builder.TestModelDataBuilder;
 import uk.gov.justice.laa.crime.evidence.dto.CapitalEvidenceDTO;
 import uk.gov.justice.laa.crime.evidence.dto.CrimeEvidenceDTO;
-import uk.gov.justice.laa.crime.evidence.staticdata.enums.EvidenceFeeLevel;
+import uk.gov.justice.laa.crime.enums.EvidenceFeeLevel;
 
 import java.util.List;
 

diff --git a/...ce/src/test/java/uk/gov/justice/laa/crime/evidence/builder/EvidenceFeeDTOBuilderTest.java b/...ce/src/test/java/uk/gov/justice/laa/crime/evidence/builder/EvidenceFeeDTOBuilderTest.java
@@ -8,7 +8,7 @@
 import uk.gov.justice.laa.crime.evidence.data.builder.TestModelDataBuilder;
 import uk.gov.justice.laa.crime.evidence.dto.EvidenceFeeDTO;
 import uk.gov.justice.laa.crime.evidence.model.common.ApiCalculateEvidenceFeeRequest;
-import uk.gov.justice.laa.crime.evidence.staticdata.enums.EvidenceFeeLevel;
+import uk.gov.justice.laa.crime.enums.EvidenceFeeLevel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...c/test/java/uk/gov/justice/laa/crime/evidence/controller/CrimeEvidenceControllerTest.java b/...c/test/java/uk/gov/justice/laa/crime/evidence/controller/CrimeEvidenceControllerTest.java
@@ -21,7 +21,7 @@
 import uk.gov.justice.laa.crime.evidence.data.builder.TestModelDataBuilder;
 import uk.gov.justice.laa.crime.evidence.dto.CrimeEvidenceDTO;
 import uk.gov.justice.laa.crime.evidence.service.EvidenceService;
-import uk.gov.justice.laa.crime.evidence.util.RequestBuilderUtils;
+import uk.gov.justice.laa.crime.util.RequestBuilderUtils;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;

diff --git a/.../test/java/uk/gov/justice/laa/crime/evidence/controller/CrimeEvidenceIntegrationTest.java b/.../test/java/uk/gov/justice/laa/crime/evidence/controller/CrimeEvidenceIntegrationTest.java
@@ -20,7 +20,7 @@
 import uk.gov.justice.laa.crime.evidence.CrimeEvidenceApplication;
 import uk.gov.justice.laa.crime.evidence.config.CrimeEvidenceTestConfiguration;
 import uk.gov.justice.laa.crime.evidence.data.builder.TestModelDataBuilder;
-import uk.gov.justice.laa.crime.evidence.util.RequestBuilderUtils;
+import uk.gov.justice.laa.crime.util.RequestBuilderUtils;
 
 import java.util.Map;
 import java.util.UUID;

diff --git a/...ce/src/test/java/uk/gov/justice/laa/crime/evidence/data/builder/TestModelDataBuilder.java b/...ce/src/test/java/uk/gov/justice/laa/crime/evidence/data/builder/TestModelDataBuilder.java
@@ -9,7 +9,7 @@
 import uk.gov.justice.laa.crime.evidence.model.common.ApiCalculateEvidenceFeeResponse;
 import uk.gov.justice.laa.crime.evidence.model.common.ApiCapitalEvidence;
 import uk.gov.justice.laa.crime.evidence.model.common.ApiEvidenceFee;
-import uk.gov.justice.laa.crime.evidence.staticdata.enums.EvidenceFeeLevel;
+import uk.gov.justice.laa.crime.enums.EvidenceFeeLevel;
 
 import java.time.LocalDateTime;
 import java.util.List;

diff --git a/...evidence/src/test/java/uk/gov/justice/laa/crime/evidence/service/EvidenceServiceTest.java b/...evidence/src/test/java/uk/gov/justice/laa/crime/evidence/service/EvidenceServiceTest.java
@@ -12,7 +12,7 @@
 import uk.gov.justice.laa.crime.evidence.data.builder.TestModelDataBuilder;
 import uk.gov.justice.laa.crime.evidence.dto.CrimeEvidenceDTO;
 import uk.gov.justice.laa.crime.evidence.model.common.ApiCalculateEvidenceFeeResponse;
-import uk.gov.justice.laa.crime.evidence.staticdata.enums.EvidenceFeeLevel;
+import uk.gov.justice.laa.crime.enums.EvidenceFeeLevel;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.anyInt;

diff --git a/...rc/test/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeLevelTest.java b/...rc/test/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeLevelTest.java
diff --git a/...rc/test/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeRulesTest.java b/...rc/test/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/EvidenceFeeRulesTest.java
@@ -1,6 +1,7 @@
 package uk.gov.justice.laa.crime.evidence.staticdata.enums;
 
 import org.junit.jupiter.api.Test;
+import uk.gov.justice.laa.crime.enums.EvidenceFeeLevel;
 import uk.gov.justice.laa.crime.evidence.dto.EvidenceFeeRulesDTO;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;

diff --git a/crime-evidence/src/test/java/uk/gov/justice/laa/crime/evidence/util/RequestBuilderUtils.java b/crime-evidence/src/test/java/uk/gov/justice/laa/crime/evidence/util/RequestBuilderUtils.java