diff --git a/.gitignore b/.gitignore index 64dec529..3b00a25f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,7 @@ buildContexts.sh lightning-jenkins.properties **/.DS_Store +# OpenJPA bytecode enhancement artifacts (extracted from JAR by Maven enhance goal) +/META-INF/ +/org/ + diff --git a/jboss-deployment-structure.xml b/jboss-deployment-structure.xml new file mode 100644 index 00000000..bdbbd58b --- /dev/null +++ b/jboss-deployment-structure.xml @@ -0,0 +1,6 @@ + + + + diff --git a/pom.xml b/pom.xml index 50390333..33d7118d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.3 + 21.0.0-SNAPSHOT uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-parent - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT pom Prosecution Casefile Microservice - Parent Casefile Microservice - Prosecution Context @@ -23,26 +23,25 @@ file://${project.build.directory}/site true 0.1.49 - 17.103.12 + 21.0.0-SNAPSHOT 2.0.335 - 3.1.3 17.103.131 17.0.38 - 0.0.3 + 0.0.4-SNAPSHOT 17.0.37 - 17.0.246 + 17.0.249 17.0.85 ${coredomain.version} 17.0.24 1.10.0 1.7.0 17.103.166 - 2.4.8 - 1.12.19 + 2.4.9 + 1.18.8 0.3.1 17.0.70 6.4.5 - 2.4.8 + 2.4.9 7.0.0 **/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/**/* @@ -57,17 +56,11 @@ **/uk/gov/moj/cps/prosecutioncasefile/command/handler/**/* **/uk/gov/moj/cpp/cps/prosecutioncasefile/command/handler/staging/**/* **/uk/gov/moj/cps/prosecutioncasefile/domain/event/**/* - **/uk/gov/moj/cpp/prosecution/casefile/event/**/* - - uk.gov.moj.cpp.common - system-users-library - ${system.users.library.version} - uk.gov.moj.cpp.system.enterpriseid system-enterprise-id @@ -110,17 +103,6 @@ stream-transformation-tool-api ${stream-transformation-tool.version} - - uk.gov.justice - stream-transformation-tool-api - ${stream-transformation-tool.version} - - - uk.gov.moj.cpp.core.domain - common-core-domain - ${coredomain.version} - compile - com.jayway.awaitility awaitility diff --git a/prosecutioncasefile-command/pom.xml b/prosecutioncasefile-command/pom.xml index e68f97f1..95807579 100755 --- a/prosecutioncasefile-command/pom.xml +++ b/prosecutioncasefile-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-parent - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/pom.xml b/prosecutioncasefile-command/prosecutioncasefile-command-api/pom.xml index c44abf20..04e81f30 100755 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/pom.xml +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-command - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -17,8 +17,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -95,6 +95,11 @@ junit-jupiter-params test + + org.slf4j + slf4j-simple + test + @@ -170,8 +175,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApi.java index 2bf37500..9f9ba090 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApi.java @@ -18,12 +18,12 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class AddMaterialApi { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApi.java index ca81b3e3..1ea920c9 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApi.java @@ -50,7 +50,7 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; @SuppressWarnings({"java:S126", "java:S1541"}) @ServiceComponent(COMMAND_API) diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApi.java index 2e69bd02..3a03adc0 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApi.java @@ -37,7 +37,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApi.java index 5e39a73a..7cde308f 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApi.java @@ -36,8 +36,8 @@ import java.util.List; import java.util.UUID; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class InitiateSjpProsecutionApi { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApi.java index 17283368..20bcd357 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApi.java @@ -2,7 +2,7 @@ import static java.util.Arrays.asList; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; @@ -28,10 +28,10 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class PleadOnlineApi { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/ResolveErrorsApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/ResolveErrorsApi.java index 1cdfa5a7..56ec35a7 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/ResolveErrorsApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/ResolveErrorsApi.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.Metadata; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class ResolveErrorsApi { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SjpProsecutionUpdateOffenceCodeApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SjpProsecutionUpdateOffenceCodeApi.java index 669ffc6a..2fd579ec 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SjpProsecutionUpdateOffenceCodeApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SjpProsecutionUpdateOffenceCodeApi.java @@ -15,9 +15,9 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import com.google.common.collect.Lists; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApi.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApi.java index c1a9aa48..aa6f30f6 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApi.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApi.java @@ -5,7 +5,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; @@ -38,8 +38,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/AddressService.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/AddressService.java index 9c2b7709..769e5805 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/AddressService.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/AddressService.java @@ -5,8 +5,8 @@ import static org.apache.commons.lang3.StringUtils.SPACE; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class AddressService { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/CaseDetailsEnrichmentService.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/CaseDetailsEnrichmentService.java index ee4ee817..71fcd123 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/CaseDetailsEnrichmentService.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/CaseDetailsEnrichmentService.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class CaseDetailsEnrichmentService { @Inject diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/IdGenerationService.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/IdGenerationService.java index 0ca58a19..5a0e269c 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/IdGenerationService.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/service/IdGenerationService.java @@ -16,7 +16,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.text.RandomStringGenerator; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidator.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidator.java index 40367db1..48d5e16f 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidator.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidator.java @@ -7,7 +7,6 @@ import static java.util.Collections.singletonMap; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static org.drools.core.util.StringUtils.isEmpty; import static uk.gov.moj.cpp.prosecution.casefile.plea.json.schemas.CaseStatus.COMPLETED; import static uk.gov.moj.cpp.prosecution.casefile.plea.json.schemas.CaseStatus.REFERRED_FOR_COURT_HEARING; @@ -26,7 +25,7 @@ import java.util.Set; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class PleadOnlineValidator { @@ -69,7 +68,7 @@ private static boolean hasEmptyFinancialMeans(final FinancialMeans financialMean return financialMeans == null || financialMeans.getBenefits() == null || financialMeans.getIncome() == null || - isEmpty(financialMeans.getEmploymentStatus()); + (financialMeans.getEmploymentStatus() == null || financialMeans.getEmploymentStatus().isEmpty()); } private static boolean hasEmptyLegalEntityFinancialMeans(final LegalEntityFinancialMeans financialMeans) { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/resources/META-INF/beans.xml index ce2829b7..be799004 100755 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApiTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApiTest.java index 2f5ad0ad..da7c97a3 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApiTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/AddMaterialApiTest.java @@ -6,8 +6,8 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -40,8 +40,8 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApiTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApiTest.java index 6ecf31f4..1bd828b7 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApiTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateCCProsecutionApiTest.java @@ -76,7 +76,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Disabled; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApiTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApiTest.java index a7658297..a393458d 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApiTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateGroupProsecutionApiTest.java @@ -30,7 +30,7 @@ import java.util.UUID; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import com.fasterxml.jackson.databind.ObjectMapper; import org.mockito.ArgumentCaptor; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApiTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApiTest.java index ce153d46..e9bfa100 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApiTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/InitiateSjpProsecutionApiTest.java @@ -40,8 +40,8 @@ import java.util.List; import java.util.UUID; -import javax.enterprise.inject.Instance; -import javax.json.JsonObject; +import jakarta.enterprise.inject.Instance; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApiTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApiTest.java index d0bce58f..784a8429 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApiTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/PleadOnlineApiTest.java @@ -2,7 +2,7 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; @@ -30,7 +30,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApiTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApiTest.java index 4cec407a..2cb622e0 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApiTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/SubmitCCApplicationApiTest.java @@ -51,7 +51,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidatorTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidatorTest.java index f03f4b11..ce02cfe2 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidatorTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/api/validator/PleadOnlineValidatorTest.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.mockito.InjectMocks; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/pom.xml b/prosecutioncasefile-command/prosecutioncasefile-command-handler/pom.xml index 5611275f..dc68ae71 100755 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/pom.xml +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-command - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -18,8 +18,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -28,8 +28,8 @@ provided - javax.json - javax.json-api + jakarta.json + jakarta.json-api provided @@ -193,8 +193,8 @@ ${coredomain.version} - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} @@ -216,8 +216,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AbstractCommandHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AbstractCommandHandler.java index 70379b53..c73d9a2f 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AbstractCommandHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AbstractCommandHandler.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.command.handler; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.core.enveloper.Enveloper.toEnvelopeWithMetadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandler.java index dd01f083..39ea6946 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandler.java @@ -45,9 +45,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; @SuppressWarnings({"squid:S134"}) @ServiceComponent(COMMAND_HANDLER) diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptGroupCaseHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptGroupCaseHandler.java index b8acab05..80341dba 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptGroupCaseHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptGroupCaseHandler.java @@ -17,8 +17,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddDefendantIdpcHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddDefendantIdpcHandler.java index 85a0aec2..6faf4e4a 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddDefendantIdpcHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddDefendantIdpcHandler.java @@ -21,8 +21,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandler.java index a229a3f3..7b6f42a6 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandler.java @@ -11,7 +11,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import uk.gov.justice.core.courts.AddCaseCourtDocument; import uk.gov.justice.core.courts.AddApplicationCourtDocument; import uk.gov.justice.core.courts.CaseDocument; @@ -41,8 +41,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import uk.gov.moj.cps.prosecutioncasefile.domain.event.MaterialAddedV2; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseCpsServeMaterialHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseCpsServeMaterialHandler.java index 4ab97065..5b31b717 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseCpsServeMaterialHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseCpsServeMaterialHandler.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class BaseCpsServeMaterialHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseProsecutionCaseFileHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseProsecutionCaseFileHandler.java index 5c6316d7..fb1daf44 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseProsecutionCaseFileHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/BaseProsecutionCaseFileHandler.java @@ -15,8 +15,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonValue; public class BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandler.java index 713c7b17..41fd2f7e 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandler.java @@ -12,8 +12,8 @@ import uk.gov.moj.cpp.prosecution.casefile.refdata.proscase.CaseRefDataEnricher; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class CcProsecutionHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandler.java index c68ae02e..18182b1f 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandler.java @@ -4,9 +4,9 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.UUID.nameUUIDFromBytes; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; -import static javax.json.JsonValue.NULL; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.core.enveloper.Enveloper.toEnvelopeWithMetadataFrom; import static uk.gov.moj.cpp.prosecution.casefile.validation.rules.forms.FormConstant.CPS_DEFENDANT_ID; @@ -45,11 +45,11 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/EjectCaseHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/EjectCaseHandler.java index de0c2255..c0e37310 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/EjectCaseHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/EjectCaseHandler.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cps.prosecutioncasefile.command.handler.EjectCase; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class EjectCaseHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpireBulkScanPendingMaterialHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpireBulkScanPendingMaterialHandler.java index bec91e26..f8a15a11 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpireBulkScanPendingMaterialHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpireBulkScanPendingMaterialHandler.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cps.prosecutioncasefile.command.handler.ExpireBulkScanPendingMaterial; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class ExpireBulkScanPendingMaterialHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingIdpcMaterialHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingIdpcMaterialHandler.java index 95179919..37d722ad 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingIdpcMaterialHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingIdpcMaterialHandler.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cps.prosecutioncasefile.command.handler.ExpirePendingIdpcMaterial; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class ExpirePendingIdpcMaterialHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingMaterialHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingMaterialHandler.java index 25552131..ae2996c0 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingMaterialHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ExpirePendingMaterialHandler.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cps.prosecutioncasefile.command.handler.ExpirePendingMaterial; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class ExpirePendingMaterialHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/GroupProsecutionHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/GroupProsecutionHandler.java index 46695038..5902e54a 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/GroupProsecutionHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/GroupProsecutionHandler.java @@ -22,9 +22,9 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.json.JsonValue; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PleadOnlineHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PleadOnlineHandler.java index 042bc05e..f5887fd8 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PleadOnlineHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PleadOnlineHandler.java @@ -11,8 +11,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class PleadOnlineHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PocaApplicationUpdateHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PocaApplicationUpdateHandler.java index 92574049..2fd26e69 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PocaApplicationUpdateHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/PocaApplicationUpdateHandler.java @@ -12,7 +12,7 @@ import uk.gov.moj.cpp.prosecution.casefile.aggregate.ApplicationAggregate; import uk.gov.moj.cps.prosecutioncasefile.command.handler.PocaCourtApplication; -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.nonNull; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandler.java index d679824b..9eb7276b 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandler.java @@ -22,8 +22,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandler.java index a71b542a..ac586e7c 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandler.java @@ -16,9 +16,9 @@ import java.util.UUID; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_HANDLER) public class ResolveErrorsHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandler.java index 37c09338..6d05bbd4 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandler.java @@ -15,8 +15,8 @@ import uk.gov.moj.cps.prosecutioncasefile.command.handler.AssociateEnterpriseId; import uk.gov.moj.cps.prosecutioncasefile.command.handler.UnassignCase; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class SjpProsecutionHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionUpdateOffenceCodeHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionUpdateOffenceCodeHandler.java index a2507ddb..bd528b9f 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionUpdateOffenceCodeHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionUpdateOffenceCodeHandler.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cps.prosecutioncasefile.command.handler.SjpProsecutionUpdateOffenceCode; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class SjpProsecutionUpdateOffenceCodeHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandler.java index 50a51465..83588be3 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandler.java @@ -53,7 +53,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandler.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandler.java index ba754659..bbfc3386 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandler.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandler.java @@ -30,9 +30,9 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.json.JsonValue; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.json.JsonValue; @ServiceComponent(COMMAND_HANDLER) public class SummonsApplicationHandler extends BaseProsecutionCaseFileHandler { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/service/ProsecutionCaseQueryService.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/service/ProsecutionCaseQueryService.java index 6b2aff26..c03cca15 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/service/ProsecutionCaseQueryService.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/java/uk/gov/moj/cpp/prosecution/casefile/command/service/ProsecutionCaseQueryService.java @@ -9,11 +9,11 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100755 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ProsecutionCaseQueryServiceTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ProsecutionCaseQueryServiceTest.java index 2a4edb81..0f5e4e25 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ProsecutionCaseQueryServiceTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ProsecutionCaseQueryServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -20,7 +20,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.mockito.InjectMocks; import org.mockito.Mock; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandlerTest.java index 1913d705..e5387a59 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AcceptCaseHandlerTest.java @@ -81,9 +81,9 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddIdpcMaterialHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddIdpcMaterialHandlerTest.java index 25e659ef..3d6539f7 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddIdpcMaterialHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddIdpcMaterialHandlerTest.java @@ -64,8 +64,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; -import javax.json.JsonObject; +import jakarta.enterprise.inject.Instance; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandlerTest.java index 301d5c47..46ec2708 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/AddMaterialHandlerTest.java @@ -73,7 +73,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandlerTest.java index 67088048..59404274 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CcProsecutionHandlerTest.java @@ -32,7 +32,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandlerTest.java index 8b99a3e1..f89ed62e 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/CpsServeMaterialHandlerTest.java @@ -41,9 +41,9 @@ import uk.gov.moj.cps.prosecutioncasefile.command.handler.staging.ProcessReceivedCpsUpdateCotr; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SubmissionStatus; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/DefendantChangedHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/DefendantChangedHandlerTest.java index 2c6768a4..831a8040 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/DefendantChangedHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/DefendantChangedHandlerTest.java @@ -39,7 +39,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordDecisionToReferCaseForCourtHearingSavedHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordDecisionToReferCaseForCourtHearingSavedHandlerTest.java index e87e3939..3c438d35 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordDecisionToReferCaseForCourtHearingSavedHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordDecisionToReferCaseForCourtHearingSavedHandlerTest.java @@ -25,7 +25,7 @@ import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordGroupIdForSummonsApplicationHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordGroupIdForSummonsApplicationHandlerTest.java index cdb658ea..900b857e 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordGroupIdForSummonsApplicationHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordGroupIdForSummonsApplicationHandlerTest.java @@ -22,7 +22,7 @@ import java.util.UUID; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordReferProsecutionCasesToCourtAcceptedHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordReferProsecutionCasesToCourtAcceptedHandlerTest.java index add8975e..4e00b0d5 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordReferProsecutionCasesToCourtAcceptedHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordReferProsecutionCasesToCourtAcceptedHandlerTest.java @@ -25,7 +25,7 @@ import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordUploadCaseDocumentHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordUploadCaseDocumentHandlerTest.java index bbe49202..36c721e8 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordUploadCaseDocumentHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RecordUploadCaseDocumentHandlerTest.java @@ -28,7 +28,7 @@ import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandlerTest.java index e0ca18c6..79f30612 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/RejectGroupCaseHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.command.handler; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandlerTest.java index 76d6f6f9..e50e48f9 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/ResolveErrorsHandlerTest.java @@ -27,8 +27,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; -import javax.json.JsonObject; +import jakarta.enterprise.inject.Instance; +import jakarta.json.JsonObject; import org.mockito.InjectMocks; import org.mockito.Mock; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandlerTest.java index 0dce7d2d..d464bee5 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SjpProsecutionHandlerTest.java @@ -45,8 +45,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; -import javax.json.JsonValue; +import jakarta.enterprise.inject.Instance; +import jakarta.json.JsonValue; import org.apache.commons.collections.iterators.ArrayListIterator; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandlerTest.java index 50013273..f58ad85f 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SubmitApplicationHandlerTest.java @@ -63,9 +63,9 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.IOUtils; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandlerTest.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandlerTest.java index 5f245a95..7d261e89 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandlerTest.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/SummonsApplicationHandlerTest.java @@ -45,7 +45,7 @@ import java.util.UUID; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/builder/AddDefendantIdpcCommandBuilder.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/builder/AddDefendantIdpcCommandBuilder.java index 424ffa80..e04bd5b5 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/builder/AddDefendantIdpcCommandBuilder.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/command/handler/builder/AddDefendantIdpcCommandBuilder.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.command.handler.builder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; import static uk.gov.moj.cpp.prosecution.casefile.command.handler.util.DefaultTestData.CASE_DOCUMENT_ID; import static uk.gov.moj.cpp.prosecution.casefile.command.handler.util.DefaultTestData.CASE_DOCUMENT_MATERIAL_ID; @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; public class AddDefendantIdpcCommandBuilder { diff --git a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/test/utils/HandlerTestHelper.java b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/test/utils/HandlerTestHelper.java index acb8c8bb..58ce80b6 100644 --- a/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/test/utils/HandlerTestHelper.java +++ b/prosecutioncasefile-command/prosecutioncasefile-command-handler/src/test/java/uk/gov/moj/cpp/prosecution/casefile/test/utils/HandlerTestHelper.java @@ -18,8 +18,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/prosecutioncasefile-common/pom.xml b/prosecutioncasefile-common/pom.xml index 56a887ca..341d4063 100644 --- a/prosecutioncasefile-common/pom.xml +++ b/prosecutioncasefile-common/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -16,8 +16,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/prosecutioncasefile-datatypes-common/pom.xml b/prosecutioncasefile-datatypes-common/pom.xml index 5631e584..fe47bafe 100644 --- a/prosecutioncasefile-datatypes-common/pom.xml +++ b/prosecutioncasefile-datatypes-common/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-parent - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 diff --git a/prosecutioncasefile-defence-service/pom.xml b/prosecutioncasefile-defence-service/pom.xml index 94739c7a..258e6e0d 100644 --- a/prosecutioncasefile-defence-service/pom.xml +++ b/prosecutioncasefile-defence-service/pom.xml @@ -3,15 +3,15 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 prosecutioncasefile-defence-service - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceService.java b/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceService.java index abc0ad05..ed0bd35b 100644 --- a/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceService.java +++ b/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceService.java @@ -2,7 +2,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface DefenceService { diff --git a/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceServiceImpl.java b/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceServiceImpl.java index 6f90f640..c3d44f1d 100644 --- a/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceServiceImpl.java +++ b/prosecutioncasefile-defence-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/DefenceServiceImpl.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; @@ -12,8 +12,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class DefenceServiceImpl implements DefenceService { diff --git a/prosecutioncasefile-defence-service/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-defence-service/src/main/resources/META-INF/beans.xml index ce2829b7..be799004 100644 --- a/prosecutioncasefile-defence-service/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-defence-service/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/prosecutioncasefile-domain/pom.xml b/prosecutioncasefile-domain/pom.xml index 3862a018..65963664 100755 --- a/prosecutioncasefile-domain/pom.xml +++ b/prosecutioncasefile-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-parent - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT prosecutioncasefile-domain diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/pom.xml b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/pom.xml index 59ec7889..a3fb0dc0 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/pom.xml +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-domain - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT prosecutioncasefile-domain-aggregate @@ -38,8 +38,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -103,7 +103,8 @@ org.glassfish - javax.json + jakarta.json + 2.0.1 test diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregate.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregate.java index 42eced08..807180b4 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregate.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregate.java @@ -11,8 +11,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Stream.of; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.justice.domain.aggregate.matcher.EventSwitcher.match; import static uk.gov.justice.domain.aggregate.matcher.EventSwitcher.otherwiseDoNothing; @@ -156,12 +156,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonString; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFile.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFile.java index 9e46150e..8b46eef0 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFile.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/main/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFile.java @@ -17,7 +17,7 @@ import static java.util.stream.Collectors.toSet; import static java.util.stream.Stream.builder; import static java.util.stream.Stream.of; -import static javax.json.Json.createArrayBuilder; +import static jakarta.json.Json.createArrayBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.collections.ListUtils.union; @@ -169,12 +169,12 @@ import java.util.stream.Stream; import java.util.stream.Stream.Builder; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; import com.google.common.collect.ImmutableList; import com.google.gson.JsonParser; @@ -1266,8 +1266,11 @@ public Object apply(final Object event) { } }), when(CaseDetailsUpdated.class).apply(e -> { + final CaseDetails base = this.caseDetails != null + ? this.caseDetails + : CaseDetails.caseDetails().withCaseId(UUID.fromString(e.getCaseId())).build(); CaseDetails updatedCaseDetails = CaseDetails.caseDetails() - .withValuesFrom(this.caseDetails) + .withValuesFrom(base) .withFeeStatus(e.getFeeStatus()) .withContestedFeeStatus(e.getContestedFeeStatus()) .withContestedFeePaymentReference(e.getContestedPaymentReference()) diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ReferenceDataQueryServiceStubImpl.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ReferenceDataQueryServiceStubImpl.java index f5382f16..a77ef71b 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ReferenceDataQueryServiceStubImpl.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/ReferenceDataQueryServiceStubImpl.java @@ -40,7 +40,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; public class ReferenceDataQueryServiceStubImpl implements ReferenceDataQueryService { @Override diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregateTest.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregateTest.java index 02236fe3..0814e74e 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregateTest.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/CpsServeMaterialAggregateTest.java @@ -58,7 +58,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFileTest.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFileTest.java index 161bc4b1..adf6c949 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFileTest.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cpp/prosecution/casefile/aggregate/ProsecutionCaseFileTest.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileErrorCorrectionTest.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileErrorCorrectionTest.java index feea3d5e..fd70f046 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileErrorCorrectionTest.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileErrorCorrectionTest.java @@ -3,8 +3,8 @@ import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsInstanceOf.instanceOf; @@ -84,14 +84,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; -import org.junit.Rule; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -114,8 +112,6 @@ public class ProsecutionCaseFileErrorCorrectionTest { private static final LocalDate OFFENCE_CHARGE_DATE_IN_FUTURE = LocalDate.now().plusMonths(4); private static final LocalDate OFFENCE_ARREST_DATE_IN_FUTURE = LocalDate.now().plusMonths(4); private static final UUID OFFENCE_ID = randomUUID(); - @Rule - public ExpectedException thrown = ExpectedException.none(); @Mock private ReferenceDataQueryService referenceDataQueryService; private List caseRefDataEnrichers; diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileTest.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileTest.java index 209b1668..6c86fb79 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileTest.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-aggregate/src/test/java/uk/gov/moj/cps/prosecutioncasefile/ProsecutionCaseFileTest.java @@ -14,8 +14,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; @@ -159,7 +159,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-event-processor/pom.xml b/prosecutioncasefile-domain/prosecutioncasefile-domain-event-processor/pom.xml index 706b61ee..5f3fa2c0 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-event-processor/pom.xml +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-event-processor/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-domain uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/pom.xml b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/pom.xml index 1caebebe..e2c0a8a7 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/pom.xml +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-domain - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT prosecutioncasefile-domain-event @@ -21,8 +21,8 @@ ${project.version} - javax.json - javax.json-api + jakarta.json + jakarta.json-api provided diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/FormValidationResult.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/FormValidationResult.java index af7f3bc0..b110c835 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/FormValidationResult.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/FormValidationResult.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.collections.CollectionUtils; diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/GroupProsecutionList.java b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/GroupProsecutionList.java index 341d6639..b933daeb 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/GroupProsecutionList.java +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/java/uk/gov/moj/cpp/prosecution/casefile/domain/GroupProsecutionList.java @@ -14,6 +14,9 @@ public class GroupProsecutionList { private Channel channel; + public GroupProsecutionList() { + } + public GroupProsecutionList(final List groupProsecutionWithReferenceDataList) { if(groupProsecutionWithReferenceDataList != null) { this.groupProsecutionWithReferenceDataList = Collections.synchronizedList(groupProsecutionWithReferenceDataList); diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-event/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-domain/prosecutioncasefile-domain-value-schema/pom.xml b/prosecutioncasefile-domain/prosecutioncasefile-domain-value-schema/pom.xml index d45c452d..f33485d5 100644 --- a/prosecutioncasefile-domain/prosecutioncasefile-domain-value-schema/pom.xml +++ b/prosecutioncasefile-domain/prosecutioncasefile-domain-value-schema/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-domain uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 diff --git a/prosecutioncasefile-event-sources/pom.xml b/prosecutioncasefile-event-sources/pom.xml index d60fd7ed..a68ed982 100644 --- a/prosecutioncasefile-event-sources/pom.xml +++ b/prosecutioncasefile-event-sources/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 diff --git a/prosecutioncasefile-event/pom.xml b/prosecutioncasefile-event/pom.xml index c9fb1c31..c7cfb1a9 100755 --- a/prosecutioncasefile-event/pom.xml +++ b/prosecutioncasefile-event/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/pom.xml b/prosecutioncasefile-event/prosecutioncasefile-event-listener/pom.xml index 4c3e404c..07a801d9 100755 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/pom.xml +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-event - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -17,8 +17,18 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api + provided + + + org.hibernate.orm + hibernate-core + provided + + + org.jboss.ejb3 + jboss-ejb3-ext-api provided @@ -55,11 +65,26 @@ criminal-court-public-model ${coredomain.version} + + jakarta.json + jakarta.json-api + test + + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/ProsecutionCaseFileSchemaContractValidationTest.java + + + org.apache.maven.plugins diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantChangedListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantChangedListener.java index 977f2bc4..1a554462 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantChangedListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantChangedListener.java @@ -16,7 +16,7 @@ import uk.gov.moj.cpp.prosecutioncasefile.persistence.repository.DefendantRepository; import uk.gov.moj.cps.prosecutioncasefile.domain.event.CaseDefendantChanged; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class DefendantChangedListener { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantIdpcAddedListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantIdpcAddedListener.java index 2f75e74c..9d84578e 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantIdpcAddedListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/DefendantIdpcAddedListener.java @@ -11,7 +11,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class DefendantIdpcAddedListener { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListener.java index 576a6b6a..49aab81b 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListener.java @@ -52,8 +52,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedWithWarningListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedWithWarningListener.java index 09fd7aaf..54ce0f74 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedWithWarningListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedWithWarningListener.java @@ -11,7 +11,7 @@ import uk.gov.moj.cpp.prosecutioncasefile.persistence.repository.BusinessValidationErrorRepository; import uk.gov.moj.cpp.prosecutioncasefile.persistence.repository.CaseDetailsRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Objects; import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedListener.java index 45eec2e9..a77a16d3 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedListener.java @@ -13,7 +13,7 @@ import uk.gov.moj.cpp.prosecutioncasefile.persistence.repository.DefendantRepository; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SjpProsecutionReceived; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class SjpProsecutionReceivedListener { @@ -42,7 +42,7 @@ public void prosecutionReceived(final Envelope envelope) businessValidationErrorCaseDetailsRepository.deleteByCaseId(caseDetails.getCaseId()); final CaseDetails existingCase = caseDetailsRepository.findBy(caseDetails.getCaseId()); - // Deltaspike bug - It can't update existing child records + // Remove existing case and children before re-saving to avoid stale child record conflicts if (existingCase != null){ existingCase.getDefendants().stream().forEach(defendant -> defendantRepository.remove(defendant)); caseDetailsRepository.remove(existingCase); diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedWithWarningsListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedWithWarningsListener.java index d929a182..91f13f06 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedWithWarningsListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionReceivedWithWarningsListener.java @@ -12,7 +12,7 @@ import uk.gov.moj.cpp.prosecutioncasefile.persistence.repository.CaseDetailsRepository; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SjpProsecutionReceivedWithWarnings; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class SjpProsecutionReceivedWithWarningsListener { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionUpdateOffenceCodeListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionUpdateOffenceCodeListener.java index a8644bda..fc10097a 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionUpdateOffenceCodeListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SjpProsecutionUpdateOffenceCodeListener.java @@ -12,7 +12,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class SjpProsecutionUpdateOffenceCodeListener { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SummonsApplicationApprovalListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SummonsApplicationApprovalListener.java index 19b801ac..f4d81ade 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SummonsApplicationApprovalListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/SummonsApplicationApprovalListener.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class SummonsApplicationApprovalListener { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetails.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetails.java index 6ce7ac90..85350222 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetails.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetails.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; @SuppressWarnings({"pmd:NullAssignment"}) public class DefendantToDefendantDetails implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/OffenceToOffenceDetails.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/OffenceToOffenceDetails.java index 52279e31..509f0104 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/OffenceToOffenceDetails.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/OffenceToOffenceDetails.java @@ -9,7 +9,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class OffenceToOffenceDetails implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/PersonalInformationToPersonalInformationDetails.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/PersonalInformationToPersonalInformationDetails.java index d519f831..ccb56349 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/PersonalInformationToPersonalInformationDetails.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/PersonalInformationToPersonalInformationDetails.java @@ -4,7 +4,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.PersonalInformation; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails; -import javax.inject.Inject; +import jakarta.inject.Inject; public class PersonalInformationToPersonalInformationDetails implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCase.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCase.java index 8114983b..d952c613 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCase.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCase.java @@ -8,7 +8,7 @@ import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CivilFees; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Set; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCase.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCase.java index 334a9f92..9da7ceb6 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCase.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCase.java @@ -10,7 +10,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionReceivedWithWarningsToCase implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100755 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListenerTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListenerTest.java index 4b062acf..5fdf0f68 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListenerTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/ProsecutionReceivedListenerTest.java @@ -5,8 +5,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; @@ -89,8 +89,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; @ExtendWith(MockitoExtension.class) public class ProsecutionReceivedListenerTest { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetailsTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetailsTest.java index d039728b..2325ac86 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetailsTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/DefendantToDefendantDetailsTest.java @@ -3,8 +3,11 @@ import static uk.gov.moj.cpp.prosecution.casefile.event.listener.converter.TestDataProvider.createCorporateDefendant; import static uk.gov.moj.cpp.prosecution.casefile.event.listener.converter.TestDataProvider.createDefendant; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; + import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -21,7 +24,6 @@ public class DefendantToDefendantDetailsTest extends ConverterBaseTest { private SelfDefinedInformationToSelfDefinedInformationDetails selfDefinedInformationToSelfDefinedInformationDetails; @Spy - @InjectMocks private PersonalInformationToPersonalInformationDetails personalInformationToPersonalInformationDetails; @Spy @@ -33,6 +35,12 @@ public class DefendantToDefendantDetailsTest extends ConverterBaseTest { @Spy private ContactDetailsToContactDetailsEntity contactDetailsToContactDetailsEntity; + @BeforeEach + void setup() { + setField(personalInformationToPersonalInformationDetails, "addressToAddressDetails", addressToAddressDetails); + setField(personalInformationToPersonalInformationDetails, "contactDetailsToContactDetailsDetails", contactDetailsToContactDetailsEntity); + } + @Test public void testConvertDefendantToDefendantDetails() { final DefendantDetails defendantDetails = converter.convert(createDefendant()); diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCaseTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCaseTest.java index e100ce4a..86c9bd38 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCaseTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedToCaseTest.java @@ -2,13 +2,16 @@ import static java.util.UUID.randomUUID; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import static uk.gov.moj.cpp.prosecution.casefile.event.listener.converter.TestDataProvider.createProsecution; import static uk.gov.moj.cpp.prosecution.casefile.event.listener.converter.TestDataProvider.createProsecutionWithLanguage; +import uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.Language; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CaseDetails; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SjpProsecutionReceived; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -22,18 +25,15 @@ public class ProsecutionReceivedToCaseTest extends ConverterBaseTest{ private ProsecutionReceivedToCase converter; @Spy - @InjectMocks private DefendantToDefendantDetails defendantToDefendantDetail; @Spy private OffenceToOffenceDetails offenceToOffenceDetails; @Spy - @InjectMocks private CaseDetailsToCivilFees caseDetailsToCivilFees; @Spy - @InjectMocks private PersonalInformationToPersonalInformationDetails personalInformationToPersonalInformationDetails; @Spy @@ -45,6 +45,16 @@ public class ProsecutionReceivedToCaseTest extends ConverterBaseTest{ @Spy private ContactDetailsToContactDetailsEntity contactDetailsToContactDetailsEntity; + @BeforeEach + void setup() { + setField(personalInformationToPersonalInformationDetails, "addressToAddressDetails", addressToAddressDetails); + setField(personalInformationToPersonalInformationDetails, "contactDetailsToContactDetailsDetails", contactDetailsToContactDetailsEntity); + setField(defendantToDefendantDetail, "personalInformationToPersonalInformationDetails", personalInformationToPersonalInformationDetails); + setField(defendantToDefendantDetail, "selfDefinedInformationToSelfDefinedInformationDetails", selfDefinedInformationToSelfDefinedInformationDetails); + setField(defendantToDefendantDetail, "offenceToOffenceDetails", offenceToOffenceDetails); + setField(defendantToDefendantDetail, "addressToAddressDetails", addressToAddressDetails); + } + @Test public void testConvertSelfDefinedInformationToSelfDefinedInformationDetails() { final SjpProsecutionReceived prosecutionReceived = new SjpProsecutionReceived(randomUUID(), createProsecution()); diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCaseTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCaseTest.java index 42f5ed43..e56e4a0b 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCaseTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/ProsecutionReceivedWithWarningsToCaseTest.java @@ -4,9 +4,12 @@ import static java.util.UUID.randomUUID; import static uk.gov.moj.cpp.prosecution.casefile.event.listener.converter.TestDataProvider.createProsecution; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; + import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CaseDetails; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SjpProsecutionReceivedWithWarnings; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -20,18 +23,15 @@ public class ProsecutionReceivedWithWarningsToCaseTest extends ConverterBaseTest private ProsecutionReceivedWithWarningsToCase converter; @Spy - @InjectMocks private DefendantToDefendantDetails defendantToDefendantDetail; @Spy - @InjectMocks private CaseDetailsToCivilFees caseDetailsToCivilFees; @Spy private OffenceToOffenceDetails offenceToOffenceDetails; @Spy - @InjectMocks private PersonalInformationToPersonalInformationDetails personalInformationToPersonalInformationDetails; @Spy @@ -43,6 +43,16 @@ public class ProsecutionReceivedWithWarningsToCaseTest extends ConverterBaseTest @Spy private ContactDetailsToContactDetailsEntity contactDetailsToContactDetailsEntity; + @BeforeEach + void setup() { + setField(personalInformationToPersonalInformationDetails, "addressToAddressDetails", addressToAddressDetails); + setField(personalInformationToPersonalInformationDetails, "contactDetailsToContactDetailsDetails", contactDetailsToContactDetailsEntity); + setField(defendantToDefendantDetail, "personalInformationToPersonalInformationDetails", personalInformationToPersonalInformationDetails); + setField(defendantToDefendantDetail, "selfDefinedInformationToSelfDefinedInformationDetails", selfDefinedInformationToSelfDefinedInformationDetails); + setField(defendantToDefendantDetail, "offenceToOffenceDetails", offenceToOffenceDetails); + setField(defendantToDefendantDetail, "addressToAddressDetails", addressToAddressDetails); + } + @Test public void testConvertSelfDefinedInformationToSelfDefinedInformationDetails() { final SjpProsecutionReceivedWithWarnings prosecutionReceived = new SjpProsecutionReceivedWithWarnings(randomUUID(), createProsecution(), emptyList()); diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/pom.xml b/prosecutioncasefile-event/prosecutioncasefile-event-processor/pom.xml index af4c815b..7b7104fa 100755 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/pom.xml +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-event - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -19,8 +19,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -105,21 +105,11 @@ test - - - org.junit.vintage - junit-vintage-engine - test - org.mockito mockito-core test - uk.gov.justice.services @@ -157,8 +147,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} @@ -169,8 +159,8 @@ rest-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessor.java index 4c907b0c..9d266e8b 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; @@ -21,8 +21,8 @@ import uk.gov.moj.cps.prosecutioncasefile.domain.event.SubmitApplicationAccepted; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SubmitApplicationValidationFailed; -import javax.inject.Inject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObjectBuilder; import java.util.UUID; @ServiceComponent(EVENT_PROCESSOR) @@ -90,7 +90,9 @@ private void sendValidationFailedEmailNotification(final Envelope envelope, fina notifyObjectBuilder.add(SENDER_ADDRESS, payload.getSenderEmail()); final JsonObjectBuilder personalisationObjectBuilder = createObjectBuilder(); - personalisationObjectBuilder.add(SUBJECT, payload.getEmailSubject()); + if (nonNull(payload.getEmailSubject())) { + personalisationObjectBuilder.add(SUBJECT, payload.getEmailSubject()); + } notifyObjectBuilder.add(PERSONALISATION, personalisationObjectBuilder.build()); final Metadata metadata = Envelope.metadataFrom(envelope.metadata()).withName(NOTIFICATION_NOTIFY_SEND_EMAIL_NOTIFICATION).build(); diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseCreatedEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseCreatedEventProcessor.java index c026263a..5ed56285 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseCreatedEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseCreatedEventProcessor.java @@ -18,7 +18,7 @@ import uk.gov.moj.cps.prosecutioncasefile.domain.event.ProsecutionSubmissionSucceeded; import uk.gov.moj.cps.prosecutioncasefile.domain.event.ProsecutionSubmissionSucceededWithWarnings; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class CaseCreatedEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessor.java index b8da7e69..93e20170 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; @@ -18,8 +18,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class CaseFilteredEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessor.java index 7354afe3..fb6789e9 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessor.java @@ -6,9 +6,9 @@ import static java.util.UUID.fromString; import static java.util.UUID.nameUUIDFromBytes; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; -import static javax.json.JsonValue.NULL; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; +import static jakarta.json.JsonValue.NULL; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static org.apache.commons.validator.util.ValidatorUtils.getValueAsString; @@ -72,13 +72,13 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/DefendantIdpcEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/DefendantIdpcEventProcessor.java index 14d59cf7..d62bc0e4 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/DefendantIdpcEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/DefendantIdpcEventProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -15,8 +15,8 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class DefendantIdpcEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesCreatedEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesCreatedEventProcessor.java index f5d2a256..b11d3a4c 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesCreatedEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesCreatedEventProcessor.java @@ -14,7 +14,7 @@ import uk.gov.moj.cps.prosecutioncasefile.domain.event.GroupCasesCreatedSuccessfully; import uk.gov.moj.cps.prosecutioncasefile.domain.event.GroupSubmissionSucceeded; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesParkedForApprovalEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesParkedForApprovalEventProcessor.java index 6db36fbc..feb49608 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesParkedForApprovalEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesParkedForApprovalEventProcessor.java @@ -2,7 +2,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; @@ -31,8 +31,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesReceivedEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesReceivedEventProcessor.java index cbcfbc98..6b1fcc1a 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesReceivedEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupCasesReceivedEventProcessor.java @@ -13,7 +13,7 @@ import uk.gov.moj.cpp.prosecution.casefile.event.GroupCasesReceived; import uk.gov.moj.cpp.prosecution.casefile.event.processor.converter.GroupCasesReceivedToInitiateCourtProceedingsConverter; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupProsecutionRejectedProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupProsecutionRejectedProcessor.java index cac0941e..1ec7cb28 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupProsecutionRejectedProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/GroupProsecutionRejectedProcessor.java @@ -7,7 +7,7 @@ import uk.gov.moj.cps.prosecutioncasefile.domain.event.GroupProsecutionRejected; import uk.gov.moj.cps.prosecutioncasefile.domain.event.PublicGroupProsecutionRejected; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.UUID; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessor.java index 0ce121bc..50c3e514 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessor.java @@ -5,9 +5,9 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; -import static javax.json.JsonValue.NULL; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -55,10 +55,10 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(EVENT_PROCESSOR) public class MaterialEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/OnlinePleaEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/OnlinePleaEventProcessor.java index 5b818c74..48f9cac0 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/OnlinePleaEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/OnlinePleaEventProcessor.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/PocaEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/PocaEventProcessor.java index ae7bdce6..62dbfd17 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/PocaEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/PocaEventProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -27,10 +27,10 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessor.java index 9688b9e9..f51f5387 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessor.java @@ -6,7 +6,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; @@ -46,9 +46,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessor.java index c1cd6a76..22ee50f9 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessor.java @@ -29,7 +29,7 @@ import uk.gov.moj.cps.prosecutioncasefile.domain.event.ProsecutionSubmissionSucceeded; import uk.gov.moj.cps.prosecutioncasefile.domain.event.ProsecutionSubmissionSucceededWithWarnings; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class ProsecutionDefendantsAddedEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessor.java index 972ffeb4..3278a67d 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessor.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionRejectedProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionRejectedProcessor.java index 456c8aeb..5757f825 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionRejectedProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionRejectedProcessor.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class ProsecutionRejectedProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ResultingPublicEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ResultingPublicEventProcessor.java index e0c40519..a2e9cadd 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ResultingPublicEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ResultingPublicEventProcessor.java @@ -11,7 +11,7 @@ import uk.gov.moj.cpp.prosecutioncasefile.command.handler.RecordDecisionToReferCaseForCourtHearingSaved; import uk.gov.moj.cpp.resulting.event.PublicDecisionToReferCaseForCourtHearingSaved; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class ResultingPublicEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpCaseCreatedEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpCaseCreatedEventProcessor.java index 82341559..e60fc6de 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpCaseCreatedEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpCaseCreatedEventProcessor.java @@ -17,7 +17,7 @@ import uk.gov.moj.cps.prosecutioncasefile.domain.event.SjpCaseCreatedSuccessfully; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SjpCaseCreatedSuccessfullyWithWarnings; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class SjpCaseCreatedEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpProsecutionProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpProsecutionProcessor.java index ba1f4f24..7864dc31 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpProsecutionProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpProsecutionProcessor.java @@ -31,7 +31,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class SjpProsecutionProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpPublicEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpPublicEventProcessor.java index 9df97c27..05b956f2 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpPublicEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SjpPublicEventProcessor.java @@ -18,7 +18,7 @@ import uk.gov.moj.cps.prosecutioncasefile.command.handler.AssignCase; import uk.gov.moj.cps.prosecutioncasefile.command.handler.UnassignCase; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class SjpPublicEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SummonsApplicationEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SummonsApplicationEventProcessor.java index 3f0b8e5a..21faa999 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SummonsApplicationEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/SummonsApplicationEventProcessor.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class SummonsApplicationEventProcessor { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ValidationErrorEventProcessor.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ValidationErrorEventProcessor.java index c17bd79e..bf0b0408 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ValidationErrorEventProcessor.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ValidationErrorEventProcessor.java @@ -8,7 +8,7 @@ import uk.gov.moj.cpp.prosecution.casefile.event.DefendantValidationFailed; import uk.gov.moj.cpp.prosecution.casefile.event.SjpValidationFailed; -import javax.inject.Inject; +import jakarta.inject.Inject; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpiration.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpiration.java index 9ae9797f..ab0a4cd4 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpiration.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpiration.java @@ -11,8 +11,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.ProcessInstance; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/IdpcUploadMaterialProcessService.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/IdpcUploadMaterialProcessService.java index d483566f..292abff2 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/IdpcUploadMaterialProcessService.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/IdpcUploadMaterialProcessService.java @@ -11,9 +11,9 @@ import java.util.Map; import java.util.UUID; -import javax.ejb.Startup; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.ejb.Startup; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.Execution; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServeBcmExpiration.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServeBcmExpiration.java index 58d48dcf..03d5bc36 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServeBcmExpiration.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServeBcmExpiration.java @@ -13,8 +13,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.Execution; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpiration.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpiration.java index de6a46d2..a5e0d09a 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpiration.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpiration.java @@ -13,8 +13,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.Execution; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpiration.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpiration.java index c747d220..e9661d63 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpiration.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpiration.java @@ -12,8 +12,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.ProcessInstance; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpiration.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpiration.java index 85836efd..4da8d51a 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpiration.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpiration.java @@ -11,8 +11,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.ProcessInstance; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/AddMaterialToCase.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/AddMaterialToCase.java index 9a2869f8..c5c76805 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/AddMaterialToCase.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/AddMaterialToCase.java @@ -10,10 +10,10 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.Metadata; -import javax.inject.Inject; -import javax.inject.Named; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/BulkScanPendingMaterialExpiredDelegate.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/BulkScanPendingMaterialExpiredDelegate.java index 389c13e9..602131de 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/BulkScanPendingMaterialExpiredDelegate.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/BulkScanPendingMaterialExpiredDelegate.java @@ -15,8 +15,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServeBcmExpiredDelegate.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServeBcmExpiredDelegate.java index 80de729a..f914a8cb 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServeBcmExpiredDelegate.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServeBcmExpiredDelegate.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti.delegates; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.moj.cpp.prosecution.casefile.event.processor.utils.MetadataHelper.metadataFromString; @@ -13,8 +13,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServePetExpiredDelegate.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServePetExpiredDelegate.java index fd8fcb0d..105cd020 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServePetExpiredDelegate.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingCpsServePetExpiredDelegate.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti.delegates; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.moj.cpp.prosecution.casefile.event.processor.utils.MetadataHelper.metadataFromString; @@ -13,8 +13,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingIdpcMaterialExpiredDelegate.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingIdpcMaterialExpiredDelegate.java index 6bee166c..0936b162 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingIdpcMaterialExpiredDelegate.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingIdpcMaterialExpiredDelegate.java @@ -14,10 +14,10 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingMaterialExpiredDelegate.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingMaterialExpiredDelegate.java index 5fc19de7..51ec4f63 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingMaterialExpiredDelegate.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/PendingMaterialExpiredDelegate.java @@ -7,12 +7,12 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.Metadata; -import javax.inject.Inject; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import java.util.UUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/UploadFile.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/UploadFile.java index e320e81b..df830d75 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/UploadFile.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/delegates/UploadFile.java @@ -12,10 +12,10 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CCCaseToProsecutionCaseConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CCCaseToProsecutionCaseConverter.java index 054c1656..4b4ab2ce 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CCCaseToProsecutionCaseConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CCCaseToProsecutionCaseConverter.java @@ -35,7 +35,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class CCCaseToProsecutionCaseConverter implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/DefendantsParkedToCourtApplicationProceedingsConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/DefendantsParkedToCourtApplicationProceedingsConverter.java index 77e1f110..a649bc46 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/DefendantsParkedToCourtApplicationProceedingsConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/DefendantsParkedToCourtApplicationProceedingsConverter.java @@ -34,7 +34,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesParkedForApprovalToCourtApplicationProceedingsConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesParkedForApprovalToCourtApplicationProceedingsConverter.java index 80d68c1f..025d99ac 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesParkedForApprovalToCourtApplicationProceedingsConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesParkedForApprovalToCourtApplicationProceedingsConverter.java @@ -33,7 +33,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @SuppressWarnings({"Duplicates", "duplicates"}) public class GroupCasesParkedForApprovalToCourtApplicationProceedingsConverter implements ParameterisedConverter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverter.java index aa2ff2c9..687f57b7 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverter.java @@ -21,7 +21,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OrganisationUnitWithCourtroomReferenceData; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.ProsecutorsReferenceData; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Objects; import java.util.Optional; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileCaseDetailsToProsecutionCaseIdentifierConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileCaseDetailsToProsecutionCaseIdentifierConverter.java index b2431f70..dedd0116 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileCaseDetailsToProsecutionCaseIdentifierConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileCaseDetailsToProsecutionCaseIdentifierConverter.java @@ -14,7 +14,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.ProsecutorsReferenceData; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionCaseFileCaseDetailsToProsecutionCaseIdentifierConverter implements ParameterisedConverter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCCDefendantConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCCDefendantConverter.java index 6d4d8fb5..13e52308 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCCDefendantConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCCDefendantConverter.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.google.common.collect.ImmutableList; import org.apache.commons.lang3.StringUtils; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCourtApplicationPartyConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCourtApplicationPartyConverter.java index f61ba708..f18fa57d 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCourtApplicationPartyConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToCourtApplicationPartyConverter.java @@ -18,7 +18,7 @@ import java.time.Period; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionCaseFileDefendantToCourtApplicationPartyConverter implements DualParameterisedConverter, List, ReferenceDataVO, Channel> { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToDefenceDefendantConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToDefenceDefendantConverter.java index 0b889c39..3dc25d88 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToDefenceDefendantConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToDefenceDefendantConverter.java @@ -11,7 +11,7 @@ import java.time.LocalDate; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionCaseFileDefendantToDefenceDefendantConverter implements Converter, List> { @Inject diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToSjpDefendantConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToSjpDefendantConverter.java index a0653d0a..a9e7aac7 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToSjpDefendantConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileDefendantToSjpDefendantConverter.java @@ -11,7 +11,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionCaseFileDefendantToSjpDefendantConverter implements Converter { @Inject diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtApplicationOffenceConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtApplicationOffenceConverter.java index de148ba6..dd44c440 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtApplicationOffenceConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtApplicationOffenceConverter.java @@ -6,7 +6,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionCaseFileOffenceToCourtApplicationOffenceConverter implements ParameterisedConverter, List, ParamsVO> { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtsOffenceConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtsOffenceConverter.java index 56b211d9..1216b556 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtsOffenceConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToCourtsOffenceConverter.java @@ -42,7 +42,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToSjpOffenceConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToSjpOffenceConverter.java index bb6d97de..96919d37 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToSjpOffenceConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileOffenceToSjpOffenceConverter.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileProsecutorToCourtApplicationPartyConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileProsecutorToCourtApplicationPartyConverter.java index 685b1614..12011069 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileProsecutorToCourtApplicationPartyConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionCaseFileProsecutorToCourtApplicationPartyConverter.java @@ -17,7 +17,7 @@ import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionCaseFileProsecutorToCourtApplicationPartyConverter implements DualParameterisedConverter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToBoxHearingRequestConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToBoxHearingRequestConverter.java index 82743ce1..3ad0bd1e 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToBoxHearingRequestConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToBoxHearingRequestConverter.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionToBoxHearingRequestConverter implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToCCAddDefendantConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToCCAddDefendantConverter.java index 0d15af5a..799d8cb2 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToCCAddDefendantConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ProsecutionToCCAddDefendantConverter.java @@ -5,7 +5,7 @@ import uk.gov.moj.cpp.prosecution.casefile.domain.ParamsVO; import uk.gov.moj.cpp.prosecution.casefile.event.ProsecutionDefendantsAdded; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ProsecutionToCCAddDefendantConverter implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToCCAddDefendantConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToCCAddDefendantConverter.java index 85fe4ebf..ebdfe49b 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToCCAddDefendantConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToCCAddDefendantConverter.java @@ -5,7 +5,7 @@ import uk.gov.moj.cpp.prosecution.casefile.domain.ParamsVO; import uk.gov.moj.cpp.prosecution.casefile.event.SpiProsecutionDefendantsAdded; -import javax.inject.Inject; +import jakarta.inject.Inject; @SuppressWarnings("squid:S1133") public class SjpProsecutionToCCAddDefendantConverter implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToSjpCaseConverter.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToSjpCaseConverter.java index 92a99ddf..822eaeef 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToSjpCaseConverter.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/SjpProsecutionToSjpCaseConverter.java @@ -9,7 +9,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.ProsecutorsReferenceData; import uk.gov.moj.cps.prosecutioncasefile.domain.event.SjpProsecutionInitiated; -import javax.inject.Inject; +import jakarta.inject.Inject; public class SjpProsecutionToSjpCaseConverter implements Converter { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListener.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListener.java index ca93a8a5..d6850661 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListener.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListener.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorService.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorService.java index bf2f099b..3b4a9563 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorService.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.service; -import static javax.json.Json.createObjectBuilder; -import static javax.transaction.Transactional.TxType.REQUIRES_NEW; +import static jakarta.json.Json.createObjectBuilder; +import static jakarta.transaction.Transactional.TxType.REQUIRES_NEW; import uk.gov.justice.services.core.dispatcher.SystemUserProvider; import uk.gov.justice.services.fileservice.api.FileServiceException; @@ -17,9 +17,9 @@ import java.io.InputStream; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/MaterialService.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/MaterialService.java index 0c64ea94..232745ea 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/MaterialService.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/MaterialService.java @@ -10,10 +10,10 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.Metadata; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import java.util.UUID; import static java.util.UUID.fromString; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ProsecutionCaseQueryService.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ProsecutionCaseQueryService.java index 1a9e6f09..3a62a75f 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ProsecutionCaseQueryService.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ProsecutionCaseQueryService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.service; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -11,9 +11,9 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataService.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataService.java index 2238c884..902cfb12 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataService.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataService.java @@ -2,7 +2,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -12,8 +12,8 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReferenceDataService { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/ApplicationParameters.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/ApplicationParameters.java index d9cfbdce..91d9ef9a 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/ApplicationParameters.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/ApplicationParameters.java @@ -2,7 +2,7 @@ import uk.gov.justice.services.common.configuration.Value; -import javax.inject.Inject; +import jakarta.inject.Inject; @SuppressWarnings("squid:S1488") public class ApplicationParameters { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelper.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelper.java index 5ad3d167..67869bd8 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelper.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelper.java @@ -14,10 +14,10 @@ import java.util.function.Function; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; //TODO Remove (ATCM-3474) //Custom metadata fields are lost when envelop is transferred via http, workaround is to pass them in payload. diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/GroupCasesSummonsTemplateHelper.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/GroupCasesSummonsTemplateHelper.java index be096163..decc6296 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/GroupCasesSummonsTemplateHelper.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/GroupCasesSummonsTemplateHelper.java @@ -2,8 +2,8 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNoneEmpty; import uk.gov.moj.cpp.prosecution.casefile.domain.GroupProsecutionList; @@ -14,8 +14,8 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.Offence; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.PersonalInformation; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class GroupCasesSummonsTemplateHelper { diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/MetadataHelper.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/MetadataHelper.java index 5378b239..b3f37a8b 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/MetadataHelper.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/MetadataHelper.java @@ -6,10 +6,10 @@ import uk.gov.justice.services.messaging.JsonObjects; import uk.gov.justice.services.messaging.Metadata; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; import java.io.StringReader; import java.util.Optional; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessorTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessorTest.java index 5de9a5d5..9497860f 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessorTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ApplicationEventProcessorTest.java @@ -31,7 +31,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessorTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessorTest.java index 67b9c2eb..32de11bb 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessorTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CaseFilteredEventProcessorTest.java @@ -2,7 +2,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessorTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessorTest.java index dc945293..73a7f77b 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessorTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/CpsServeMaterialEventProcessorTest.java @@ -3,8 +3,8 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasSize; @@ -81,7 +81,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.Lists; import org.junit.jupiter.api.BeforeEach; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessorTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessorTest.java index 42458c99..fdb34ee6 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessorTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/MaterialEventProcessorTest.java @@ -4,8 +4,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static javax.json.JsonValue.NULL; +import static jakarta.json.Json.createObjectBuilder; +import static jakarta.json.JsonValue.NULL; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; @@ -95,8 +95,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessorTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessorTest.java index 731846f7..d45280d3 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessorTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProgressionPublicEventProcessorTest.java @@ -6,8 +6,8 @@ import static java.nio.charset.Charset.defaultCharset; import static java.time.LocalDate.parse; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; @@ -62,7 +62,7 @@ import java.io.IOException; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessorTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessorTest.java index b77e7b15..7cbf9fdf 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessorTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionDefendantsAddedEventProcessorTest.java @@ -34,7 +34,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessorTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessorTest.java index 5983e911..790c9d7a 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessorTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/ProsecutionReceivedProcessorTest.java @@ -4,7 +4,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; @@ -53,9 +53,9 @@ import java.time.ZonedDateTime; import java.util.List; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/ActivitiJUnit5Extension.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/ActivitiJUnit5Extension.java new file mode 100644 index 00000000..e6c074b3 --- /dev/null +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/ActivitiJUnit5Extension.java @@ -0,0 +1,72 @@ +package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti; + +import java.io.InputStream; + +import org.activiti.engine.ProcessEngine; +import org.activiti.engine.ProcessEngineConfiguration; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; +import org.activiti.engine.impl.test.JobTestHelper; +import org.activiti.engine.test.Deployment; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +import java.lang.reflect.Method; + +public class ActivitiJUnit5Extension implements BeforeEachCallback, AfterEachCallback { + + private ProcessEngine processEngine; + private String deploymentId; + + @Override + public void beforeEach(final ExtensionContext context) { + final InputStream cfgStream = ActivitiJUnit5Extension.class.getResourceAsStream("/activiti.cfg.xml"); + processEngine = ProcessEngineConfiguration + .createProcessEngineConfigurationFromInputStream(cfgStream, "processEngineConfiguration") + .buildProcessEngine(); + + final Method testMethod = context.getRequiredTestMethod(); + final Deployment deployment = testMethod.getAnnotation(Deployment.class); + if (deployment != null) { + final RepositoryService repositoryService = processEngine.getRepositoryService(); + final org.activiti.engine.repository.DeploymentBuilder builder = repositoryService.createDeployment(); + for (final String resource : deployment.resources()) { + builder.addClasspathResource(resource); + } + deploymentId = builder.deploy().getId(); + } + } + + @Override + public void afterEach(final ExtensionContext context) { + if (deploymentId != null) { + processEngine.getRepositoryService().deleteDeployment(deploymentId, true); + deploymentId = null; + } + if (processEngine != null) { + processEngine.close(); + processEngine = null; + } + } + + public ProcessEngine getProcessEngine() { + return processEngine; + } + + public RuntimeService getRuntimeService() { + return processEngine.getRuntimeService(); + } + + public StandaloneProcessEngineConfiguration getProcessEngineConfiguration() { + return (StandaloneProcessEngineConfiguration) processEngine.getProcessEngineConfiguration(); + } + + public void waitForJobExecutorToProcessAllJobs(final long maxMillisToWait, final long intervalMillis) { + JobTestHelper.waitForJobExecutorToProcessAllJobs( + processEngine.getProcessEngineConfiguration(), + processEngine.getManagementService(), + maxMillisToWait, intervalMillis); + } +} diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpirationTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpirationTest.java index 7bd9474b..af441112 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpirationTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/BulkScanMaterialExpirationTest.java @@ -1,7 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti; import static java.util.UUID.randomUUID; -import static org.activiti.engine.impl.test.JobTestHelper.waitForJobExecutorToProcessAllJobs; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -18,19 +17,17 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; -import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class BulkScanMaterialExpirationTest { private static final String TIMEOUT_PROCESS_PATH = "processes/bulkScanMaterialExpired.bpmn20.xml"; @@ -40,20 +37,19 @@ public class BulkScanMaterialExpirationTest { private JavaDelegate bulkScanPendingMaterialExpiredDelegate; private Metadata metadata; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + public final ActivitiJUnit5Extension activitiExtension = new ActivitiJUnit5Extension(); @Captor private ArgumentCaptor delegateExecutionCaptor; - @Before + @BeforeEach public void init() { - final StandaloneProcessEngineConfiguration configuration = (StandaloneProcessEngineConfiguration) rule.getProcessEngine().getProcessEngineConfiguration(); caseId = randomUUID(); fileStoreId = randomUUID(); metadata = metadataWithRandomUUID("test").build(); - bulkScanMaterialExpiration = new BulkScanMaterialExpiration(rule.getRuntimeService(), Duration.ofSeconds(1).toString()); - bulkScanPendingMaterialExpiredDelegate = (JavaDelegate) configuration.getBeans().get("bulkScanPendingMaterialExpiredDelegate"); + bulkScanMaterialExpiration = new BulkScanMaterialExpiration(activitiExtension.getRuntimeService(), Duration.ofSeconds(1).toString()); + bulkScanPendingMaterialExpiredDelegate = (JavaDelegate) activitiExtension.getProcessEngineConfiguration().getBeans().get("bulkScanPendingMaterialExpiredDelegate"); reset(bulkScanPendingMaterialExpiredDelegate); } @@ -74,7 +70,6 @@ public void shouldTriggerTimeoutTaskAfterTimeout() throws Exception { assertThat(isProcessFinished(processInstance), equalTo(true)); } - @Test @Deployment(resources = {TIMEOUT_PROCESS_PATH}) public void shouldCancelAssignmentTimer() { @@ -86,7 +81,7 @@ public void shouldCancelAssignmentTimer() { } private boolean isProcessFinished(final ProcessInstance processInstance) { - final ProcessInstance refreshedProcessInstance = rule.getProcessEngine() + final ProcessInstance refreshedProcessInstance = activitiExtension.getProcessEngine() .getRuntimeService() .createProcessInstanceQuery() .processInstanceId(processInstance.getProcessInstanceId()) @@ -95,6 +90,6 @@ private boolean isProcessFinished(final ProcessInstance processInstance) { } private void waitForAllJobs() { - waitForJobExecutorToProcessAllJobs(rule, 10000, 500); + activitiExtension.waitForJobExecutorToProcessAllJobs(10000, 500); } } diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingBcmServePetExpirationTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingBcmServePetExpirationTest.java index 8180dc09..0e81d01c 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingBcmServePetExpirationTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingBcmServePetExpirationTest.java @@ -1,7 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti; import static java.util.UUID.randomUUID; -import static org.activiti.engine.impl.test.JobTestHelper.waitForJobExecutorToProcessAllJobs; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -17,19 +16,17 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; -import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class PendingBcmServePetExpirationTest { private static final String TIMEOUT_PROCESS_PATH = "processes/pendingCpsServeBcmExpired.bpmn20.xml"; @@ -39,26 +36,25 @@ public class PendingBcmServePetExpirationTest { private JavaDelegate pendingCpsServeBcmExpiredDelegate; private Metadata metadata; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + public final ActivitiJUnit5Extension activitiExtension = new ActivitiJUnit5Extension(); @Captor private ArgumentCaptor delegateExecutionCaptor; - @Before + @BeforeEach public void init() { - final StandaloneProcessEngineConfiguration configuration = (StandaloneProcessEngineConfiguration) rule.getProcessEngine().getProcessEngineConfiguration(); timerUUID = randomUUID(); metadata = metadataWithRandomUUID("test").build(); - pendingCpsServeBcmExpiration = new PendingCpsServeBcmExpiration(rule.getRuntimeService(), Duration.ofSeconds(1).toString()); - pendingCpsServeBcmExpiredDelegate = (JavaDelegate) configuration.getBeans().get("pendingCpsServeBcmExpiredDelegate"); + pendingCpsServeBcmExpiration = new PendingCpsServeBcmExpiration(activitiExtension.getRuntimeService(), Duration.ofSeconds(1).toString()); + pendingCpsServeBcmExpiredDelegate = (JavaDelegate) activitiExtension.getProcessEngineConfiguration().getBeans().get("pendingCpsServeBcmExpiredDelegate"); reset(pendingCpsServeBcmExpiredDelegate); } @Test @Deployment(resources = {TIMEOUT_PROCESS_PATH}) public void shouldTriggerTimeoutTaskAfterTimeout() throws Exception { - final ProcessInstance processInstance = pendingCpsServeBcmExpiration.startCpsServeBcmTimer(timerUUID,metadata); + final ProcessInstance processInstance = pendingCpsServeBcmExpiration.startCpsServeBcmTimer(timerUUID, metadata); waitForAllJobs(); @@ -72,11 +68,11 @@ public void shouldTriggerTimeoutTaskAfterTimeout() throws Exception { } private void waitForAllJobs() { - waitForJobExecutorToProcessAllJobs(rule, 10000, 500); + activitiExtension.waitForJobExecutorToProcessAllJobs(10000, 500); } private boolean isProcessFinished(final ProcessInstance processInstance) { - final ProcessInstance refreshedProcessInstance = rule.getProcessEngine() + final ProcessInstance refreshedProcessInstance = activitiExtension.getProcessEngine() .getRuntimeService() .createProcessInstanceQuery() .processInstanceId(processInstance.getProcessInstanceId()) diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpirationTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpirationTest.java index 0293ea2c..912900c5 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpirationTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingCpsServePetExpirationTest.java @@ -1,7 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti; import static java.util.UUID.randomUUID; -import static org.activiti.engine.impl.test.JobTestHelper.waitForJobExecutorToProcessAllJobs; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -17,19 +16,17 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; -import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class PendingCpsServePetExpirationTest { private static final String TIMEOUT_PROCESS_PATH = "processes/pendingCpsServePetExpired.bpmn20.xml"; @@ -39,26 +36,25 @@ public class PendingCpsServePetExpirationTest { private JavaDelegate pendingCpsServePetExpiredDelegate; private Metadata metadata; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + public final ActivitiJUnit5Extension activitiExtension = new ActivitiJUnit5Extension(); @Captor private ArgumentCaptor delegateExecutionCaptor; - @Before + @BeforeEach public void init() { - final StandaloneProcessEngineConfiguration configuration = (StandaloneProcessEngineConfiguration) rule.getProcessEngine().getProcessEngineConfiguration(); timerUUID = randomUUID(); metadata = metadataWithRandomUUID("test").build(); - pendingCpsServePetExpiration = new PendingCpsServePetExpiration(rule.getRuntimeService(), Duration.ofSeconds(1).toString()); - pendingCpsServePetExpiredDelegate = (JavaDelegate) configuration.getBeans().get("pendingCpsServePetExpiredDelegate"); + pendingCpsServePetExpiration = new PendingCpsServePetExpiration(activitiExtension.getRuntimeService(), Duration.ofSeconds(1).toString()); + pendingCpsServePetExpiredDelegate = (JavaDelegate) activitiExtension.getProcessEngineConfiguration().getBeans().get("pendingCpsServePetExpiredDelegate"); reset(pendingCpsServePetExpiredDelegate); } @Test @Deployment(resources = {TIMEOUT_PROCESS_PATH}) public void shouldTriggerTimeoutTaskAfterTimeout() throws Exception { - final ProcessInstance processInstance = pendingCpsServePetExpiration.startCpsServePetTimer(timerUUID,metadata); + final ProcessInstance processInstance = pendingCpsServePetExpiration.startCpsServePetTimer(timerUUID, metadata); waitForAllJobs(); @@ -72,11 +68,11 @@ public void shouldTriggerTimeoutTaskAfterTimeout() throws Exception { } private void waitForAllJobs() { - waitForJobExecutorToProcessAllJobs(rule, 10000, 500); + activitiExtension.waitForJobExecutorToProcessAllJobs(10000, 500); } private boolean isProcessFinished(final ProcessInstance processInstance) { - final ProcessInstance refreshedProcessInstance = rule.getProcessEngine() + final ProcessInstance refreshedProcessInstance = activitiExtension.getProcessEngine() .getRuntimeService() .createProcessInstanceQuery() .processInstanceId(processInstance.getProcessInstanceId()) diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpirationTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpirationTest.java index c4e38ca5..658a3e51 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpirationTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingIdpcMaterialExpirationTest.java @@ -1,7 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti; import static java.util.UUID.randomUUID; -import static org.activiti.engine.impl.test.JobTestHelper.waitForJobExecutorToProcessAllJobs; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -17,20 +16,19 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; -import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class PendingIdpcMaterialExpirationTest { + private static final String TIMEOUT_PROCESS_PATH = "processes/pendingIdpcMaterialExpired.bpmn20.xml"; private UUID caseId, fileStoreId; @@ -38,20 +36,19 @@ public class PendingIdpcMaterialExpirationTest { private JavaDelegate pendingIdpcMaterialExpiredDelegate; private Metadata metadata; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + public final ActivitiJUnit5Extension activitiExtension = new ActivitiJUnit5Extension(); @Captor private ArgumentCaptor delegateExecutionCaptor; - @Before + @BeforeEach public void init() { - final StandaloneProcessEngineConfiguration configuration = (StandaloneProcessEngineConfiguration) rule.getProcessEngine().getProcessEngineConfiguration(); caseId = randomUUID(); fileStoreId = randomUUID(); metadata = metadataWithRandomUUID("test").build(); - pendingIdpcMaterialExpiration = new PendingIdpcMaterialExpiration(rule.getRuntimeService(), Duration.ofSeconds(1).toString()); - pendingIdpcMaterialExpiredDelegate = (JavaDelegate) configuration.getBeans().get("pendingIdpcMaterialExpiredDelegate"); + pendingIdpcMaterialExpiration = new PendingIdpcMaterialExpiration(activitiExtension.getRuntimeService(), Duration.ofSeconds(1).toString()); + pendingIdpcMaterialExpiredDelegate = (JavaDelegate) activitiExtension.getProcessEngineConfiguration().getBeans().get("pendingIdpcMaterialExpiredDelegate"); reset(pendingIdpcMaterialExpiredDelegate); } @@ -73,16 +70,15 @@ public void shouldTriggerTimeoutTaskAfterTimeout() throws Exception { } private void waitForAllJobs() { - waitForJobExecutorToProcessAllJobs(rule, 10000, 500); + activitiExtension.waitForJobExecutorToProcessAllJobs(10000, 500); } private boolean isProcessFinished(final ProcessInstance processInstance) { - final ProcessInstance refreshedProcessInstance = rule.getProcessEngine() + final ProcessInstance refreshedProcessInstance = activitiExtension.getProcessEngine() .getRuntimeService() .createProcessInstanceQuery() .processInstanceId(processInstance.getProcessInstanceId()) .singleResult(); return refreshedProcessInstance == null; } - } diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpirationTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpirationTest.java index e118d279..26cf75be 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpirationTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/activiti/PendingMaterialExpirationTest.java @@ -1,7 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.activiti; import static java.util.UUID.randomUUID; -import static org.activiti.engine.impl.test.JobTestHelper.waitForJobExecutorToProcessAllJobs; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -18,19 +17,17 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; -import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class PendingMaterialExpirationTest { private static final String TIMEOUT_PROCESS_PATH = "processes/pendingMaterialExpired.bpmn20.xml"; @@ -40,20 +37,19 @@ public class PendingMaterialExpirationTest { private JavaDelegate pendingMaterialExpiredDelegate; private Metadata metadata; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + public final ActivitiJUnit5Extension activitiExtension = new ActivitiJUnit5Extension(); @Captor private ArgumentCaptor delegateExecutionCaptor; - @Before + @BeforeEach public void init() { - final StandaloneProcessEngineConfiguration configuration = (StandaloneProcessEngineConfiguration) rule.getProcessEngine().getProcessEngineConfiguration(); caseId = randomUUID(); fileStoreId = randomUUID(); metadata = metadataWithRandomUUID("test").build(); - pendingMaterialExpiration = new PendingMaterialExpiration(rule.getRuntimeService(), Duration.ofSeconds(1).toString()); - pendingMaterialExpiredDelegate = (JavaDelegate) configuration.getBeans().get("pendingMaterialExpiredDelegate"); + pendingMaterialExpiration = new PendingMaterialExpiration(activitiExtension.getRuntimeService(), Duration.ofSeconds(1).toString()); + pendingMaterialExpiredDelegate = (JavaDelegate) activitiExtension.getProcessEngineConfiguration().getBeans().get("pendingMaterialExpiredDelegate"); reset(pendingMaterialExpiredDelegate); } @@ -85,15 +81,14 @@ public void shouldCancelAssignmentTimer() { } private void waitForAllJobs() { - waitForJobExecutorToProcessAllJobs(rule, 10000, 500); + activitiExtension.waitForJobExecutorToProcessAllJobs(10000, 500); } private boolean isProcessFinished(final ProcessInstance processInstance) { - final ProcessInstance refreshedProcessInstance = rule.getProcessEngine() + return activitiExtension.getProcessEngine() .getRuntimeService() .createProcessInstanceQuery() .processInstanceId(processInstance.getProcessInstanceId()) - .singleResult(); - return refreshedProcessInstance == null; + .singleResult() == null; } -} \ No newline at end of file +} diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ApplicationAcceptedToCourtApplicationProceedingsConverterTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ApplicationAcceptedToCourtApplicationProceedingsConverterTest.java index 31c6c7da..82277458 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ApplicationAcceptedToCourtApplicationProceedingsConverterTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/ApplicationAcceptedToCourtApplicationProceedingsConverterTest.java @@ -18,7 +18,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.Resources; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CaseDetailsToCivilFeesConverterTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CaseDetailsToCivilFeesConverterTest.java index 48bdbab7..d336514f 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CaseDetailsToCivilFeesConverterTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/CaseDetailsToCivilFeesConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.converter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static uk.gov.justice.core.courts.FeeStatus.NOT_APPLICABLE; import static uk.gov.justice.core.courts.FeeType.INITIAL; @@ -13,7 +13,7 @@ import java.util.List; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CaseDetailsToCivilFeesConverterTest { @@ -51,4 +51,4 @@ public void shouldCreateCivilFeesObject() { assertEquals(civilFees.get(0).getFeeStatus(), feeStatus); assertEquals(civilFees.get(0).getPaymentReference(), paymentReference); } -} \ No newline at end of file +} diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverterTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverterTest.java index 080a97f2..55d38476 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverterTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/converter/GroupCasesReceivedToInitiateCourtProceedingsConverterTest.java @@ -37,7 +37,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListenerTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListenerTest.java index 2baee4a0..84979e10 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListenerTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/listener/external/sjp/CaseDocumentUploadedListenerTest.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.spi.DefaultEnvelope; -import javax.json.Json; +import jakarta.json.Json; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/mapper/MapperBase.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/mapper/MapperBase.java index bd7be6f6..9eb77ff3 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/mapper/MapperBase.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/mapper/MapperBase.java @@ -12,7 +12,7 @@ import java.nio.charset.Charset; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.Resources; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorServiceTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorServiceTest.java index f30dc880..cc2e89ff 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorServiceTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/DocumentGeneratorServiceTest.java @@ -14,14 +14,14 @@ import uk.gov.moj.cpp.system.documentgenerator.client.DocumentGeneratorClient; import uk.gov.moj.cpp.system.documentgenerator.client.DocumentGeneratorClientProducer; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.io.IOException; import java.io.InputStream; import java.util.Optional; import java.util.UUID; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataServiceTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataServiceTest.java index 2f60d263..7199cfed 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataServiceTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/service/ReferenceDataServiceTest.java @@ -11,7 +11,7 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/CaseReceivedHelper.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/CaseReceivedHelper.java index fce873aa..9014deb7 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/CaseReceivedHelper.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/CaseReceivedHelper.java @@ -7,7 +7,7 @@ import static java.util.Optional.of; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createReader; +import static jakarta.json.Json.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; import static org.junit.jupiter.api.Assertions.fail; @@ -67,7 +67,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableList; import org.apache.commons.io.IOUtils; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelperTest.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelperTest.java index 2e120ec0..56710dc2 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelperTest.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/EnvelopeHelperTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.event.processor.utils; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; @@ -18,7 +18,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/FileUtil.java b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/FileUtil.java index 9cb4fc0c..1a36b3a3 100644 --- a/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/FileUtil.java +++ b/prosecutioncasefile-event/prosecutioncasefile-event-processor/src/test/java/uk/gov/moj/cpp/prosecution/casefile/event/processor/utils/FileUtil.java @@ -8,9 +8,9 @@ import java.io.InputStream; import java.io.StringReader; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/prosecutioncasefile-healthchecks/pom.xml b/prosecutioncasefile-healthchecks/pom.xml index 88f09a7f..d58f7423 100644 --- a/prosecutioncasefile-healthchecks/pom.xml +++ b/prosecutioncasefile-healthchecks/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -11,8 +11,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/prosecutioncasefile-healthchecks/src/main/java/uk/gov/moj/cpp/prosecution/casefile/healthchecks/ProsecutionCaseFileIgnoredHealthcheckNamesProvider.java b/prosecutioncasefile-healthchecks/src/main/java/uk/gov/moj/cpp/prosecution/casefile/healthchecks/ProsecutionCaseFileIgnoredHealthcheckNamesProvider.java index c8a7890a..9826d206 100644 --- a/prosecutioncasefile-healthchecks/src/main/java/uk/gov/moj/cpp/prosecution/casefile/healthchecks/ProsecutionCaseFileIgnoredHealthcheckNamesProvider.java +++ b/prosecutioncasefile-healthchecks/src/main/java/uk/gov/moj/cpp/prosecution/casefile/healthchecks/ProsecutionCaseFileIgnoredHealthcheckNamesProvider.java @@ -11,7 +11,7 @@ import java.util.List; -import javax.enterprise.inject.Specializes; +import jakarta.enterprise.inject.Specializes; @Specializes public class ProsecutionCaseFileIgnoredHealthcheckNamesProvider extends DefaultIgnoredHealthcheckNamesProvider { diff --git a/prosecutioncasefile-healthchecks/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-healthchecks/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100644 --- a/prosecutioncasefile-healthchecks/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-healthchecks/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-integration-test/pom.xml b/prosecutioncasefile-integration-test/pom.xml index a23e498e..eeaa4af2 100755 --- a/prosecutioncasefile-integration-test/pom.xml +++ b/prosecutioncasefile-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-parent - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -96,11 +96,6 @@ awaitility test - - org.slf4j - slf4j-reload4j - test - org.skyscreamer jsonassert diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AbstractTestHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AbstractTestHelper.java index 41d8b4be..a08ee8c7 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AbstractTestHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AbstractTestHelper.java @@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import com.google.common.base.Joiner; import com.jayway.awaitility.Awaitility; @@ -48,7 +48,7 @@ public abstract class AbstractTestHelper { protected static final String BASE_URI = System.getProperty("baseUri", "http://" + HOST + ":8080"); private static final String WRITE_BASE_URL = "/prosecutioncasefile-service/command/api/rest/prosecutioncasefile"; private static final String READ_BASE_URL = "/prosecutioncasefile-service/query/api/rest/prosecutioncasefile"; - private static final long RETRIEVE_TIMEOUT = 20000; + private static final long RETRIEVE_TIMEOUT = 30000; private static final int POLL_INTERVAL = 500; private static final int POLL_DELAY = 500; protected final RestClient restClient = new RestClient(); diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ActivitiHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ActivitiHelper.java index 249ecd79..a447dbc2 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ActivitiHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ActivitiHelper.java @@ -3,26 +3,25 @@ import static com.jayway.awaitility.Awaitility.await; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.empty; -import static javax.json.Json.createReader; +import static jakarta.json.Json.createReader; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.not; import static uk.gov.justice.services.test.utils.core.http.BaseUriProvider.getBaseUri; import static uk.gov.justice.services.test.utils.core.matchers.JsonValueIsJsonMatcher.isJson; -import uk.gov.justice.services.test.utils.core.rest.RestClient; import uk.gov.justice.services.test.utils.core.rest.ResteasyClientBuilderFactory; import java.io.StringReader; import java.util.Objects; import java.util.Optional; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.jayway.awaitility.core.ConditionTimeoutException; import org.hamcrest.Matcher; @@ -92,10 +91,10 @@ private static void executeJob(final String jobId) { } private static JsonObject runQuery(final String url) { - final RestClient restClient = new RestClient(); - final String contentType = "application/json"; - final Response response = restClient.query(url, contentType); - return createReader(new StringReader(response.readEntity(String.class))).readObject(); + try (Response response = ResteasyClientBuilderFactory.clientBuilder().build() + .target(url).request(MediaType.APPLICATION_JSON_TYPE).get()) { + return createReader(new StringReader(response.readEntity(String.class))).readObject(); + } } private static void sendPostRequest(final String url, final JsonObject payload) { diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddIDPCMaterialHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddIDPCMaterialHelper.java index 754968fb..4c74e4f3 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddIDPCMaterialHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddIDPCMaterialHelper.java @@ -7,7 +7,7 @@ import static com.jayway.awaitility.Awaitility.await; import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath; import static java.lang.String.format; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.hamcrest.Matchers.notNullValue; import static uk.gov.moj.cpp.prosecution.casefile.helper.EventSelector.EVENT_SELECTOR_CASE_DOCUMENT_ADDED; import static uk.gov.moj.cpp.prosecution.casefile.helper.EventSelector.EVENT_SELECTOR_DEFENDANT_IDPC_ALREADY_EXITS; @@ -21,7 +21,7 @@ import java.util.UUID; import java.util.concurrent.Callable; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.github.tomakehurst.wiremock.verification.LoggedRequest; import org.hamcrest.Matcher; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddMaterialHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddMaterialHelper.java index f261f5fc..7cb3bbc3 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddMaterialHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/AddMaterialHelper.java @@ -38,8 +38,8 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import com.jayway.awaitility.Awaitility; import org.hamcrest.CoreMatchers; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/EventSelector.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/EventSelector.java index 69a3ad05..31741482 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/EventSelector.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/EventSelector.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.helper; -import javax.jms.MessageConsumer; +import jakarta.jms.MessageConsumer; public class EventSelector { diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/FileUtil.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/FileUtil.java index 17e44c09..5cce00e6 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/FileUtil.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/FileUtil.java @@ -2,7 +2,7 @@ import static java.lang.ClassLoader.getSystemResourceAsStream; import static java.lang.String.format; -import static javax.json.Json.createReader; +import static jakarta.json.Json.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; @@ -15,8 +15,8 @@ import java.nio.charset.Charset; import java.util.Map; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.google.common.io.Resources; import org.apache.commons.io.IOUtils; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateCCProsecutionHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateCCProsecutionHelper.java index 018520a7..9e9d9435 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateCCProsecutionHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateCCProsecutionHelper.java @@ -13,7 +13,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createReader; +import static jakarta.json.Json.createReader; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -73,8 +73,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.github.tomakehurst.wiremock.verification.LoggedRequest; import org.hamcrest.Matcher; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateGroupProsecutionHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateGroupProsecutionHelper.java index ca3fefe8..6f84457e 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateGroupProsecutionHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateGroupProsecutionHelper.java @@ -14,9 +14,9 @@ import uk.gov.justice.services.test.utils.core.rest.RestClient; import uk.gov.moj.cpp.prosecution.casefile.stub.DocumentGeneratorStub; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -29,7 +29,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static com.jayway.awaitility.Awaitility.waitAtMost; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; import static uk.gov.moj.cpp.prosecution.casefile.helper.EventSelector.EVENT_GROUP_CASES_PARKED_FOR_APPROVAL; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateSjpProsecutionHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateSjpProsecutionHelper.java index 0b4b6e8e..74bc5d8a 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateSjpProsecutionHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/InitiateSjpProsecutionHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.helper; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.Is.is; @@ -34,7 +34,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ProcessCasesCreatedHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ProcessCasesCreatedHelper.java index f6d03e9b..d5cb499f 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ProcessCasesCreatedHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ProcessCasesCreatedHelper.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import io.restassured.path.json.JsonPath; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueryHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueryHelper.java index 819f25fd..5e05972f 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueryHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueryHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.helper; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueueUtil.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueueUtil.java index e9a1dbaa..17d98bc2 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueueUtil.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/QueueUtil.java @@ -14,7 +14,7 @@ public class QueueUtil { private static final Logger LOGGER = LoggerFactory.getLogger(QueueUtil.class); - private static final long RETRIEVE_TIMEOUT = 20000; + private static final long RETRIEVE_TIMEOUT = 30000; public static JsonPath retrieveMessage(final JmsMessageConsumerClient consumer) { return retrieveMessage(consumer, RETRIEVE_TIMEOUT).orElse(null); diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/SubmitCCApplicationHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/SubmitCCApplicationHelper.java index 078644fe..4767e829 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/SubmitCCApplicationHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/SubmitCCApplicationHelper.java @@ -7,7 +7,7 @@ import static com.jayway.awaitility.Awaitility.await; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.json.Json.createReader; +import static jakarta.json.Json.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.jboss.resteasy.util.HttpHeaderNames.ACCEPT; @@ -16,8 +16,8 @@ import com.github.tomakehurst.wiremock.verification.LoggedRequest; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import java.io.StringReader; import java.util.List; import java.util.Optional; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ValidationErrorHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ValidationErrorHelper.java index a2d678d8..8ebdacde 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ValidationErrorHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/ValidationErrorHelper.java @@ -3,13 +3,14 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.format.DateTimeFormatter.ofPattern; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; import static org.skyscreamer.jsonassert.JSONAssert.assertEquals; @@ -139,6 +140,25 @@ public static void queryAndVerifyCaseErrors(final UUID caseId, final String expe assertEquals(expectedCaseErrorsPayload, responseData.getPayload(), customComparator); } + public static void queryAndVerifyCaseErrorsWithCaseLevelErrors(final UUID caseId, final String expectedCaseErrorsPayload, final JSONComparator customComparator) { + final ResponseData responseData = verifyCaseErrors(caseId, allOf( + withJsonPath("$.cases[0].id", equalTo(caseId.toString())), + withJsonPath("$.cases[0].errorDescription", containsString("Error")), + withJsonPath("$.cases[0].errors", hasSize(greaterThan(0))), + withJsonPath("$.cases[0].caseMarkersErrors", hasSize(greaterThan(0))) + )); + assertEquals(expectedCaseErrorsPayload, responseData.getPayload(), customComparator); + } + + public static void queryAndVerifyCaseErrorsWithCaseMarkersErrors(final UUID caseId, final String expectedCaseErrorsPayload, final JSONComparator customComparator) { + final ResponseData responseData = verifyCaseErrors(caseId, allOf( + withJsonPath("$.cases[0].id", equalTo(caseId.toString())), + withJsonPath("$.cases[0].errorDescription", containsString("Error")), + withJsonPath("$.cases[0].caseMarkersErrors", hasSize(greaterThan(0))) + )); + assertEquals(expectedCaseErrorsPayload, responseData.getPayload(), customComparator); + } + public static void queryAndVerifyCaseErrorsEmpty(final UUID caseId, final String expectedCaseErrorsPayload, final JSONComparator customComparator) { final ResponseData responseData = verifyCaseErrors(caseId, allOf( diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/WiremockTestHelper.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/WiremockTestHelper.java index 06e7f777..c3b2e39c 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/WiremockTestHelper.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/helper/WiremockTestHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.helper; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.http.RestPoller.poll; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; @@ -39,7 +39,7 @@ import uk.gov.justice.services.test.utils.core.http.RequestParams; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; /** * Provides helper methods for tests to interact with Wiremock instance diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddApplicationMaterialIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddApplicationMaterialIT.java index eef8a836..67e9a745 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddApplicationMaterialIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddApplicationMaterialIT.java @@ -7,7 +7,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -47,9 +47,9 @@ import java.util.Random; import java.util.UUID; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.github.tomakehurst.wiremock.verification.LoggedRequest; import org.hamcrest.Matchers; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddIDPCMaterialIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddIDPCMaterialIT.java index fbd9dc5e..90b8f3b8 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddIDPCMaterialIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddIDPCMaterialIT.java @@ -38,7 +38,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; import org.json.JSONObject; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddMaterialIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddMaterialIT.java index 393a00a5..79a82f51 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddMaterialIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/AddMaterialIT.java @@ -9,7 +9,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -77,10 +77,10 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; import com.github.tomakehurst.wiremock.verification.LoggedRequest; import com.google.common.collect.ImmutableMap; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/BaseIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/BaseIT.java index 1405d8bc..ad4c7700 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/BaseIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/BaseIT.java @@ -7,7 +7,7 @@ import uk.gov.justice.services.integrationtest.utils.jms.JmsResourceManagementExtension; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.concurrent.atomic.AtomicBoolean; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CaseFileQueryIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CaseFileQueryIT.java index 56da9668..bf3764a6 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CaseFileQueryIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CaseFileQueryIT.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.prosecution.casefile.it; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -19,7 +19,7 @@ import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CpsServeMaterialIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CpsServeMaterialIT.java index 71a48e5a..2f4f482b 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CpsServeMaterialIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/CpsServeMaterialIT.java @@ -30,7 +30,9 @@ import static uk.gov.moj.cpp.prosecution.casefile.stub.ProgressionStub.stubProgressionQueryServiceForForm; import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataOffencesStub.stubOffencesForOffenceCodeList; import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataOffencesStub.stubOffencesForOffenceCodeWithEitherWayModeOfTrial; +import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataStub.stubGetApplicationType; import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataStub.stubGetCaseMarkersWithCode; +import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataStub.stubGetOrganisationUnitWithOneCourtroomForSubmitApplication; import static uk.gov.moj.cpp.prosecution.casefile.stub.TestUtils.readFile; import static uk.gov.moj.cpp.prosecution.casefile.validation.rules.forms.FormConstant.ANY_OTHER; import static uk.gov.moj.cpp.prosecution.casefile.validation.rules.forms.FormConstant.ASN; @@ -66,8 +68,8 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import com.jayway.awaitility.Awaitility; import org.hamcrest.CoreMatchers; @@ -80,6 +82,7 @@ public class CpsServeMaterialIT extends BaseIT { private static final String CASE_MARKER_CODE = "ABC"; + private static final String APPLICATION_TYPE_CODE = "CJ03564"; private static final String PET_PAYLOAD = "stub-data/public.stagingprosecutors.cps-serve-pet-received.json"; private static final String PET_PAYLOAD_ASN_ONLY = "stub-data/public.stagingprosecutors.cps-serve-pet-received_asn_only.json"; private static final String PET_PAYLOAD_CPS_DEFENDANT_ID_ONLY = "stub-data/public.stagingprosecutors.cps-serve-pet-received_cpsDefendantId_only.json"; @@ -187,6 +190,8 @@ public class CpsServeMaterialIT extends BaseIT { @BeforeAll public static void setup() { stubGetCaseMarkersWithCode(CASE_MARKER_CODE); + stubGetOrganisationUnitWithOneCourtroomForSubmitApplication(); + stubGetApplicationType(APPLICATION_TYPE_CODE); } @BeforeEach @@ -233,7 +238,7 @@ public void shouldMovePetFromPendingStatus() { sendPublicEvent(EventSelector.PUBLIC_STAGING_PROSECUTORS_CPS_SERVE_PET_RECEIVED, PET_PAYLOAD, asn1, caseUrn); verifyCCEventAndProgressionCommand(readFile("command-json/prosecutioncasefile.command.initiate-cc-prosecution.json"), caseUrn, caseId); - final String ccApplicationPayLoad = replaceValues(readFile("command-json/prosecutioncasefile.command.submit-application.json"), caseUrn, caseUrn); + final String ccApplicationPayLoad = replaceValues(readFile("command-json/prosecutioncasefile.command.submit-application.json"), APPLICATION_TYPE_CODE, caseUrn); final SubmitCCApplicationHelper submitCCApplicationHelper = new SubmitCCApplicationHelper(EVENT_SELECTOR_INITIATE_APPLICATION_ACCEPTED); submitCCApplicationHelper.submitCCApplication(ccApplicationPayLoad); JsonEnvelope publicEventCpsServeMaterialStatusUpdatedEvent = QueueUtil.getEventFromQueue(publicEventConsumerCpsServeMaterialStatusUpdated); @@ -533,9 +538,8 @@ public void shouldHandleCpsServePtphReceivedWhenCaseUrnPresent_AsnMatchingOnly() public void shouldHandleCpsServeBcmReceivedWhenCaseUrnPresent_OneDefendantMatchedOnly() { final String mismatchedAsn = "ASEC33563LS"; - stubProgressionQueryServiceForForm(caseId, "progression.query.prosecutioncase-for-form-without-cps-defendant-id.json"); createCPPICase(); - + stubProgressionQueryServiceForForm(caseId, "progression.query.prosecutioncase-for-form-without-cps-defendant-id.json"); sendPublicEvent(EventSelector.PUBLIC_STAGING_PROSECUTORS_CPS_SERVE_BCM_RECEIVED, BCM_PAYLOAD_ONLY_ONE_MISMATCHED_ASN, asn1, mismatchedAsn, caseUrn); @@ -560,10 +564,9 @@ public void shouldHandleCpsServeBcmReceivedWhenCaseUrnPresent_OneDefendantMatche public void shouldHandleCpsServePtphReceivedWhenCaseUrnPresent_OneDefendantMatchedOnly() { final String mismatchedAsn = "ASEC33563LS"; + createCPPICase(); stubProgressionQueryServiceForForm(caseId, "progression.query.prosecutioncase-for-form-without-cps-defendant-id.json"); ReferenceDataStub.stubGetOrganisationUnits(); - createCPPICase(); - sendPublicEvent(EventSelector.PUBLIC_STAGING_PROSECUTORS_CPS_SERVE_PTPH_RECEIVED, PTPH_PAYLOAD_ONLY_ONE_MISMATCHED_ASN, caseUrn, asn1, mismatchedAsn); diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/FilteredCaseIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/FilteredCaseIT.java index 6bb04325..cfccd583 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/FilteredCaseIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/FilteredCaseIT.java @@ -22,7 +22,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/GetCountsCasesErrorsIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/GetCountsCasesErrorsIT.java index 3dfbb630..22a0accb 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/GetCountsCasesErrorsIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/GetCountsCasesErrorsIT.java @@ -3,7 +3,7 @@ import static java.lang.String.format; import static java.time.format.DateTimeFormatter.ofPattern; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -36,7 +36,7 @@ import java.util.Map; import java.util.UUID; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import io.restassured.path.json.JsonPath; import org.junit.jupiter.api.BeforeAll; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateCCProsecutionIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateCCProsecutionIT.java index 8389b6f7..bafc4705 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateCCProsecutionIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateCCProsecutionIT.java @@ -57,7 +57,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeAll; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateGroupProsecutionIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateGroupProsecutionIT.java index bd0eddac..b5a357a4 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateGroupProsecutionIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateGroupProsecutionIT.java @@ -5,14 +5,14 @@ import org.junit.jupiter.api.Test; import uk.gov.justice.services.common.converter.LocalDates; import uk.gov.moj.cpp.prosecution.casefile.helper.InitiateGroupProsecutionHelper; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.time.LocalDate; import java.util.UUID; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateSjpProsecutionIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateSjpProsecutionIT.java index 54130d56..9849dde1 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateSjpProsecutionIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/InitiateSjpProsecutionIT.java @@ -6,7 +6,7 @@ import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -77,12 +77,12 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; import com.jayway.jsonpath.ReadContext; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ProcessCasesCreatedIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ProcessCasesCreatedIT.java index 43b953c9..4d0eca76 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ProcessCasesCreatedIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ProcessCasesCreatedIT.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.it; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPrivateJmsMessageProducerClientProvider; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -11,7 +11,7 @@ import uk.gov.justice.services.messaging.Metadata; import uk.gov.moj.cpp.prosecution.casefile.helper.ProcessCasesCreatedHelper; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ResolvedCasesIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ResolvedCasesIT.java index a3e17591..40fcd76c 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ResolvedCasesIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ResolvedCasesIT.java @@ -14,7 +14,7 @@ import uk.gov.moj.cpp.prosecution.casefile.helper.InitiateCCProsecutionHelper; import uk.gov.moj.cpp.prosecution.casefile.helper.ResolveCaseErrorsHelper; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.text.SimpleDateFormat; import java.time.LocalDate; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SpiAddDefendantsValidationErrorIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SpiAddDefendantsValidationErrorIT.java index 13ac6843..2a1604ae 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SpiAddDefendantsValidationErrorIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SpiAddDefendantsValidationErrorIT.java @@ -19,7 +19,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SubmitCCApplicationIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SubmitCCApplicationIT.java index 8d36f3ab..4150d6b6 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SubmitCCApplicationIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/SubmitCCApplicationIT.java @@ -24,12 +24,19 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static com.jayway.awaitility.Awaitility.await; +import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; +import static jakarta.ws.rs.core.Response.Status.OK; import static java.lang.ClassLoader.getSystemResourceAsStream; import static java.lang.String.format; import static java.util.UUID.randomUUID; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; +import static org.hamcrest.Matchers.notNullValue; +import static uk.gov.justice.services.test.utils.core.http.RestPoller.poll; +import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; +import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; import static uk.gov.justice.services.test.utils.core.random.RandomGenerator.BOOLEAN; import static uk.gov.justice.services.test.utils.core.random.RandomGenerator.bigDecimal; +import static uk.gov.moj.cpp.prosecution.casefile.helper.DefaultRequests.getCaseDetailsByProsecutionReferenceIdBuilder; import static uk.gov.moj.cpp.prosecution.casefile.helper.EventSelector.EVENT_SELECTOR_INITIATE_APPLICATION_ACCEPTED; import static uk.gov.moj.cpp.prosecution.casefile.helper.EventSelector.PROSECUTIONCASEFILE_EVENTS_SUBMIT_APPLICATION_VALIDATION_FAILED; import static uk.gov.moj.cpp.prosecution.casefile.stub.NotifyStub.stubNotificationForEmail; @@ -99,7 +106,7 @@ public void shouldRaiseSubmitApplicationAcceptedWhenApiRequestMadeToSubmitCCAppl @Test public void shouldRaiseSubmitApplicationAcceptedWhenApiRequestMadeToSubmitCCApplicationWithPocaDetail() throws SQLException, FileServiceException { - stubForQueryApplication(UUID.fromString("381e06a5-14bb-4ae0-ac71-b7e63d52f3bb")); + stubForQueryApplication(applicationId); stubGetDocumentsTypeAccess("stub-data/referencedata.get-all-document-type-access.json"); final String caseUrn = randomAlphanumeric(10); final UUID caseId = randomUUID(); @@ -213,6 +220,7 @@ private String replaceValues(final String payload, final String applicationTypeC private String replaceValues(final String payload ,final String caseUrn, final UUID pocaFileId ) { return payload + .replaceAll("APPLICATION_ID", this.applicationId.toString()) .replaceAll("POCA_FILE_ID", pocaFileId.toString()) .replaceAll("SOME-RANDOM-APP-CODE", applicationTypeCode) .replaceAll("APPLICATION_DUE_DATE", LocalDate.now().plusDays(2).toString()) @@ -235,9 +243,17 @@ private void verifyCCEventAndProgressionCommand(final String staticPayLoad, fina CoreMatchers.is(1)); sendProgressionCaseCreatedPublicEvent(caseId); + waitForCaseInViewstore(caseUrn); } private void sendProgressionCaseCreatedPublicEvent(final UUID caseId) { sendPublicEvent(EventSelector.PUBLIC_PROGRESSION_CASE_CREATED_EVENT, "stub-data/public.progression.prosecution-case-created.json", caseId.toString()); } + + private void waitForCaseInViewstore(final String caseUrn) { + poll(getCaseDetailsByProsecutionReferenceIdBuilder(caseUrn)) + .timeout(30L, TimeUnit.SECONDS) + .pollInterval(1L, TimeUnit.SECONDS) + .until(status().is(OK), payload().isJson(withJsonPath("$.caseId", notNullValue()))); + } } diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorForNoProsecutorAndOrganisationUnitIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorForNoProsecutorAndOrganisationUnitIT.java index 3fbe015e..8a4d48f5 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorForNoProsecutorAndOrganisationUnitIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorForNoProsecutorAndOrganisationUnitIT.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.it; -import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -26,6 +26,7 @@ import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.assertErrorsExpected; import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.getCustomComparator; import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.queryAndVerifyCaseErrors; +import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.queryAndVerifyCaseErrorsWithCaseLevelErrors; import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataStub.stubGetCaseMarkersWithCode; import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataStub.stubGetOrganisationUnitWithNotFound; import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataStub.stubGetOrganisationUnitWithOneCourtroom; @@ -60,7 +61,7 @@ public static void setupOnce() { stubGetOrganisationUnitWithNotFound(); } - @AfterClass + @AfterAll public static void resetProsecutorAndOrganisationUnit() { stubGetOrganisationUnits(); } @@ -97,7 +98,7 @@ public void shouldRaiseValidationErrorWhenPayloadHasErrors() { assertErrorsExpected("expected/case_validation_error_problems.json", privateEvent2.get()); final String expectedErrorsPayload = readFile("expected/expected_case_errors.json"); - queryAndVerifyCaseErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "B", "2022-04-04", OFFENCE_ID, + queryAndVerifyCaseErrorsWithCaseLevelErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "B", "2022-04-04", OFFENCE_ID, ERROR_LIST.toArray(new String[0]))); @@ -162,7 +163,7 @@ public void shouldRaiseValidationErrorWhenPayloadHasErrorsWithInvalidCourtHearin assertErrorsExpected("expected/case_validation_error_problems.json", privateEvent2.get()); final String expectedErrorsPayload = readFile("expected/expected_case_errors_with_invalid_court_hearing_location.json"); - queryAndVerifyCaseErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "B", "2022-04-04", OFFENCE_ID, + queryAndVerifyCaseErrorsWithCaseLevelErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "B", "2022-04-04", OFFENCE_ID, ERROR_LIST.toArray(new String[0]))); } diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorIT.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorIT.java index 290574ff..1edbb619 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorIT.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/it/ValidationErrorIT.java @@ -54,6 +54,7 @@ import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.queryAndVerifyCaseErrors; import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.queryAndVerifyCaseErrorsEmpty; import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.queryAndVerifyCaseErrorsForDefendants; +import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.queryAndVerifyCaseErrorsWithCaseMarkersErrors; import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.queryAndVerifyCasesAreEmptyCollection; import static uk.gov.moj.cpp.prosecution.casefile.helper.ValidationErrorHelper.replaceExpectedValues; import static uk.gov.moj.cpp.prosecution.casefile.stub.ReferenceDataOffencesStub.stubOffencesForGenericOffence; @@ -172,7 +173,7 @@ public void shouldRaiseValidationErrorWhenInvalidCustodyStatus() { initiateCCProsecutionHelper.thenEventsShouldBeRaised(new String[]{PUBLIC_PROSECUTIONCASEFILE_DEFENDANT_VALIDATION_FAILED, PUBLIC_PROSECUTIONCASEFILE_CASE_VALIDATION_FAILED }); final String expectedErrorsPayload = readFile("expected/expected_case_invalid_custody_status_errors.json"); - queryAndVerifyCaseErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "A", "2015-04-04", "032575aa-85e7-11e9-bc42-526af7764f64", "CASE_MARKER_IS_INVALID", "DEFENDANT_CUSTODY_STATUS_INVALID")); + queryAndVerifyCaseErrorsWithCaseMarkersErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "A", "2015-04-04", "032575aa-85e7-11e9-bc42-526af7764f64", "CASE_MARKER_IS_INVALID", "DEFENDANT_CUSTODY_STATUS_INVALID")); } @@ -241,7 +242,7 @@ public void shouldRaiseValidationErrorInvalidWhenStatementOfFacts() { initiateCCProsecutionHelper.thenEventsShouldBeRaised(new String[]{ PUBLIC_PROSECUTIONCASEFILE_DEFENDANT_VALIDATION_FAILED, PUBLIC_PROSECUTIONCASEFILE_CASE_VALIDATION_FAILED }); final String expectedErrorsPayload = readFile("expected/expected_case_invalid_statement_of_facts.json"); - queryAndVerifyCaseErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "C", "2015-04-04", "032575aa-85e7-11e9-bc42-526af7764f64", "CASE_MARKER_IS_INVALID", "STATEMENT_OF_FACTS_REQUIRED")); + queryAndVerifyCaseErrorsWithCaseMarkersErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "C", "2015-04-04", "032575aa-85e7-11e9-bc42-526af7764f64", "CASE_MARKER_IS_INVALID", "STATEMENT_OF_FACTS_REQUIRED")); } @@ -320,7 +321,7 @@ public void shouldRaiseValidationErrorInvalidWhenStatementOfFactsWelsh() { assertErrorsExpected("expected/invalid_statement_of_facts_welsh_problem.json", privateEvent.get()); final String expectedErrorsPayload = readFile("expected/case_invalid_statement_of_facts_welsh.json"); - queryAndVerifyCaseErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "C", "2015-04-04", "032575aa-85e7-11e9-bc42-526af7764f64", "CASE_MARKER_IS_INVALID", "STATEMENT_OF_FACTS_WELSH_REQUIRED")); + queryAndVerifyCaseErrorsWithCaseMarkersErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "C", "2015-04-04", "032575aa-85e7-11e9-bc42-526af7764f64", "CASE_MARKER_IS_INVALID", "STATEMENT_OF_FACTS_WELSH_REQUIRED")); } @@ -338,7 +339,7 @@ public void shouldRaiseValidationErrorInvalidBailConditions() { initiateCCProsecutionHelper.thenEventsShouldBeRaised(new String[]{ PUBLIC_PROSECUTIONCASEFILE_DEFENDANT_VALIDATION_FAILED }); final String expectedErrorsPayload = readFile("expected/case_invalid_bail_condition.json"); - queryAndVerifyCaseErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "B", "2015-04-04", "", "BAIL_CONDITIONS_REQUIRED", "CASE_MARKER_IS_INVALID")); + queryAndVerifyCaseErrorsWithCaseMarkersErrors(caseId, expectedErrorsPayload, getCustomComparator(caseId.toString(), "B", "2015-04-04", "", "BAIL_CONDITIONS_REQUIRED", "CASE_MARKER_IS_INVALID")); } @Test diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/CreateSjpCaseStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/CreateSjpCaseStub.java index 75dcea09..684f6304 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/CreateSjpCaseStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/CreateSjpCaseStub.java @@ -10,7 +10,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.jayway.awaitility.Awaitility.await; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/DocumentGeneratorStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/DocumentGeneratorStub.java index 82e48784..40487cfe 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/DocumentGeneratorStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/DocumentGeneratorStub.java @@ -12,8 +12,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static com.github.tomakehurst.wiremock.client.WireMock.verify; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.Response.Status.OK; public class DocumentGeneratorStub { diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/IdMapperStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/IdMapperStub.java index 823ceda0..837a268c 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/IdMapperStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/IdMapperStub.java @@ -6,14 +6,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static uk.gov.moj.cpp.prosecution.casefile.helper.WiremockTestHelper.waitForStubToBeReady; import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpHeaders; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/MaterialStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/MaterialStub.java index a3f71082..a2a2a3ce 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/MaterialStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/MaterialStub.java @@ -6,7 +6,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.moj.cpp.prosecution.casefile.helper.WiremockTestHelper.waitForStubToBeReady; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/NotifyStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/NotifyStub.java index 956eecc5..96754663 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/NotifyStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/NotifyStub.java @@ -5,9 +5,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static uk.gov.justice.service.wiremock.testutil.InternalEndpointMockUtils.stubPingFor; import static uk.gov.justice.services.common.http.HeaderConstants.ID; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ProgressionStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ProgressionStub.java index 2d3c548d..94646157 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ProgressionStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ProgressionStub.java @@ -10,7 +10,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.justice.service.wiremock.testutil.InternalEndpointMockUtils.stubPingFor; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ReferenceDataStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ReferenceDataStub.java index 4a9e4fdb..b075b897 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ReferenceDataStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/ReferenceDataStub.java @@ -18,7 +18,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class ReferenceDataStub extends StubUtil { diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/SjpStub.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/SjpStub.java index 4f8471cd..49bf2099 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/SjpStub.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/SjpStub.java @@ -11,10 +11,10 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.ACCEPT; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.HttpHeaders.ACCEPT; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.justice.service.wiremock.testutil.InternalEndpointMockUtils.stubPingFor; diff --git a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/StubUtil.java b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/StubUtil.java index eb39e597..9a083681 100644 --- a/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/StubUtil.java +++ b/prosecutioncasefile-integration-test/src/test/java/uk/gov/moj/cpp/prosecution/casefile/stub/StubUtil.java @@ -10,7 +10,7 @@ import static uk.gov.justice.service.wiremock.testutil.InternalEndpointMockUtils.stubPingFor; import static uk.gov.moj.cpp.prosecution.casefile.helper.FileUtil.resourceToString; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; public class StubUtil { diff --git a/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca-invalid-details.json b/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca-invalid-details.json index e5c211d5..11c8da8e 100644 --- a/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca-invalid-details.json +++ b/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca-invalid-details.json @@ -1,6 +1,6 @@ { "courtApplication": { - "id": "381e06a5-14bb-4ae0-ac71-b7e63d52f3bb", + "id": "APPLICATION_ID", "courtApplicationCases": [ { "caseURN": "CASE_URN", diff --git a/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca.json b/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca.json index fa40264d..13635256 100644 --- a/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca.json +++ b/prosecutioncasefile-integration-test/src/test/resources/command-json/prosecutioncasefile.command.submit-application-poca.json @@ -1,6 +1,6 @@ { "courtApplication": { - "id": "381e06a5-14bb-4ae0-ac71-b7e63d52f3bb", + "id": "APPLICATION_ID", "courtApplicationCases": [ { "caseURN": "CASE_URN", diff --git a/prosecutioncasefile-integration-test/src/test/resources/stub-data/public.progression.court-application-event-created.json b/prosecutioncasefile-integration-test/src/test/resources/stub-data/public.progression.court-application-event-created.json index 3dabe945..ec824e91 100644 --- a/prosecutioncasefile-integration-test/src/test/resources/stub-data/public.progression.court-application-event-created.json +++ b/prosecutioncasefile-integration-test/src/test/resources/stub-data/public.progression.court-application-event-created.json @@ -95,7 +95,7 @@ "caseStatus": "ACTIVE" } ], - "id": "381e06a5-14bb-4ae0-ac71-b7e63d52f3bb", + "id": "%s", "applicationReference": "CJ03564AS", "respondents": [ { diff --git a/prosecutioncasefile-progression-service/pom.xml b/prosecutioncasefile-progression-service/pom.xml index 334b7ade..5d7fafff 100644 --- a/prosecutioncasefile-progression-service/pom.xml +++ b/prosecutioncasefile-progression-service/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -11,8 +11,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionService.java b/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionService.java index 56034300..c56ab422 100644 --- a/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionService.java +++ b/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionService.java @@ -4,7 +4,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface ProgressionService { diff --git a/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionServiceImpl.java b/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionServiceImpl.java index 358a6360..894e71b2 100644 --- a/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionServiceImpl.java +++ b/prosecutioncasefile-progression-service/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ProgressionServiceImpl.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; @@ -15,8 +15,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ProgressionServiceImpl implements ProgressionService { diff --git a/prosecutioncasefile-progression-service/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-progression-service/src/main/resources/META-INF/beans.xml index ce2829b7..be799004 100755 --- a/prosecutioncasefile-progression-service/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-progression-service/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/prosecutioncasefile-query/pom.xml b/prosecutioncasefile-query/pom.xml index 3d3f3349..b21ce397 100755 --- a/prosecutioncasefile-query/pom.xml +++ b/prosecutioncasefile-query/pom.xml @@ -4,7 +4,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/pom.xml b/prosecutioncasefile-query/prosecutioncasefile-query-api/pom.xml index 0bf277d9..fe80fdc5 100755 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/pom.xml +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-query - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -17,8 +17,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -110,6 +110,11 @@ test-utils-enveloper-provider test + + org.slf4j + slf4j-simple + test + @@ -118,8 +123,8 @@ rest-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApi.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApi.java index 7d9d24b6..95dff7eb 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApi.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApi.java @@ -10,8 +10,8 @@ import uk.gov.moj.cpp.prosecution.casefile.query.api.service.DefendantType; import uk.gov.moj.cpp.prosecutioncasefile.query.view.ProsecutionCasefileQueryView; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import java.time.LocalDate; import java.time.format.DateTimeParseException; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverter.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverter.java index 670ef3bc..e8741989 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverter.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverter.java @@ -15,8 +15,8 @@ import uk.gov.moj.cpp.prosecution.casefile.query.api.service.vo.PersonalDetails; import uk.gov.moj.cpp.prosecution.casefile.query.api.utils.OffenceHelper; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import java.util.ArrayList; import java.util.List; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenService.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenService.java index b3c30a50..6c08c679 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenService.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenService.java @@ -9,7 +9,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.moj.cpp.prosecution.casefile.query.api.service.DefendantType.LEGAL_ENTITY; import static uk.gov.moj.cpp.prosecution.casefile.query.api.service.DefendantType.PERSON; import static uk.gov.moj.cpp.prosecution.casefile.query.api.service.SjpService.INITIATION_CODE; @@ -37,9 +37,9 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionService.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionService.java index 2b070661..a8e9530c 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionService.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionService.java @@ -11,8 +11,8 @@ import uk.gov.moj.cpp.prosecution.casefile.query.api.service.vo.CaseDefendantHearings; import uk.gov.moj.cpp.prosecution.casefile.query.api.service.vo.CaseDetail; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import java.util.List; import java.util.Optional; import java.util.function.Predicate; @@ -23,7 +23,7 @@ import static java.util.Objects.nonNull; import static java.util.Optional.empty; import static java.util.Optional.of; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; public class ProgressionService { diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ReferenceOffencesDataService.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ReferenceOffencesDataService.java index e8031d3a..04eacf62 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ReferenceOffencesDataService.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ReferenceOffencesDataService.java @@ -4,10 +4,10 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; public class ReferenceOffencesDataService { diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpService.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpService.java index b84e4c54..a27946ad 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpService.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpService.java @@ -3,9 +3,9 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.Envelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; public class SjpService { diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelper.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelper.java index 47f053f3..a2609bf8 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelper.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.query.api.utils; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import static java.util.Arrays.asList; import static java.util.Objects.isNull; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100755 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/uk.gov.moj.cpp.peosecution.casefile.query.api.accesscontrol/prosecutioncasefileQueryApi.drl b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/uk/gov/moj/cpp/prosecution/casefile/query/api/accesscontrol/prosecutioncasefileQueryApi.drl similarity index 100% rename from prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/uk.gov.moj.cpp.peosecution.casefile.query.api.accesscontrol/prosecutioncasefileQueryApi.drl rename to prosecutioncasefile-query/prosecutioncasefile-query-api/src/main/resources/uk/gov/moj/cpp/prosecution/casefile/query/api/accesscontrol/prosecutioncasefileQueryApi.drl diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApiTest.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApiTest.java index 8b878af1..3531a89b 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApiTest.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/CasefileQueryApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.query.api; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -24,8 +24,8 @@ import java.time.LocalDate; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverterTest.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverterTest.java index f1a3baac..90e01472 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverterTest.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseDetailConverterTest.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenServiceTest.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenServiceTest.java index c69e5421..8e81e3cf 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenServiceTest.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/CaseForCitizenServiceTest.java @@ -5,8 +5,8 @@ import static java.util.Collections.singletonList; import static java.util.Optional.empty; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -47,9 +47,9 @@ import java.util.List; import java.util.Optional; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionServiceTest.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionServiceTest.java index 09432425..570d32d1 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionServiceTest.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/ProgressionServiceTest.java @@ -3,8 +3,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -44,7 +44,7 @@ import java.util.List; import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpServiceTest.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpServiceTest.java index 2e18b548..7a13bfae 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpServiceTest.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/SjpServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecution.casefile.query.api.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -16,7 +16,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.Metadata; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/CaseDefendantHearingsTest.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/CaseDefendantHearingsTest.java index de1df760..2ab57183 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/CaseDefendantHearingsTest.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/CaseDefendantHearingsTest.java @@ -49,14 +49,14 @@ public void shouldDeserializeJsonToCaseDefendantHearings() { assertThat(caseDefendantHearings.getCaseId(), is(caseId)); assertThat(caseDefendantHearings.getDefendantId(), is(defendantId)); - assertThat(caseDefendantHearings.getHearings().get(0).getHearingDays().get(0).getSittingDay(), is(sittingDay)); + assertThat(caseDefendantHearings.getHearings().get(0).getHearingDays().get(0).getSittingDay().toInstant(), is(sittingDay.toInstant())); } @Test public void shouldGetEarliestHearingDayAndEvaluateIfEarliestHearingDayInThePast() { final CaseDefendantHearings caseDefendantHearings = jsonObjectToObjectConverter.convert(readJsonResource(JSON_RESPONSE_FILE, caseId, defendantId, sittingDay.format(ZONE_DATETIME_FORMATTER)), CaseDefendantHearings.class); - assertThat(caseDefendantHearings.getEarliestHearingDay(), is(sittingDay)); + assertThat(caseDefendantHearings.getEarliestHearingDay().toInstant(), is(sittingDay.toInstant())); assertThat(caseDefendantHearings.isEarliestHearingDayInThePast(), is(true)); } diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/FileUtil.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/FileUtil.java index 539b67f0..c9a05ac6 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/FileUtil.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/service/vo/FileUtil.java @@ -2,7 +2,7 @@ import static java.lang.ClassLoader.getSystemResourceAsStream; import static java.lang.String.format; -import static javax.json.Json.createReader; +import static jakarta.json.Json.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; @@ -13,8 +13,8 @@ import java.io.StringReader; import java.io.UncheckedIOException; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelperTest.java b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelperTest.java index 7246cdd3..4619947a 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelperTest.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-api/src/test/java/uk/gov/moj/cpp/prosecution/casefile/query/api/utils/OffenceHelperTest.java @@ -1,12 +1,12 @@ package uk.gov.moj.cpp.prosecution.casefile.query.api.utils; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import java.util.stream.Stream; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-view/pom.xml b/prosecutioncasefile-query/prosecutioncasefile-query-view/pom.xml index 7eee0d21..7f7c405a 100755 --- a/prosecutioncasefile-query/prosecutioncasefile-query-view/pom.xml +++ b/prosecutioncasefile-query/prosecutioncasefile-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-query - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -13,8 +13,13 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api + provided + + + org.hibernate.orm + hibernate-core provided @@ -33,7 +38,8 @@ org.glassfish - javax.json + jakarta.json + 2.0.1 org.junit.jupiter diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/ProsecutionCasefileQueryView.java b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/ProsecutionCasefileQueryView.java index eee028f4..b40770cc 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/ProsecutionCasefileQueryView.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/ProsecutionCasefileQueryView.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecutioncasefile.query.view; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; @@ -26,10 +26,10 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.persistence.NoResultException; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; +import jakarta.persistence.NoResultException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/response/ErrorCaseDetails.java b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/response/ErrorCaseDetails.java index d7deaf21..a55ac867 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/response/ErrorCaseDetails.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/response/ErrorCaseDetails.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecutioncasefile.query.view.response; -import javax.json.JsonArray; +import jakarta.json.JsonArray; @SuppressWarnings("squid:S2384") public class ErrorCaseDetails { diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/BusinessErrorDetailsService.java b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/BusinessErrorDetailsService.java index 8e20ae47..fa5f54a8 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/BusinessErrorDetailsService.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/BusinessErrorDetailsService.java @@ -33,9 +33,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonReader; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonReader; @SuppressWarnings({"squid:S1612"}) public class BusinessErrorDetailsService { diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CaseDetailsService.java b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CaseDetailsService.java index acec06a0..4b70fbb2 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CaseDetailsService.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CaseDetailsService.java @@ -5,8 +5,8 @@ import uk.gov.moj.cpp.prosecutioncasefile.persistence.repository.CaseDetailsRepository; import uk.gov.moj.cpp.prosecutioncasefile.query.view.response.CaseDetailsView; -import javax.inject.Inject; -import javax.persistence.EntityNotFoundException; +import jakarta.inject.Inject; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import java.util.Objects; import java.util.UUID; diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CountsCasesErrorsService.java b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CountsCasesErrorsService.java index 94c60950..772152c6 100644 --- a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CountsCasesErrorsService.java +++ b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/query/view/service/CountsCasesErrorsService.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; public class CountsCasesErrorsService { diff --git a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100755 --- a/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-query/prosecutioncasefile-query-view/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-refdata/pom.xml b/prosecutioncasefile-refdata/pom.xml index 43b9a966..280e399c 100644 --- a/prosecutioncasefile-refdata/pom.xml +++ b/prosecutioncasefile-refdata/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -11,8 +11,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/AlcoholLevelMethodsRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/AlcoholLevelMethodsRefDataEnricher.java index fb9a4c2b..c5ad98c0 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/AlcoholLevelMethodsRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/AlcoholLevelMethodsRefDataEnricher.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class AlcoholLevelMethodsRefDataEnricher implements DefendantRefDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/HearingTypesRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/HearingTypesRefDataEnricher.java index a6b7c5ae..2ce699e3 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/HearingTypesRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/HearingTypesRefDataEnricher.java @@ -6,7 +6,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.HearingTypes; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/InitiationTypesRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/InitiationTypesRefDataEnricher.java index e5feb33d..0da1e7ee 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/InitiationTypesRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/InitiationTypesRefDataEnricher.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class InitiationTypesRefDataEnricher implements RefDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ModeOfTrialRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ModeOfTrialRefDataEnricher.java index 02877115..db549289 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ModeOfTrialRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ModeOfTrialRefDataEnricher.java @@ -12,7 +12,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ModeOfTrialRefDataEnricher implements DefendantRefDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/NationalityRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/NationalityRefDataEnricher.java index e663d187..c8871389 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/NationalityRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/NationalityRefDataEnricher.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; public class NationalityRefDataEnricher implements DefendantRefDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ObservedEthnicityRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ObservedEthnicityRefDataEnricher.java index 6d54d6bc..8accd852 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ObservedEthnicityRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/ObservedEthnicityRefDataEnricher.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ObservedEthnicityRefDataEnricher implements DefendantRefDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OffenceDataRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OffenceDataRefDataEnricher.java index 0bddf5f4..81696598 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OffenceDataRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OffenceDataRefDataEnricher.java @@ -16,7 +16,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.google.common.collect.Lists; diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OrganisationUnitWithCourtroomRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OrganisationUnitWithCourtroomRefDataEnricher.java index 41f1d162..638f6e8d 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OrganisationUnitWithCourtroomRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/OrganisationUnitWithCourtroomRefDataEnricher.java @@ -7,7 +7,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OrganisationUnitWithCourtroomReferenceData; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/SelfDefineEthnictyRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/SelfDefineEthnictyRefDataEnricher.java index 0e7e443b..36bce85e 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/SelfDefineEthnictyRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/SelfDefineEthnictyRefDataEnricher.java @@ -8,7 +8,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class SelfDefineEthnictyRefDataEnricher implements DefendantRefDataEnricher { @Inject diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/VehicleCodeRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/VehicleCodeRefDataEnricher.java index c3d0be6b..521d0c85 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/VehicleCodeRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/defendant/VehicleCodeRefDataEnricher.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class VehicleCodeRefDataEnricher implements DefendantRefDataEnricher { @Inject diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesInitiationCodeReferenceDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesInitiationCodeReferenceDataEnricher.java index aa27fd69..daa515d9 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesInitiationCodeReferenceDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesInitiationCodeReferenceDataEnricher.java @@ -2,7 +2,7 @@ import uk.gov.moj.cpp.prosecution.casefile.domain.ProsecutionWithReferenceData; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; public class GroupCasesInitiationCodeReferenceDataEnricher implements GroupCasesReferenceDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesProsecutorReferenceDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesProsecutorReferenceDataEnricher.java index 204af7d9..5706ff2a 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesProsecutorReferenceDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/GroupCasesProsecutorReferenceDataEnricher.java @@ -8,7 +8,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.Prosecutor; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.ProsecutorsReferenceData; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; public class GroupCasesProsecutorReferenceDataEnricher implements GroupCasesReferenceDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/HearingTypesRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/HearingTypesRefDataEnricher.java index 23239c75..d80e4527 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/HearingTypesRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/HearingTypesRefDataEnricher.java @@ -6,7 +6,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.HearingTypes; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/InitiationTypesRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/InitiationTypesRefDataEnricher.java index 4d26bf48..366810fd 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/InitiationTypesRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/InitiationTypesRefDataEnricher.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class InitiationTypesRefDataEnricher implements CaseRefDataEnricher { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/ProsecutorRefDataEnricher.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/ProsecutorRefDataEnricher.java index 21dea11f..8749155c 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/ProsecutorRefDataEnricher.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/refdata/proscase/ProsecutorRefDataEnricher.java @@ -9,7 +9,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.ProsecutorsReferenceData; import uk.gov.moj.cpp.prosecution.casefile.service.ReferenceDataQueryService; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/RefDataHelper.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/RefDataHelper.java index 2437b213..99a524f3 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/RefDataHelper.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/RefDataHelper.java @@ -1,9 +1,11 @@ package uk.gov.moj.cpp.prosecution.casefile.service; import static uk.gov.moj.cpp.prosecution.casefile.json.schemas.CaseMarker.caseMarker; +import static uk.gov.moj.cpp.prosecution.casefile.json.schemas.CourtRoom.courtRoom; import static uk.gov.moj.cpp.prosecution.casefile.json.schemas.OffenceDateCodeReferenceData.offenceDateCodeReferenceData; import static uk.gov.moj.cpp.prosecution.casefile.json.schemas.OffenderCodeReferenceData.offenderCodeReferenceData; import static uk.gov.moj.cpp.prosecution.casefile.json.schemas.OrganisationUnitReferenceData.organisationUnitReferenceData; +import static uk.gov.moj.cpp.prosecution.casefile.json.schemas.OrganisationUnitWithCourtroomReferenceData.organisationUnitWithCourtroomReferenceData; import uk.gov.justice.core.courts.CourtApplicationType; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; @@ -20,6 +22,7 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OffenceDateCodeReferenceData; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OffenceReferenceData; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OffenderCodeReferenceData; +import uk.gov.moj.cpp.prosecution.casefile.json.schemas.CourtRoom; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OrganisationUnitReferenceData; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OrganisationUnitWithCourtroomReferenceData; import uk.gov.moj.cpp.prosecution.casefile.json.schemas.PoliceForceReferenceData; @@ -36,9 +39,9 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; @@ -263,14 +266,48 @@ public static Function asOffenderCodeRefDa public static Function asOrganisationUnitWithCourtroomRefData() { return jsonValue -> { - try { - return OBJECT_MAPPER.readValue(jsonValue.toString(), OrganisationUnitWithCourtroomReferenceData.class); - } catch (IOException e) { - LOGGER.error("Unable to unmarshal OrganisationUnitWithCourtroomReferenceDataId: {}", jsonValue.asJsonObject().getString(FIELD_ID, DEFAULT_VALUE), e); - return null; + final JsonObject refDataObject = (JsonObject) jsonValue; + final OrganisationUnitWithCourtroomReferenceData.Builder builder = organisationUnitWithCourtroomReferenceData(); + + getStringFromJson(FIELD_ID, refDataObject).ifPresent(builder::withId); + getStringFromJson(OUCODE, refDataObject).ifPresent(builder::withOucode); + getStringFromJson("oucodeL1Code", refDataObject).ifPresent(builder::withOucodeL1Code); + getStringFromJson("oucodeL1Name", refDataObject).ifPresent(builder::withOucodeL1Name); + getStringFromJson("oucodeL3Code", refDataObject).ifPresent(builder::withOucodeL3Code); + getStringFromJson("oucodeL3Name", refDataObject).ifPresent(builder::withOucodeL3Name); + getStringFromJson("oucodeL3WelshName", refDataObject).ifPresent(builder::withOucodeL3WelshName); + getStringFromJson("address1", refDataObject).ifPresent(builder::withAddress1); + getStringFromJson("address2", refDataObject).ifPresent(builder::withAddress2); + getStringFromJson("address3", refDataObject).ifPresent(builder::withAddress3); + getStringFromJson("address4", refDataObject).ifPresent(builder::withAddress4); + getStringFromJson("address5", refDataObject).ifPresent(builder::withAddress5); + getStringFromJson("postcode", refDataObject).ifPresent(builder::withPostcode); + getStringFromJson("welshAddress1", refDataObject).ifPresent(builder::withWelshAddress1); + getStringFromJson("welshAddress2", refDataObject).ifPresent(builder::withWelshAddress2); + getStringFromJson("welshAddress3", refDataObject).ifPresent(builder::withWelshAddress3); + getStringFromJson("welshAddress4", refDataObject).ifPresent(builder::withWelshAddress4); + getStringFromJson("welshAddress5", refDataObject).ifPresent(builder::withWelshAddress5); + getStringFromJson("defaultStartTime", refDataObject).ifPresent(builder::withDefaultStartTime); + getStringFromJson("defaultDurationHrs", refDataObject).ifPresent(builder::withDefaultDurationHrs); + + if (refDataObject.containsKey("isWelsh") && !refDataObject.isNull("isWelsh")) { + builder.withIsWelsh(refDataObject.getBoolean("isWelsh")); } + + if (refDataObject.containsKey("courtRoom") && !refDataObject.isNull("courtRoom")) { + builder.withCourtRoom(buildCourtRoom(refDataObject.getJsonObject("courtRoom"))); + } + + return builder.build(); }; + } + private static CourtRoom buildCourtRoom(final JsonObject courtRoomJson) { + final CourtRoom.Builder builder = courtRoom(); + getStringFromJson(FIELD_ID, courtRoomJson).ifPresent(builder::withId); + getIntFromJson("courtroomId", courtRoomJson).ifPresent(builder::withCourtroomId); + getStringFromJson("courtroomName", courtRoomJson).ifPresent(builder::withCourtroomName); + return builder.build(); } public static Function asOrganisationUnitRefData() { diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryService.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryService.java index c9d07498..244e43ba 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryService.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryService.java @@ -33,7 +33,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceImpl.java b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceImpl.java index 0dc14d87..60d3be76 100644 --- a/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceImpl.java +++ b/prosecutioncasefile-refdata/src/main/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceImpl.java @@ -5,7 +5,7 @@ import static java.util.Optional.of; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -77,11 +77,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-refdata/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-refdata/src/main/resources/META-INF/beans.xml index ce2829b7..be799004 100755 --- a/prosecutioncasefile-refdata/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-refdata/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/RefDataHelperTest.java b/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/RefDataHelperTest.java new file mode 100644 index 00000000..2ea49483 --- /dev/null +++ b/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/RefDataHelperTest.java @@ -0,0 +1,140 @@ +package uk.gov.moj.cpp.prosecution.casefile.service; + +import static jakarta.json.Json.createObjectBuilder; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; + +import uk.gov.moj.cpp.prosecution.casefile.json.schemas.OrganisationUnitWithCourtroomReferenceData; + +import jakarta.json.JsonObject; + +import org.junit.jupiter.api.Test; + +public class RefDataHelperTest { + + @Test + public void shouldMapAllRequiredFieldsFromJsonToOrganisationUnitWithCourtroomReferenceData() { + final JsonObject json = createObjectBuilder() + .add("id", "f8254db1-1683-483e-afb3-b87fde5a0a26") + .add("oucode", "C55BN00") + .add("oucodeL1Code", "C") + .add("oucodeL1Name", "Magistrates' Courts") + .add("oucodeL3Code", "B01KR") + .add("oucodeL3Name", "Port Talbot") + .add("oucodeL3WelshName", "Welsh Name") + .add("address1", "The Court House") + .add("address2", "Cramic Way") + .add("address3", "Port Talbot") + .add("address4", "West Glam.") + .add("address5", "address line 5") + .add("postcode", "SA13 1RU") + .add("defaultStartTime", "10:30") + .add("defaultDurationHrs", "10:30") + .build(); + + final OrganisationUnitWithCourtroomReferenceData result = RefDataHelper.asOrganisationUnitWithCourtroomRefData().apply(json); + + assertThat(result, is(notNullValue())); + assertThat(result.getId(), is("f8254db1-1683-483e-afb3-b87fde5a0a26")); + assertThat(result.getOucode(), is("C55BN00")); + assertThat(result.getOucodeL1Code(), is("C")); + assertThat(result.getOucodeL1Name(), is("Magistrates' Courts")); + assertThat(result.getOucodeL3Code(), is("B01KR")); + assertThat(result.getOucodeL3Name(), is("Port Talbot")); + assertThat(result.getOucodeL3WelshName(), is("Welsh Name")); + assertThat(result.getAddress1(), is("The Court House")); + assertThat(result.getAddress2(), is("Cramic Way")); + assertThat(result.getDefaultStartTime(), is("10:30")); + assertThat(result.getDefaultDurationHrs(), is("10:30")); + } + + @Test + public void shouldMapNestedCourtRoomWhenPresent() { + final JsonObject json = createObjectBuilder() + .add("id", "f8254db1-1683-483e-afb3-b87fde5a0a26") + .add("oucode", "C55BN00") + .add("oucodeL1Code", "C") + .add("oucodeL1Name", "Magistrates' Courts") + .add("oucodeL3Code", "B01KR") + .add("oucodeL3Name", "Port Talbot") + .add("address1", "The Court House") + .add("address2", "Cramic Way") + .add("defaultStartTime", "10:30") + .add("defaultDurationHrs", "10:30") + .add("courtRoom", createObjectBuilder() + .add("id", "9e4932f7-97b2-3010-b942-ddd2624e4dd8") + .add("courtroomId", 2330) + .add("courtroomName", "Courtroom 01")) + .build(); + + final OrganisationUnitWithCourtroomReferenceData result = RefDataHelper.asOrganisationUnitWithCourtroomRefData().apply(json); + + assertThat(result.getCourtRoom(), is(notNullValue())); + assertThat(result.getCourtRoom().getId(), is("9e4932f7-97b2-3010-b942-ddd2624e4dd8")); + assertThat(result.getCourtRoom().getCourtroomId(), is(2330)); + assertThat(result.getCourtRoom().getCourtroomName(), is("Courtroom 01")); + } + + @Test + public void shouldLeaveCourtRoomNullWhenAbsentFromJson() { + final JsonObject json = createObjectBuilder() + .add("id", "f8254db1-1683-483e-afb3-b87fde5a0a26") + .add("oucode", "C55BN00") + .add("oucodeL1Code", "C") + .add("oucodeL1Name", "Magistrates' Courts") + .add("oucodeL3Code", "B01KR") + .add("oucodeL3Name", "Port Talbot") + .add("address1", "The Court House") + .add("address2", "Cramic Way") + .add("defaultStartTime", "10:30") + .add("defaultDurationHrs", "10:30") + .build(); + + final OrganisationUnitWithCourtroomReferenceData result = RefDataHelper.asOrganisationUnitWithCourtroomRefData().apply(json); + + assertThat(result.getCourtRoom(), is(nullValue())); + } + + @Test + public void shouldMapIsWelshWhenPresent() { + final JsonObject json = createObjectBuilder() + .add("id", "abc") + .add("oucode", "C55BN00") + .add("oucodeL1Code", "C") + .add("oucodeL1Name", "Magistrates' Courts") + .add("oucodeL3Code", "B01KR") + .add("oucodeL3Name", "Port Talbot") + .add("address1", "The Court House") + .add("address2", "Cramic Way") + .add("defaultStartTime", "10:30") + .add("defaultDurationHrs", "10:30") + .add("isWelsh", true) + .build(); + + final OrganisationUnitWithCourtroomReferenceData result = RefDataHelper.asOrganisationUnitWithCourtroomRefData().apply(json); + + assertThat(result.getIsWelsh(), is(true)); + } + + @Test + public void shouldLeaveIsWelshNullWhenAbsentFromJson() { + final JsonObject json = createObjectBuilder() + .add("id", "abc") + .add("oucode", "C55BN00") + .add("oucodeL1Code", "C") + .add("oucodeL1Name", "Magistrates' Courts") + .add("oucodeL3Code", "B01KR") + .add("oucodeL3Name", "Port Talbot") + .add("address1", "The Court House") + .add("address2", "Cramic Way") + .add("defaultStartTime", "10:30") + .add("defaultDurationHrs", "10:30") + .build(); + + final OrganisationUnitWithCourtroomReferenceData result = RefDataHelper.asOrganisationUnitWithCourtroomRefData().apply(json); + + assertThat(result.getIsWelsh(), is(nullValue())); + } +} diff --git a/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTest.java b/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTest.java index 4fae501c..895b390b 100644 --- a/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTest.java +++ b/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonassert.JsonAssert.with; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -75,9 +75,9 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTestHelper.java b/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTestHelper.java index 7df689a7..9db56006 100644 --- a/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTestHelper.java +++ b/prosecutioncasefile-refdata/src/test/java/uk/gov/moj/cpp/prosecution/casefile/service/ReferenceDataQueryServiceTestHelper.java @@ -2,8 +2,8 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -17,10 +17,10 @@ import java.util.UUID; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class ReferenceDataQueryServiceTestHelper { @@ -499,7 +499,7 @@ public static Envelope buildOrganisationUnitWithCourtroom() { final JsonObject courtRoom = createObjectBuilder() .add(KEY_ID, randomUUID().toString()) .add(VENUENAME, VENUENAMEVALUE) - .add(COURTROOMID, "123") + .add(COURTROOMID, 123) .add(COURTROOMNAME, COURTROOMNAMEVALUE_1) .build(); diff --git a/prosecutioncasefile-service/pom.xml b/prosecutioncasefile-service/pom.xml index 9518d980..55e40921 100644 --- a/prosecutioncasefile-service/pom.xml +++ b/prosecutioncasefile-service/pom.xml @@ -4,7 +4,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 @@ -68,6 +68,11 @@ ${project.version} + + uk.gov.justice.event-store + event-tracking-discovery + + uk.gov.justice.utils diff --git a/prosecutioncasefile-service/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-service/src/main/resources/META-INF/beans.xml index ce2829b7..be799004 100644 --- a/prosecutioncasefile-service/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-service/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/prosecutioncasefile-validation-rules/pom.xml b/prosecutioncasefile-validation-rules/pom.xml index 22ed863a..caa3725f 100644 --- a/prosecutioncasefile-validation-rules/pom.xml +++ b/prosecutioncasefile-validation-rules/pom.xml @@ -3,7 +3,7 @@ prosecutioncasefile-parent uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 prosecutioncasefile-validation-rules @@ -24,8 +24,8 @@ ${project.version} - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidator.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidator.java index 91b9ee39..ca19c532 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidator.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidator.java @@ -6,8 +6,8 @@ import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; import static java.util.stream.StreamSupport.stream; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.moj.cpp.prosecution.casefile.domain.FormValidationResult.formValidationResult; import static uk.gov.moj.cpp.prosecution.casefile.json.schemas.MatchedDefendant.matchedDefendant; @@ -99,14 +99,14 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/SubmitApplicationValidator.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/SubmitApplicationValidator.java index 0b7b20d5..45a5ced7 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/SubmitApplicationValidator.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/SubmitApplicationValidator.java @@ -4,8 +4,8 @@ import uk.gov.moj.cpp.prosecution.casefile.domain.AdditionalInformation; import uk.gov.moj.cpp.prosecution.casefile.validation.rules.SubmitApplicationValidationRule; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import java.util.Comparator; import java.util.List; import java.util.Optional; diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/helper/ValidationRuleHelper.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/helper/ValidationRuleHelper.java index 9bca840b..8362c0b9 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/helper/ValidationRuleHelper.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/helper/ValidationRuleHelper.java @@ -8,7 +8,7 @@ import uk.gov.moj.cpp.prosecution.casefile.application.json.schemas.Organisation; import uk.gov.moj.cpp.prosecution.casefile.application.json.schemas.Person; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class ValidationRuleHelper { diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRule.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRule.java index 301bb203..f1293ed1 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRule.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRule.java @@ -13,7 +13,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class CaseReferenceValidationRule extends AbstractValidationRule implements SubmitApplicationValidationRule { diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRule.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRule.java index 6d888254..07afc6c5 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRule.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRule.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Optional; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRule.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRule.java index c17839b5..c29ddcdf 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRule.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRule.java @@ -17,9 +17,9 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/DefendantInfo.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/DefendantInfo.java index a3fcf813..22329af0 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/DefendantInfo.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/DefendantInfo.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecution.casefile.validation.rules.forms; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class DefendantInfo { diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRule.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRule.java index b444d821..b3122edd 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRule.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRule.java @@ -35,8 +35,8 @@ import java.util.Map; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/ValidationRule.java b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/ValidationRule.java index 88001920..d94c76a7 100644 --- a/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/ValidationRule.java +++ b/prosecutioncasefile-validation-rules/src/main/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/ValidationRule.java @@ -2,8 +2,8 @@ import uk.gov.moj.cpp.prosecution.casefile.json.schemas.MatchedDefendant; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; public interface ValidationRule { MatchedDefendant validate(final JsonObject input, final JsonValue matchedObject); diff --git a/prosecutioncasefile-validation-rules/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-validation-rules/src/main/resources/META-INF/beans.xml index 1fe3f43a..be799004 100755 --- a/prosecutioncasefile-validation-rules/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-validation-rules/src/main/resources/META-INF/beans.xml @@ -1,5 +1,6 @@ - \ No newline at end of file + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> + \ No newline at end of file diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidatorTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidatorTest.java index 30a0c382..cfc91e9a 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidatorTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/CpsFormValidatorTest.java @@ -2,8 +2,8 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.hasSize; @@ -41,10 +41,10 @@ import java.util.List; -import javax.enterprise.inject.Instance; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.enterprise.inject.Instance; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationDueDateValidatorTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationDueDateValidatorTest.java index 8677f952..b2b53ea6 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationDueDateValidatorTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationDueDateValidatorTest.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationTypeValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationTypeValidationRuleTest.java index 646d4bbb..672ca436 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationTypeValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ApplicationTypeValidationRuleTest.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRuleTest.java index 1651711f..d81ea9a0 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CaseReferenceValidationRuleTest.java @@ -24,7 +24,7 @@ import java.util.Optional; import java.util.UUID; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtFeeDetailsValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtFeeDetailsValidationRuleTest.java index 2387409d..f87316ac 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtFeeDetailsValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtFeeDetailsValidationRuleTest.java @@ -8,7 +8,7 @@ import java.util.List; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.mockito.InjectMocks; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtLocationValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtLocationValidationRuleTest.java index ced1308d..06e01557 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtLocationValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CourtLocationValidationRuleTest.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CpsDefendantIdValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CpsDefendantIdValidationRuleTest.java index e86e6027..0adea6d1 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CpsDefendantIdValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/CpsDefendantIdValidationRuleTest.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantASNValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantASNValidationRuleTest.java index df11a3dd..7930a55b 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantASNValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantASNValidationRuleTest.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantMatchValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantMatchValidationRuleTest.java index 319d7c1b..581f4e10 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantMatchValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/DefendantMatchValidationRuleTest.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/RespondentDetailsValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/RespondentDetailsValidationRuleTest.java index 98e8b46b..a72a5378 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/RespondentDetailsValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/RespondentDetailsValidationRuleTest.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/SubjectValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/SubjectValidationRuleTest.java index a4d4b31a..1ef49531 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/SubjectValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/SubjectValidationRuleTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ThirdPartyDetailsValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ThirdPartyDetailsValidationRuleTest.java index 2375ca13..fe164010 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ThirdPartyDetailsValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/ThirdPartyDetailsValidationRuleTest.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRuleTest.java index 263e9058..313d69c6 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/AsnValidationRuleTest.java @@ -13,7 +13,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRuleTest.java index 676ed970..3b2ec12f 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/CpsDefendantIdValidationRuleTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.prosecution.casefile.validation.rules.forms; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; @@ -14,9 +14,9 @@ import java.util.UUID; -import javax.enterprise.inject.Instance; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.enterprise.inject.Instance; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRuleTest.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRuleTest.java index c0ed6f81..94f13868 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRuleTest.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/rules/forms/NameAndDOBValidationRuleTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.prosecution.casefile.validation.rules.forms; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static jakarta.json.Json.createArrayBuilder; +import static jakarta.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.hasSize; @@ -16,9 +16,9 @@ import java.util.UUID; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/utils/FileUtil.java b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/utils/FileUtil.java index c5be2822..3dc2d994 100644 --- a/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/utils/FileUtil.java +++ b/prosecutioncasefile-validation-rules/src/test/java/uk/gov/moj/cpp/prosecution/casefile/validation/utils/FileUtil.java @@ -8,9 +8,9 @@ import java.io.InputStream; import java.io.StringReader; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/prosecutioncasefile-viewstore/pom.xml b/prosecutioncasefile-viewstore/pom.xml index 61e91d2e..f15477e5 100755 --- a/prosecutioncasefile-viewstore/pom.xml +++ b/prosecutioncasefile-viewstore/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-parent - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT prosecutioncasefile-viewstore diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-liquibase/pom.xml b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-liquibase/pom.xml index e6276128..b864569d 100755 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-liquibase/pom.xml +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.prosecution.casefile prosecutioncasefile-viewstore - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT prosecutioncasefile-viewstore-liquibase diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/META-INF/services/javax.annotation.processing.Processor b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 00000000..07472ff3 --- /dev/null +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1,13 @@ +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# License: GNU Lesser General Public License (LGPL), version 2.1 or later. +# See the lgpl.txt file in the root directory or . +# +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# License: GNU Lesser General Public License (LGPL), version 2.1 or later. +# See the lgpl.txt file in the root directory or . +# +org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor \ No newline at end of file diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/pom.xml b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/pom.xml index 5bbe67d7..e25798b6 100755 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/pom.xml +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/pom.xml @@ -3,40 +3,28 @@ prosecutioncasefile-viewstore uk.gov.moj.cpp.prosecution.casefile - 17.0.89-SNAPSHOT + 21.0.0-SNAPSHOT 4.0.0 prosecutioncasefile-viewstore-persistence - - 1.4.196 - + - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided - - uk.gov.justice.services - persistence-deltaspike - uk.gov.justice.services common - org.hibernate + org.hibernate.orm hibernate-core provided - - - org.hibernate - hibernate-jpamodelgen - provided - org.apache.commons commons-lang3 @@ -46,80 +34,39 @@ utilities-core - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - - - org.mockito - mockito-core - test + ${project.groupId} + prosecutioncasefile-domain-event + ${project.version} - net.bytebuddy - byte-buddy - test + ${project.groupId} + prosecutioncasefile-domain-event + ${project.version} + + - org.hamcrest - hamcrest + org.junit.jupiter + junit-jupiter-api test - uk.gov.justice.services - test-utils-common + org.mockito + mockito-core test - uk.gov.justice.event-store - test-utils-persistence + org.hamcrest + hamcrest test uk.gov.justice.utils - test-utils-logging-log4j - pom - test - - - org.apache.tomee - openejb-core - test - - - org.apache.activemq - activemq-ra - test - - - org.apache.tomee - openejb-server - test - - - org.apache.deltaspike.modules - deltaspike-test-control-module-api - test - - - org.apache.deltaspike.modules - deltaspike-test-control-module-impl - test - - - org.apache.deltaspike.cdictrl - deltaspike-cdictrl-openejb - test - - - com.google.guava - guava-testlib - test - - - org.apache.deltaspike.cdictrl - deltaspike-cdictrl-api + test-utils-hibernate test @@ -128,25 +75,10 @@ test - org.hibernate - hibernate-entitymanager - test - - - ${project.groupId} - prosecutioncasefile-domain-event - ${project.version} - - - uk.gov.justice.services - test-utils-core - test - - - com.h2database - h2 - ${h2.version} + org.slf4j + slf4j-simple test + diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AddressDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AddressDetails.java index e8c44f08..ef84a845 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AddressDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AddressDetails.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AlcoholOffenceDetail.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AlcoholOffenceDetail.java index 34489b9a..5fc10b40 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AlcoholOffenceDetail.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/AlcoholOffenceDetail.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class AlcoholOffenceDetail implements Serializable { diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorCaseDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorCaseDetails.java index 9dfe113d..e9012a09 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorCaseDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorCaseDetails.java @@ -5,10 +5,10 @@ import java.io.Serializable; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorDetails.java index 1c08f3d9..a5e42dd4 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorDetails.java @@ -6,10 +6,10 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorSummary.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorSummary.java index 437d873c..ff42d377 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorSummary.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/BusinessValidationErrorSummary.java @@ -4,10 +4,10 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "business_validation_errors_summary_view") diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CPRDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CPRDetails.java index 7eaea88a..eb145e5c 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CPRDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CPRDetails.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class CPRDetails implements Serializable { diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CaseDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CaseDetails.java index 515588f4..7393a933 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CaseDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CaseDetails.java @@ -8,15 +8,15 @@ import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CivilFees.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CivilFees.java index 29630ec1..2b9d05f6 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CivilFees.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/CivilFees.java @@ -3,10 +3,10 @@ import java.io.Serializable; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "civil_fee") diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ContactDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ContactDetails.java index 57bba263..dddbf654 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ContactDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ContactDetails.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantDetails.java index 9d9c51e5..1f72308b 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantDetails.java @@ -15,19 +15,19 @@ import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -91,7 +91,7 @@ public class DefendantDetails implements Serializable { @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "defendant") private Set offences; - @ElementCollection(fetch = FetchType.LAZY) + @ElementCollection(fetch = FetchType.EAGER) @CollectionTable(name = "defendant_individual_aliases", joinColumns = @JoinColumn(name = "defendant_id")) private List individualAliases; @@ -142,13 +142,13 @@ public DefendantDetails(final String defendantId, this.defendantInitiationCode=defendantInitiationCode; setOffences(offences); if (personalInformation != null) { - personalInformation.setDefendantDetails(this); + personalInformation.setPersonalInformationId(defendantId); } if (selfDefinedInformation != null) { - selfDefinedInformation.setDefendantDetails(this); + selfDefinedInformation.setSelfDefinedInformationId(defendantId); } - if(organisationInformation !=null) { - organisationInformation.setDefendantDetails(this); + if (organisationInformation != null) { + organisationInformation.setOrganisationInformationId(defendantId); } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantLegacy.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantLegacy.java index 9101b914..89bf4e99 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantLegacy.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantLegacy.java @@ -9,15 +9,15 @@ import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantOffenderDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantOffenderDetails.java index 31446f3c..07113ac6 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantOffenderDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/DefendantOffenderDetails.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class DefendantOffenderDetails implements Serializable { diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/Hearing.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/Hearing.java index d3d483ee..9b4b53e8 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/Hearing.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/Hearing.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class Hearing implements Serializable { diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/IndividualAliasDetail.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/IndividualAliasDetail.java index ee4da7c3..c5e2d255 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/IndividualAliasDetail.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/IndividualAliasDetail.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class IndividualAliasDetail implements Serializable { diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceDetails.java index 18199d25..93b7a821 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceDetails.java @@ -7,13 +7,13 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceLegacy.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceLegacy.java index 262c7127..9b0da249 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceLegacy.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OffenceLegacy.java @@ -4,13 +4,13 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "offence_legacy") diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OrganisationInformationDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OrganisationInformationDetails.java index d98c06ae..8afae6e3 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OrganisationInformationDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/OrganisationInformationDetails.java @@ -4,14 +4,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -23,11 +20,6 @@ public class OrganisationInformationDetails implements Serializable { @Column(name = "organisation_information_id", unique = true, nullable = false) private String organisationInformationId; - @MapsId - @OneToOne(mappedBy = "organisationInformation") - @JoinColumn(name = "organisation_information_id") - private DefendantDetails defendantDetails; - @Column(name = "organisation_name") private String organisationName; @@ -67,14 +59,6 @@ public void setAddress(final AddressDetails address) { this.address = address; } - public DefendantDetails getDefendantDetails() { - return defendantDetails; - } - - public void setDefendantDetails(final DefendantDetails defendantDetails) { - this.defendantDetails = defendantDetails; - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE); diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/PersonalInformationDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/PersonalInformationDetails.java index 4929dee2..2dd92185 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/PersonalInformationDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/PersonalInformationDetails.java @@ -5,14 +5,11 @@ import java.io.Serializable; import java.util.Optional; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -24,11 +21,6 @@ public class PersonalInformationDetails implements Serializable { @Column(name = "personal_information_id", unique = true, nullable = false) private String personalInformationId; - @MapsId - @OneToOne(mappedBy = "personalInformation") - @JoinColumn(name = "personal_information_id") - private DefendantDetails defendantDetails; - @Column(name = "title") private String title; @@ -135,14 +127,6 @@ public void setContactDetails(final ContactDetails contactDetails) { this.contactDetails = contactDetails; } - public DefendantDetails getDefendantDetails() { - return defendantDetails; - } - - public void setDefendantDetails(final DefendantDetails defendantDetails) { - this.defendantDetails = defendantDetails; - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE); diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ResolvedCases.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ResolvedCases.java index ac8b71e5..fb5427d6 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ResolvedCases.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/ResolvedCases.java @@ -3,10 +3,10 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "resolved_cases") diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/SelfDefinedInformationDetails.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/SelfDefinedInformationDetails.java index 72ead422..0152e19b 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/SelfDefinedInformationDetails.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/entity/SelfDefinedInformationDetails.java @@ -7,15 +7,12 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -27,11 +24,6 @@ public class SelfDefinedInformationDetails implements Serializable { @Column(name = "self_defined_information_id", unique = true, nullable = false) private String selfDefinedInformationId; - @MapsId - @OneToOne(mappedBy = "selfDefinedInformation") - @JoinColumn(name = "self_defined_information_id") - private DefendantDetails defendantDetails; - @Column(name = "additional_nationality") private String additionalNationality; @@ -113,14 +105,6 @@ public void setNationality(String nationality) { this.nationality = nationality; } - public DefendantDetails getDefendantDetails() { - return defendantDetails; - } - - public void setDefendantDetails(final DefendantDetails defendantDetails) { - this.defendantDetails = defendantDetails; - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE); diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationParameterFactory.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationParameterFactory.java index 0ada9fd9..400a9429 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationParameterFactory.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationParameterFactory.java @@ -6,8 +6,8 @@ import java.util.Objects; import java.util.Optional; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.apache.commons.lang3.EnumUtils; diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationService.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationService.java deleted file mode 100644 index aa39a247..00000000 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationService.java +++ /dev/null @@ -1,36 +0,0 @@ -package uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination; - - -import java.util.List; - -import org.apache.deltaspike.data.api.QueryResult; - -public class PaginationService { - - public PaginationResult paginate(final PaginationParameter paginationParameter, final QueryResult queryResult) { - final List resultList; - final long countPages = queryResult.countPages(); - final long totalCount = queryResult.count(); - - if (paginationParameter.getSortOrder().toString().equalsIgnoreCase(SortOrder.ASC.toString())) { - resultList = queryResult.orderAsc(paginationParameter.getSortField().getFieldName()) - .withPageSize(paginationParameter.getPageSize()) - .toPage(adjustToZeroIndexedPageNumber(paginationParameter.getPageNumber())) - .getResultList(); - } else { - resultList = queryResult.orderDesc(paginationParameter.getSortField().getFieldName()) - .withPageSize(paginationParameter.getPageSize()) - .toPage(adjustToZeroIndexedPageNumber(paginationParameter.getPageNumber())) - .getResultList(); - } - return new PaginationResult<>(resultList, totalCount, countPages); - } - - private int adjustToZeroIndexedPageNumber(final int pageNumber) { - return pageNumber - 1; - } - - protected long toPageCount(final long totalCount, final int pageSize) { - return (long) Math.ceil((double) totalCount / (double) pageSize); - } -} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorCaseDetailsRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorCaseDetailsRepository.java index e4485b63..1e27c449 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorCaseDetailsRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorCaseDetailsRepository.java @@ -5,16 +5,35 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; - -@Repository -public interface BusinessValidationErrorCaseDetailsRepository extends - EntityRepository { - - List findByCaseId(final UUID caseId); - - void deleteByCaseId(final UUID caseId); - - +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + +@ApplicationScoped +public class BusinessValidationErrorCaseDetailsRepository { + + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public BusinessValidationErrorCaseDetails findBy(final UUID id) { + return entityManager.find(BusinessValidationErrorCaseDetails.class, id); + } + + public List findByCaseId(final UUID caseId) { + return entityManager.createQuery( + "SELECT e FROM BusinessValidationErrorCaseDetails e WHERE e.caseId = :caseId", + BusinessValidationErrorCaseDetails.class) + .setParameter("caseId", caseId) + .getResultList(); + } + + public void deleteByCaseId(final UUID caseId) { + entityManager.createQuery("DELETE FROM BusinessValidationErrorCaseDetails e WHERE e.caseId = :caseId") + .setParameter("caseId", caseId) + .executeUpdate(); + } + + public BusinessValidationErrorCaseDetails save(final BusinessValidationErrorCaseDetails entity) { + return entityManager.merge(entity); + } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepository.java index a700b4ec..9a2f145a 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepository.java @@ -1,81 +1,135 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorDetails_; import uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination.PaginationParameter; import uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination.SortOrder; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.UUID; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; -import org.apache.deltaspike.data.api.AbstractFullEntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.QueryResult; -import org.apache.deltaspike.data.api.Repository; +@ApplicationScoped +public class BusinessValidationErrorRepository { -@Repository -public abstract class BusinessValidationErrorRepository - extends AbstractFullEntityRepository { + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; - public abstract List findByCaseId(final UUID caseId); - - public abstract List findByDefendantId(final UUID defendantId); + public BusinessValidationErrorDetails findBy(final UUID id) { + return entityManager.find(BusinessValidationErrorDetails.class, id); + } - public abstract void deleteByCaseId(final UUID caseId); + public List findByCaseId(final UUID caseId) { + return entityManager.createQuery( + "SELECT e FROM BusinessValidationErrorDetails e WHERE e.caseId = :caseId", + BusinessValidationErrorDetails.class) + .setParameter("caseId", caseId) + .getResultList(); + } - public abstract void deleteByCaseIdAndDefendantIdIsNull(final UUID caseId); + public List findByDefendantId(final UUID defendantId) { + return entityManager.createQuery( + "SELECT e FROM BusinessValidationErrorDetails e WHERE e.defendantId = :defendantId", + BusinessValidationErrorDetails.class) + .setParameter("defendantId", defendantId) + .getResultList(); + } - public abstract void deleteByDefendantId(UUID defendantId); + public void deleteByCaseId(final UUID caseId) { + entityManager.createQuery("DELETE FROM BusinessValidationErrorDetails e WHERE e.caseId = :caseId") + .setParameter("caseId", caseId) + .executeUpdate(); + } - public abstract void deleteByCaseIdAndDefendantId(final UUID caseId, final UUID defendantId); + public void deleteByCaseIdAndDefendantIdIsNull(final UUID caseId) { + entityManager.createQuery( + "DELETE FROM BusinessValidationErrorDetails e WHERE e.caseId = :caseId AND e.defendantId IS NULL") + .setParameter("caseId", caseId) + .executeUpdate(); + } - public abstract void deleteByCaseIdAndFirstNameAndLastName(final UUID caseId, final String firstName, final String lastName); + public void deleteByDefendantId(final UUID defendantId) { + entityManager.createQuery( + "DELETE FROM BusinessValidationErrorDetails e WHERE e.defendantId = :defendantId") + .setParameter("defendantId", defendantId) + .executeUpdate(); + } - public abstract void deleteByCaseIdAndOrganisationName(final UUID caseId, final String organisationName); + public void deleteByCaseIdAndDefendantId(final UUID caseId, final UUID defendantId) { + entityManager.createQuery( + "DELETE FROM BusinessValidationErrorDetails e WHERE e.caseId = :caseId AND e.defendantId = :defendantId") + .setParameter("caseId", caseId) + .setParameter("defendantId", defendantId) + .executeUpdate(); + } + public void deleteByCaseIdAndFirstNameAndLastName(final UUID caseId, final String firstName, + final String lastName) { + entityManager.createQuery( + "DELETE FROM BusinessValidationErrorDetails e WHERE e.caseId = :caseId AND e.firstName = :firstName AND e.lastName = :lastName") + .setParameter("caseId", caseId) + .setParameter("firstName", firstName) + .setParameter("lastName", lastName) + .executeUpdate(); + } - public Long countOfCasesWithOutstandingErrors( - final Optional courtLocation, final Optional caseType) { - return criteria() - .select(Long.class, countDistinct(BusinessValidationErrorDetails_.caseId)) - .eqIgnoreCase(BusinessValidationErrorDetails_.courtLocation, courtLocation.orElse(null)) - .eqIgnoreCase(BusinessValidationErrorDetails_.caseType, caseType.orElse(null)) - .getSingleResult(); + public void deleteByCaseIdAndOrganisationName(final UUID caseId, final String organisationName) { + entityManager.createQuery( + "DELETE FROM BusinessValidationErrorDetails e WHERE e.caseId = :caseId AND e.organisationName = :organisationName") + .setParameter("caseId", caseId) + .setParameter("organisationName", organisationName) + .executeUpdate(); } - @Query(value = "SELECT e FROM BusinessValidationErrorDetails e WHERE e.caseId in (:caseIds)") - public abstract QueryResult findAllCaseErrorDetailsByCaseIds( - @QueryParam("caseIds") final Collection caseIds); + public Long countOfCasesWithOutstandingErrors(final Optional courtLocation, + final Optional caseType) { + final CriteriaBuilder cb = entityManager.getCriteriaBuilder(); + final CriteriaQuery q = cb.createQuery(Long.class); + final Root e = q.from(BusinessValidationErrorDetails.class); + final List predicates = new ArrayList<>(); + courtLocation.ifPresent(cl -> + predicates.add(cb.equal(cb.lower(e.get("courtLocation")), cl.toLowerCase()))); + caseType.ifPresent(ct -> + predicates.add(cb.equal(cb.lower(e.get("caseType")), ct.toLowerCase()))); + q.select(cb.countDistinct(e.get("caseId"))); + if (!predicates.isEmpty()) { + q.where(cb.and(predicates.toArray(new Predicate[0]))); + } + return entityManager.createQuery(q).getSingleResult(); + } public List fetchAllCaseErrorDetailsByCaseIds( final Collection caseIds, final PaginationParameter paginationParameter) { - - final CriteriaBuilder criteriaBuilder = entityManager().getCriteriaBuilder(); - - final CriteriaQuery criteriaQuery = - criteriaBuilder.createQuery(BusinessValidationErrorDetails.class); - - final Root e = - criteriaQuery.from(BusinessValidationErrorDetails.class); - - final Predicate predicate = e.get(BusinessValidationErrorDetails_.caseId).in(caseIds); - criteriaQuery.where(predicate); - + final CriteriaBuilder cb = entityManager.getCriteriaBuilder(); + final CriteriaQuery q = + cb.createQuery(BusinessValidationErrorDetails.class); + final Root e = q.from(BusinessValidationErrorDetails.class); + q.where(e.get("caseId").in(caseIds)); final String orderByField = paginationParameter.getSortField().getFieldName(); if (paginationParameter.getSortOrder().toString().equalsIgnoreCase(SortOrder.ASC.toString())) { - criteriaQuery.orderBy(criteriaBuilder.asc(e.get(orderByField))); + q.orderBy(cb.asc(e.get(orderByField))); } else { - criteriaQuery.orderBy(criteriaBuilder.desc(e.get(orderByField))); + q.orderBy(cb.desc(e.get(orderByField))); } + return entityManager.createQuery(q).getResultList(); + } + + public BusinessValidationErrorDetails save(final BusinessValidationErrorDetails entity) { + return entityManager.merge(entity); + } - return entityManager().createQuery(criteriaQuery).getResultList(); + public void remove(final BusinessValidationErrorDetails entity) { + final BusinessValidationErrorDetails managed = + entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorSummaryRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorSummaryRepository.java index 4c983f14..70ec1468 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorSummaryRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorSummaryRepository.java @@ -5,7 +5,6 @@ import uk.gov.moj.cpp.prosecutioncasefile.mapping.FilterParameter; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorSummary; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorSummary_; import uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination.PaginationParameter; import uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination.PaginationResult; import uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination.SortOrder; @@ -15,56 +14,64 @@ import java.util.List; import java.util.UUID; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; -import org.apache.deltaspike.data.api.AbstractFullEntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryResult; -import org.apache.deltaspike.data.api.Repository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Repository -public abstract class BusinessValidationErrorSummaryRepository - extends AbstractFullEntityRepository { +@ApplicationScoped +public class BusinessValidationErrorSummaryRepository { private static final Logger LOGGER = LoggerFactory.getLogger(BusinessValidationErrorSummaryRepository.class); - private static final String SELECT_ERROR_SUMMARY = "SELECT e FROM BusinessValidationErrorSummary e"; - @Query(value = SELECT_ERROR_SUMMARY) - public abstract QueryResult fetchAllCaseErrorSummary(); + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public BusinessValidationErrorSummary findBy(final UUID id) { + return entityManager.find(BusinessValidationErrorSummary.class, id); + } @SuppressWarnings({"squid:S2221"}) public PaginationResult fetchFilteredCaseErrorSummary( final FilterParameter filterParameter, final PaginationParameter paginationParameter) { try { - final CriteriaBuilder criteriaBuilder = entityManager().getCriteriaBuilder(); + final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); final CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(BusinessValidationErrorSummary.class); final CriteriaQuery countQuery = criteriaBuilder.createQuery(Long.class); - final Root entityRoot = countQuery.from(criteriaQuery.getResultType()); + final Root entityRoot = + countQuery.from(criteriaQuery.getResultType()); countQuery.select(criteriaBuilder.count(entityRoot)); - final List countQueryPredicates = buildPredicates(filterParameter, criteriaBuilder, entityRoot); + final List countQueryPredicates = + buildPredicates(filterParameter, criteriaBuilder, entityRoot); if (!countQueryPredicates.isEmpty()) { - final Predicate[] predicateArray = countQueryPredicates.toArray(new Predicate[countQueryPredicates.size()]); + final Predicate[] predicateArray = + countQueryPredicates.toArray(new Predicate[countQueryPredicates.size()]); countQuery.where(criteriaBuilder.and(predicateArray)); } - final Long totalCount = entityManager().createQuery(countQuery).getSingleResult(); - final int countPages = (int) Math.ceil((double) totalCount / (double) paginationParameter.getPageSize()); + final Long totalCount = entityManager.createQuery(countQuery).getSingleResult(); + final int countPages = + (int) Math.ceil((double) totalCount / (double) paginationParameter.getPageSize()); - final Root e = criteriaQuery.from(BusinessValidationErrorSummary.class); - final List criteriaQueryPredicates = buildPredicates(filterParameter, criteriaBuilder, e); + final Root e = + criteriaQuery.from(BusinessValidationErrorSummary.class); + final List criteriaQueryPredicates = + buildPredicates(filterParameter, criteriaBuilder, e); if (!buildPredicates(filterParameter, criteriaBuilder, entityRoot).isEmpty()) { - final Predicate[] predicateArray = criteriaQueryPredicates.toArray(new Predicate[criteriaQueryPredicates.size()]); + final Predicate[] predicateArray = + criteriaQueryPredicates.toArray(new Predicate[criteriaQueryPredicates.size()]); criteriaQuery.where(criteriaBuilder.and(predicateArray)); } @@ -75,9 +82,10 @@ public PaginationResult fetchFilteredCaseErrorSu criteriaQuery.orderBy(criteriaBuilder.desc(e.get(orderByField))); } - final TypedQuery typedQuery = entityManager() + final TypedQuery typedQuery = entityManager .createQuery(criteriaQuery) - .setFirstResult((paginationParameter.getPageNumber() - 1) * paginationParameter.getPageSize()) + .setFirstResult( + (paginationParameter.getPageNumber() - 1) * paginationParameter.getPageSize()) .setMaxResults(paginationParameter.getPageSize()); final List errorSummaries = typedQuery.getResultList(); @@ -89,30 +97,29 @@ public PaginationResult fetchFilteredCaseErrorSu } private List buildPredicates(final FilterParameter filterParameter, - final CriteriaBuilder criteriaBuilder, final Root e) { + final CriteriaBuilder criteriaBuilder, + final Root e) { final List predicates = new ArrayList<>(); if (nonNull(filterParameter.getCourt())) { - predicates.add(criteriaBuilder.equal( - e.get(BusinessValidationErrorSummary_.courtLocation), filterParameter.getCourt())); + predicates.add( + criteriaBuilder.equal(e.get("courtLocation"), filterParameter.getCourt())); } if (nonNull(filterParameter.getCaseType())) { - predicates.add(criteriaBuilder.equal( - e.get(BusinessValidationErrorSummary_.caseType), filterParameter.getCaseType())); + predicates.add( + criteriaBuilder.equal(e.get("caseType"), filterParameter.getCaseType())); } if (nonNull(filterParameter.getUrn())) { - predicates.add(criteriaBuilder.equal( - e.get(BusinessValidationErrorSummary_.urn), filterParameter.getUrn())); + predicates.add( + criteriaBuilder.equal(e.get("urn"), filterParameter.getUrn())); } if (nonNull(filterParameter.getHearingDateFrom())) { predicates.add(criteriaBuilder.greaterThanOrEqualTo( - e.get(BusinessValidationErrorSummary_.defendantHearingDate), - parse(filterParameter.getHearingDateFrom()))); + e.get("defendantHearingDate"), parse(filterParameter.getHearingDateFrom()))); } if (nonNull(filterParameter.getHearingDateTo())) { predicates.add(criteriaBuilder.lessThanOrEqualTo( - e.get(BusinessValidationErrorSummary_.defendantHearingDate), - parse(filterParameter.getHearingDateTo()))); + e.get("defendantHearingDate"), parse(filterParameter.getHearingDateTo()))); } return predicates; } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepository.java index e60787c3..02c87b98 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepository.java @@ -6,17 +6,44 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface CaseDetailsRepository extends EntityRepository { +@ApplicationScoped +public class CaseDetailsRepository { - @Query(value = "FROM CaseDetails cd WHERE cd.prosecutionCaseReference = :prosecutionCaseReference") - CaseDetails findCaseDetailsByProsecutionCaseReference(@QueryParam("prosecutionCaseReference") final String prosecutionCaseReference); + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; - @Query(value = "FROM CaseDetails cd WHERE cd.prosecutionCaseReference in (:prosecutionCaseReferences) ") - List findAllCaseDetailsByProsecutionCaseReferences(@QueryParam("prosecutionCaseReferences") final Collection caseIds); + public CaseDetails findBy(final UUID id) { + return entityManager.find(CaseDetails.class, id); + } + + public CaseDetails findCaseDetailsByProsecutionCaseReference( + final String prosecutionCaseReference) { + return entityManager.createQuery( + "SELECT cd FROM CaseDetails cd WHERE cd.prosecutionCaseReference = :prosecutionCaseReference", + CaseDetails.class) + .setParameter("prosecutionCaseReference", prosecutionCaseReference) + .getSingleResult(); + } + + public List findAllCaseDetailsByProsecutionCaseReferences( + final Collection prosecutionCaseReferences) { + return entityManager.createQuery( + "SELECT cd FROM CaseDetails cd WHERE cd.prosecutionCaseReference IN :prosecutionCaseReferences", + CaseDetails.class) + .setParameter("prosecutionCaseReferences", prosecutionCaseReferences) + .getResultList(); + } + + public CaseDetails save(final CaseDetails entity) { + return entityManager.merge(entity); + } + + public void remove(final CaseDetails entity) { + final CaseDetails managed = entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); + } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRepository.java index 819c4527..3ab66cb1 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRepository.java @@ -5,11 +5,34 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface DefendantLegacyRepository extends EntityRepository { +@ApplicationScoped +public class DefendantLegacyRepository { - List findByCaseId(UUID caseId); + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public DefendantLegacy findBy(final UUID id) { + return entityManager.find(DefendantLegacy.class, id); + } + + public List findByCaseId(final UUID caseId) { + return entityManager.createQuery( + "SELECT d FROM DefendantLegacy d WHERE d.caseId = :caseId", + DefendantLegacy.class) + .setParameter("caseId", caseId) + .getResultList(); + } + + public DefendantLegacy save(final DefendantLegacy entity) { + return entityManager.merge(entity); + } + + public void remove(final DefendantLegacy entity) { + final DefendantLegacy managed = entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); + } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepository.java index ab60aa22..c4ebcc8e 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepository.java @@ -4,12 +4,34 @@ import java.util.List; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface DefendantRepository extends EntityRepository { +@ApplicationScoped +public class DefendantRepository { - List findByDefendantId(final String defendantId); + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + public DefendantDetails findBy(final String id) { + return entityManager.find(DefendantDetails.class, id); + } + + public List findByDefendantId(final String defendantId) { + return entityManager.createQuery( + "SELECT d FROM DefendantDetails d WHERE d.defendantId = :defendantId", + DefendantDetails.class) + .setParameter("defendantId", defendantId) + .getResultList(); + } + + public DefendantDetails save(final DefendantDetails entity) { + return entityManager.merge(entity); + } + + public void remove(final DefendantDetails entity) { + final DefendantDetails managed = entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); + } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepository.java index daefa3bd..b7e64457 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepository.java @@ -4,9 +4,26 @@ import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface OffenceLegacyRepository extends EntityRepository { -} \ No newline at end of file +@ApplicationScoped +public class OffenceLegacyRepository { + + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public OffenceLegacy findBy(final UUID id) { + return entityManager.find(OffenceLegacy.class, id); + } + + public OffenceLegacy save(final OffenceLegacy entity) { + return entityManager.merge(entity); + } + + public void remove(final OffenceLegacy entity) { + final OffenceLegacy managed = entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); + } +} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepository.java index 86236a37..9951e050 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepository.java @@ -4,9 +4,26 @@ import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface OffenceRepository extends EntityRepository { -} \ No newline at end of file +@ApplicationScoped +public class OffenceRepository { + + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public OffenceDetails findBy(final UUID id) { + return entityManager.find(OffenceDetails.class, id); + } + + public OffenceDetails save(final OffenceDetails entity) { + return entityManager.merge(entity); + } + + public void remove(final OffenceDetails entity) { + final OffenceDetails managed = entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); + } +} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRepository.java index 277d28c0..2a289ffe 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRepository.java @@ -4,9 +4,26 @@ import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface PersonalInformationRepository extends EntityRepository { -} \ No newline at end of file +@ApplicationScoped +public class PersonalInformationRepository { + + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public PersonalInformationDetails findBy(final UUID id) { + return entityManager.find(PersonalInformationDetails.class, id.toString()); + } + + public PersonalInformationDetails save(final PersonalInformationDetails entity) { + return entityManager.merge(entity); + } + + public void remove(final PersonalInformationDetails entity) { + final PersonalInformationDetails managed = entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); + } +} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepository.java index 64247082..aeb8d1ab 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepository.java @@ -1,27 +1,56 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.ResolvedCases; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.ResolvedCases_; import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; import java.util.Optional; import java.util.UUID; -import org.apache.deltaspike.data.api.FullEntityRepository; -import org.apache.deltaspike.data.api.Repository; - -@Repository -public interface ResolvedCasesRepository extends FullEntityRepository { - - default Long countOfCasesFixedByDate(final LocalDate resolutionDate, - final Optional region, - final Optional courtLocation, - final Optional caseType) { - return criteria().select(Long.class, countDistinct(ResolvedCases_.caseId)) - .eq(ResolvedCases_.resolutionDate, resolutionDate) - .eqIgnoreCase(ResolvedCases_.region, region.orElse(null)) - .eqIgnoreCase(ResolvedCases_.courtLocation, courtLocation.orElse(null)) - .eqIgnoreCase(ResolvedCases_.caseType, caseType.orElse(null)) - .getSingleResult(); +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + +@ApplicationScoped +public class ResolvedCasesRepository { + + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public ResolvedCases findBy(final UUID id) { + return entityManager.find(ResolvedCases.class, id); + } + + public Long countOfCasesFixedByDate(final LocalDate resolutionDate, + final Optional region, final Optional courtLocation, + final Optional caseType) { + final CriteriaBuilder cb = entityManager.getCriteriaBuilder(); + final CriteriaQuery q = cb.createQuery(Long.class); + final Root e = q.from(ResolvedCases.class); + final List predicates = new ArrayList<>(); + predicates.add(cb.equal(e.get("resolutionDate"), resolutionDate)); + region.ifPresent(r -> + predicates.add(cb.equal(cb.lower(e.get("region")), r.toLowerCase()))); + courtLocation.ifPresent(cl -> + predicates.add(cb.equal(cb.lower(e.get("courtLocation")), cl.toLowerCase()))); + caseType.ifPresent(ct -> + predicates.add(cb.equal(cb.lower(e.get("caseType")), ct.toLowerCase()))); + q.select(cb.countDistinct(e.get("caseId"))); + q.where(cb.and(predicates.toArray(new Predicate[0]))); + return entityManager.createQuery(q).getSingleResult(); + } + + public ResolvedCases save(final ResolvedCases entity) { + return entityManager.merge(entity); + } + + public void remove(final ResolvedCases entity) { + final ResolvedCases managed = entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); } -} \ No newline at end of file +} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepository.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepository.java index 1e9538aa..95514df0 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepository.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepository.java @@ -4,9 +4,27 @@ import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface SelfDefinedInformationRepository extends EntityRepository { -} \ No newline at end of file +@ApplicationScoped +public class SelfDefinedInformationRepository { + + @PersistenceContext(unitName = "prosecutioncasefile-persistence-unit") + EntityManager entityManager; + + public SelfDefinedInformationDetails findBy(final UUID id) { + return entityManager.find(SelfDefinedInformationDetails.class, id.toString()); + } + + public SelfDefinedInformationDetails save(final SelfDefinedInformationDetails entity) { + return entityManager.merge(entity); + } + + public void remove(final SelfDefinedInformationDetails entity) { + final SelfDefinedInformationDetails managed = + entityManager.contains(entity) ? entity : entityManager.merge(entity); + entityManager.remove(managed); + } +} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/beans.xml b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/beans.xml index cc3f8d28..be799004 100755 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/beans.xml +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + version="4.0" bean-discovery-mode="all"> \ No newline at end of file diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/persistence.xml b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/persistence.xml index da5e9633..cfbc60cd 100755 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/persistence.xml +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/main/resources/META-INF/persistence.xml @@ -8,18 +8,6 @@ org.hibernate.jpa.HibernatePersistenceProvider java:/DS.prosecutioncasefile - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantLegacy - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.OffenceLegacy - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CPRDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantOffenderDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CaseDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.OffenceDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.SelfDefinedInformationDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorCaseDetails - uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.ResolvedCases \ No newline at end of file diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/converter/UUIDStringConverter.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/converter/UUIDStringConverter.java new file mode 100644 index 00000000..11d0eb8e --- /dev/null +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/converter/UUIDStringConverter.java @@ -0,0 +1,20 @@ +package uk.gov.moj.cpp.prosecutioncasefile.persistence.converter; + +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; + +import java.util.UUID; + +@Converter(autoApply = true) +public class UUIDStringConverter implements AttributeConverter { + + @Override + public String convertToDatabaseColumn(final UUID uuid) { + return uuid == null ? null : uuid.toString(); + } + + @Override + public UUID convertToEntityAttribute(final String s) { + return s == null ? null : UUID.fromString(s); + } +} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationServiceTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationServiceTest.java deleted file mode 100644 index 7e6ac1bf..00000000 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/pagination/PaginationServiceTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination; - -import static java.util.Collections.emptyList; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination.OrderByField.HEARING_DATE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.pagination.SortOrder.ASC; - -import java.util.List; - -import org.apache.deltaspike.data.api.QueryResult; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) -public class PaginationServiceTest { - - @InjectMocks - private PaginationService paginationService; - - @Mock - private QueryResult queryResult; - - private List resultList; - - private PaginationParameter paginationParameter; - - @Before - public void setUp() { - resultList = emptyList(); - when(queryResult.orderAsc(anyString())).thenReturn(queryResult); - when(queryResult.withPageSize(anyInt())).thenReturn(queryResult); - when(queryResult.toPage(anyInt())).thenReturn(queryResult); - when(queryResult.countPages()).thenReturn(1); - when(queryResult.getResultList()).thenReturn(resultList); - paginationParameter = new PaginationParameter(1, 1, HEARING_DATE, ASC); - } - - - @Test - public void shouldPaginate() throws Exception { - final PaginationResult result = paginationService.paginate(paginationParameter, queryResult); - verify(queryResult).orderAsc(paginationParameter.getSortField().getFieldName()); - verify(queryResult, never()).orderDesc(anyString()); - verify(queryResult).withPageSize(paginationParameter.getPageSize()); - verify(queryResult).toPage(paginationParameter.getPageNumber() - 1); - verify(queryResult).count(); - verify(queryResult).getResultList(); - - assertThat(result.getResult(), is(resultList)); - assertThat(result.getPageCount(), is(1L)); - } - - - @Test - public void shouldGetPageCount() { - assertThat(paginationService.toPageCount(11, 5), is(3L)); - assertThat(paginationService.toPageCount(1, 5), is(1L)); - assertThat(paginationService.toPageCount(1, 13), is(1L)); - } - - @Test(expected = IllegalArgumentException.class) - public void shouldThrowExceptionOnZeroPageNumber() { - new PaginationParameter(1, 0, HEARING_DATE, ASC); - } - - @Test(expected = IllegalArgumentException.class) - public void shouldThrowExceptionOnZeroPageSize() { - new PaginationParameter(0, 1, HEARING_DATE, ASC); - } - - @Test(expected = IllegalArgumentException.class) - public void shouldThrowExceptionOnNullSortField() { - new PaginationParameter(1, 1, null, ASC); - } - - @Test(expected = IllegalArgumentException.class) - public void shouldThrowExceptionOnNullSortOrder() { - new PaginationParameter(1, 1, HEARING_DATE, null); - } - -} \ No newline at end of file diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepositoryTest.java index 8598b346..6308059f 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/BusinessValidationErrorRepositoryTest.java @@ -1,193 +1,160 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; import static java.util.Optional.empty; +import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorDetails; import java.time.LocalDate; import java.util.List; -import java.util.Optional; -import java.util.Random; import java.util.UUID; -import javax.inject.Inject; - -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(CdiTestRunner.class) -public class BusinessValidationErrorRepositoryTest extends BaseTransactionalJunit4Test { - private static final UUID ID = randomUUID(); - private static final String FIELDID = randomUUID().toString(); - private static final String DISPLAYNAME = "case.marker"; - private static final UUID CASEID = randomUUID(); - private static final UUID DEFENDANTID = randomUUID(); - private static final String FIELDNAME = "case.marker"; - private static final String COURTNAME = "Bootle"; - private static final String COURTLOCATION = "Leeds"; - private static final String CASETYPE = "CC"; - private static final String URN = "88GD6251318"; - private static final String DEFENDANTBAILSTATUS = "CONDITIONAL"; - private static final String FIRST_NAME = "Joe"; - private static final String LAST_NAME = "Root"; - private static final String ORGANISATION_NAME = "Org"; - - private static final LocalDate DEFENDANTCHARGEDATE = LocalDate.now().minusMonths(2); - private static final LocalDate DEFENDANTHEARINGDATE = LocalDate.now().plusMonths(1); - private final String ERRORVALUE = "no marker "; - - @Inject - private BusinessValidationErrorRepository businessValidationErrorsRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; - @Test - public void shouldReturnZeroIfThereIsNoOutstandingErrors() { - final Long countOfCasesWithOutstandingErrors = businessValidationErrorsRepository.countOfCasesWithOutstandingErrors(empty(),empty()); - assertThat(countOfCasesWithOutstandingErrors, is(0L)); - } +public class BusinessValidationErrorRepositoryTest { - @Test - public void shouldReturnAllOutstandingErrorsCountsWithoutParameters(){ - produceAndSaveBusinessValidationErrors(50); - final Long countOfCasesWithOutstandingErrors = businessValidationErrorsRepository.countOfCasesWithOutstandingErrors(empty(),empty()); - assertThat(countOfCasesWithOutstandingErrors, is(50L)); + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; + + private static final UUID CASE_1 = randomUUID(); + private static final UUID CASE_2 = randomUUID(); + private static final UUID CASE_3 = randomUUID(); + private static final UUID CASE_4 = randomUUID(); + private static final UUID CASE_5 = randomUUID(); + + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + + private BusinessValidationErrorRepository businessValidationErrorRepository; + + @BeforeEach + public void createRepository() { + businessValidationErrorRepository = new BusinessValidationErrorRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(businessValidationErrorRepository); } @Test - public void shouldReturnAllOutStandingErrorsCountsWithCourtLocationOnly(){ - produceAndSaveBusinessValidationErrors(50); - BusinessValidationErrorDetails withCourHouseOnly = getBusinessValidationErrors(); - withCourHouseOnly.setCourtLocation ("NewCastle"); - withCourHouseOnly.setId(randomUUID()); - businessValidationErrorsRepository.save(withCourHouseOnly); - final Long countOfCasesWithOutstandingErrors = businessValidationErrorsRepository.countOfCasesWithOutstandingErrors(Optional.of("NewCastle"),empty()); - assertThat(countOfCasesWithOutstandingErrors, is(1L)); + void shouldReturnZeroIfThereIsNoOutstandingErrors() { + final Long count = businessValidationErrorRepository.countOfCasesWithOutstandingErrors(empty(), empty()); + assertThat(count, is(0L)); } @Test - public void shouldReturnAllOutStandingErrorsCountsWithCourtLocationCaseType(){ - produceAndSaveBusinessValidationErrors(50); - BusinessValidationErrorDetails withCourHouseandCaseType = getBusinessValidationErrors(); - withCourHouseandCaseType.setCourtLocation("Birmingham"); - withCourHouseandCaseType.setCaseType("NEW"); - withCourHouseandCaseType.setId(randomUUID()); - businessValidationErrorsRepository.save(withCourHouseandCaseType); - final Long countOfCasesWithOutstandingErrors = businessValidationErrorsRepository.countOfCasesWithOutstandingErrors( Optional.of("Birmingham"),Optional.of("NEW")); - assertThat(countOfCasesWithOutstandingErrors, is(1L)); + void shouldReturnAllOutstandingErrorsCountsWithoutParameters() { + insert10ErrorsFor(CASE_1, "London", "Summary"); + insert10ErrorsFor(CASE_2, "London", "Indictment"); + insert10ErrorsFor(CASE_3, "Manchester", "Summary"); + insert10ErrorsFor(CASE_4, "Manchester", "Indictment"); + insert10ErrorsFor(CASE_5, "Birmingham", "Crown"); + final Long count = businessValidationErrorRepository.countOfCasesWithOutstandingErrors(empty(), empty()); + + assertThat(count, is(5L)); } - private void produceAndSaveBusinessValidationErrors(final int i) { - for (int j = 0; j <50 ; j++) { - BusinessValidationErrorDetails businessValidationErrors = this.getBusinessValidationErrors(); - businessValidationErrors.setCaseId(randomUUID()); - businessValidationErrors.setId(randomUUID()); - for (int k = 0; k < new Random().nextInt(10); k++) { - BusinessValidationErrorDetails differentErrorOfTheSameCase = this.getBusinessValidationErrors(); - differentErrorOfTheSameCase.setCaseId(businessValidationErrors.getCaseId()); - differentErrorOfTheSameCase.setId(randomUUID()); - businessValidationErrorsRepository.save(differentErrorOfTheSameCase); - } - businessValidationErrorsRepository.save(businessValidationErrors); + @Test + void shouldReturnAllOutStandingErrorsCountsWithCourtLocationOnly() { + insert10ErrorsFor(CASE_1, "London", "Summary"); + insert10ErrorsFor(CASE_2, "London", "Indictment"); + insert10ErrorsFor(CASE_3, "Manchester", "Summary"); + insert10ErrorsFor(CASE_4, "Manchester", "Indictment"); + insert10ErrorsFor(CASE_5, "Birmingham", "Crown"); - } + final Long count = businessValidationErrorRepository.countOfCasesWithOutstandingErrors(of("London"), empty()); + + assertThat(count, is(2L)); } @Test - public void shouldFindBusinessValidationErrors() { - final BusinessValidationErrorDetails businessValidationErrors = getBusinessValidationErrors(); - businessValidationErrorsRepository.save(businessValidationErrors); - final BusinessValidationErrorDetails svdbusinessValidationErrors = businessValidationErrorsRepository.findBy(businessValidationErrors.getId()); - - assertThat(svdbusinessValidationErrors.getId(), equalTo(businessValidationErrors.getId())); - assertThat(svdbusinessValidationErrors.getErrorValue(), equalTo(businessValidationErrors.getErrorValue())); - assertThat(svdbusinessValidationErrors.getFieldId(), equalTo(businessValidationErrors.getFieldId())); - assertThat(svdbusinessValidationErrors.getDisplayName(), equalTo(businessValidationErrors.getDisplayName())); - assertThat(svdbusinessValidationErrors.getCaseId(), equalTo(businessValidationErrors.getCaseId())); - assertThat(svdbusinessValidationErrors.getDefendantId(), equalTo(businessValidationErrors.getDefendantId())); - assertThat(svdbusinessValidationErrors.getFieldName(), equalTo(businessValidationErrors.getFieldName())); - assertThat(svdbusinessValidationErrors.getCourtName(), equalTo(businessValidationErrors.getCourtName())); - assertThat(svdbusinessValidationErrors.getCaseType(), equalTo(businessValidationErrors.getCaseType())); - assertThat(svdbusinessValidationErrors.getUrn(), equalTo(businessValidationErrors.getUrn())); - assertThat(svdbusinessValidationErrors.getDefendantBailStatus(), equalTo(businessValidationErrors.getDefendantBailStatus())); - assertThat(svdbusinessValidationErrors.getDefendantChargeDate(), equalTo(businessValidationErrors.getDefendantChargeDate())); - assertThat(svdbusinessValidationErrors.getDefendantHearingDate(), equalTo(businessValidationErrors.getDefendantHearingDate())); - assertThat(svdbusinessValidationErrors.getFirstName(), equalTo(businessValidationErrors.getFirstName())); - assertThat(svdbusinessValidationErrors.getLastName(), equalTo(businessValidationErrors.getLastName())); - assertThat(svdbusinessValidationErrors.getOrganisationName(), equalTo(businessValidationErrors.getOrganisationName())); - - businessValidationErrorsRepository.remove(businessValidationErrors); + void shouldReturnAllOutStandingErrorsCountsWithCourtLocationCaseType() { + insert10ErrorsFor(CASE_1, "London", "Summary"); + insert10ErrorsFor(CASE_2, "London", "Indictment"); + insert10ErrorsFor(CASE_3, "Manchester", "Summary"); + insert10ErrorsFor(CASE_4, "Manchester", "Indictment"); + insert10ErrorsFor(CASE_5, "Birmingham", "Crown"); + + final Long count = businessValidationErrorRepository.countOfCasesWithOutstandingErrors(of("London"), of("Summary")); + + assertThat(count, is(1L)); } @Test - public void shouldDeleteErrorWithCaseIdAndNullDefendantId(){ - final UUID caseId = randomUUID(); + void shouldFindBusinessValidationErrors() { + final UUID errorId = randomUUID(); final UUID defendantId = randomUUID(); - final BusinessValidationErrorDetails caseLevelError = getBusinessValidationErrors(randomUUID(), caseId, null); - final BusinessValidationErrorDetails defendantLevelError = getBusinessValidationErrors(randomUUID(), caseId, defendantId); - businessValidationErrorsRepository.save(caseLevelError); - businessValidationErrorsRepository.save(defendantLevelError); - final List errorsByCaseIdBeforeDeletion = businessValidationErrorsRepository.findByCaseId(caseId); - assertThat(errorsByCaseIdBeforeDeletion, hasSize(2)); - - businessValidationErrorsRepository.deleteByCaseIdAndDefendantIdIsNull(caseId); - - final List errorsByCaseIdAfterDeletion = businessValidationErrorsRepository.findByCaseId(caseId); - assertThat(errorsByCaseIdAfterDeletion, hasSize(1)); - assertThat(errorsByCaseIdAfterDeletion.get(0).getDefendantId(), is(defendantId)); + final BusinessValidationErrorDetails error = createError(errorId, CASE_1, defendantId, "Manchester", "Summary"); + + businessValidationErrorRepository.save(error); + + final List byCaseId = businessValidationErrorRepository.findByCaseId(CASE_1); + assertThat(byCaseId.size(), is(1)); + + final List byDefendantId = businessValidationErrorRepository.findByDefendantId(defendantId); + assertThat(byDefendantId.size(), is(1)); + + final BusinessValidationErrorDetails found = businessValidationErrorRepository.findBy(errorId); + assertThat(found, notNullValue()); + assertThat(found.getCourtLocation(), is("Manchester")); + + found.setCourtLocation("Leeds"); + businessValidationErrorRepository.save(found); + + final BusinessValidationErrorDetails updated = businessValidationErrorRepository.findBy(errorId); + assertThat(updated.getCourtLocation(), is("Leeds")); + + businessValidationErrorRepository.remove(updated); + assertThat(businessValidationErrorRepository.findBy(errorId), is(nullValue())); } @Test - public void shouldDeleteErrorWithCaseIdAndDefendantFirstNameLastName(){ - final UUID caseId = randomUUID(); - final UUID defendantId = randomUUID(); - final BusinessValidationErrorDetails caseLevelError = getBusinessValidationErrors(randomUUID(), caseId, null); - final BusinessValidationErrorDetails defendantLevelError = getBusinessValidationErrors(randomUUID(), caseId, defendantId); - businessValidationErrorsRepository.save(caseLevelError); - businessValidationErrorsRepository.save(defendantLevelError); - final List errorsByCaseIdBeforeDeletion = businessValidationErrorsRepository.findByCaseId(caseId); - assertThat(errorsByCaseIdBeforeDeletion, hasSize(2)); + void shouldDeleteErrorWithCaseIdAndNullDefendantId() { + final UUID errorId1 = randomUUID(); + final UUID errorId2 = randomUUID(); + businessValidationErrorRepository.save(createError(errorId1, CASE_1, null, "London", "Summary")); + businessValidationErrorRepository.save(createError(errorId2, CASE_1, randomUUID(), "London", "Summary")); - businessValidationErrorsRepository.deleteByCaseIdAndFirstNameAndLastName(caseId, "Joe", "Root"); + businessValidationErrorRepository.deleteByCaseIdAndDefendantIdIsNull(CASE_1); + hibernateTestEntityManagerProvider.getEntityManager().clear(); - final List errorsByCaseIdAfterDeletion = businessValidationErrorsRepository.findByCaseId(caseId); - assertThat(errorsByCaseIdAfterDeletion, hasSize(0)); + assertThat(businessValidationErrorRepository.findBy(errorId1), is(nullValue())); + assertThat(businessValidationErrorRepository.findBy(errorId2), notNullValue()); } + @Test + void shouldDeleteErrorWithCaseIdAndDefendantFirstNameLastName() { + final UUID errorId = randomUUID(); + final BusinessValidationErrorDetails error = createError(errorId, CASE_1, null, "London", "Summary"); + error.setFirstName("John"); + error.setLastName("Smith"); + businessValidationErrorRepository.save(error); + + businessValidationErrorRepository.deleteByCaseIdAndFirstNameAndLastName(CASE_1, "John", "Smith"); + hibernateTestEntityManagerProvider.getEntityManager().clear(); + assertThat(businessValidationErrorRepository.findBy(errorId), is(nullValue())); + } - private BusinessValidationErrorDetails getBusinessValidationErrors() { - return getBusinessValidationErrors(ID, CASEID, DEFENDANTID); + private void insert10ErrorsFor(final UUID caseId, final String courtLocation, final String caseType) { + for (int i = 0; i < 10; i++) { + businessValidationErrorRepository.save(createError(randomUUID(), caseId, randomUUID(), courtLocation, caseType)); + } } - private BusinessValidationErrorDetails getBusinessValidationErrors(final UUID id, final UUID caseId, final UUID defendantId) { - final BusinessValidationErrorDetails businessValidationErrors = new BusinessValidationErrorDetails( - id, - ERRORVALUE, - FIELDID, - DISPLAYNAME, - caseId, - defendantId, - FIELDNAME, - COURTNAME, - COURTLOCATION, - CASETYPE, - URN, - DEFENDANTBAILSTATUS, - FIRST_NAME, - LAST_NAME, - ORGANISATION_NAME, - DEFENDANTCHARGEDATE, - DEFENDANTHEARINGDATE, - null - ); - return businessValidationErrors; + private BusinessValidationErrorDetails createError(final UUID id, final UUID caseId, final UUID defendantId, + final String courtLocation, final String caseType) { + return new BusinessValidationErrorDetails( + id, "errorValue", "fieldId", "displayName", + caseId, defendantId, "fieldName", "courtName", + courtLocation, caseType, "urn", "bailStatus", + "firstName", "lastName", "organisationName", + LocalDate.now(), LocalDate.now().plusDays(1), LocalDate.now().minusYears(30)); } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepositoryTest.java index 90822aa7..3794b24f 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/CaseDetailsRepositoryTest.java @@ -1,124 +1,106 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; import static java.util.Arrays.asList; -import static org.hamcrest.CoreMatchers.notNullValue; +import static java.util.Collections.emptySet; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThrows; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.CASE_ID; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.FIRST_DEFENDANT_CASE_ID; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.INVALID_PROSECUTOR_CASE_REFERENCE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.ORIGINATING_ORGANISATION; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.PROSECUTOR_AUTHORITY; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.PROSECUTOR_CASE_REFERENCE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.PROSECUTOR_CASE_REFERENCE2; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.PROSECUTOR_INFORMANT; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createFirstDefendantCaseDetails; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CaseDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CivilFees; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.SelfDefinedInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils; import java.util.List; -import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@RunWith(CdiTestRunner.class) public class CaseDetailsRepositoryTest { - @Inject + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; + + private static final UUID CASE_ID = UUID.randomUUID(); + private static final UUID FIRST_DEFENDANT_CASE_ID = UUID.randomUUID(); + private static final String PROSECUTOR_CASE_REFERENCE = "18CPS1234567"; + private static final String PROSECUTOR_CASE_REFERENCE2 = "18CPS7654321"; + private static final String INVALID_PROSECUTOR_CASE_REFERENCE = "INVALID_REFERENCE"; + private static final String PROSECUTOR_INFORMANT = "Test Informant"; + private static final String PROSECUTOR_AUTHORITY = "CPS"; + private static final String ORIGINATING_ORGANISATION = "Test Organisation"; + + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private CaseDetailsRepository caseDetailsRepository; + @BeforeEach + public void createRepository() { + caseDetailsRepository = new CaseDetailsRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseDetailsRepository); + } + @Test - public void shouldFindCaseDetailsByProsecutionCaseReference() { - final CaseDetails caseDetails = TestUtils.createFirstDefendantCaseDetails(); + void shouldFindCaseDetailsByProsecutionCaseReference() { + caseDetailsRepository.save(createFirstDefendantCaseDetails()); - final DefendantDetails defendantDetails = caseDetails.getDefendants().stream().findFirst().get(); + final CaseDetails caseDetails = caseDetailsRepository.findCaseDetailsByProsecutionCaseReference(PROSECUTOR_CASE_REFERENCE); - final PersonalInformationDetails personalInformation = defendantDetails.getPersonalInformation(); - personalInformation.setDefendantDetails(defendantDetails); + assertThat(caseDetails, notNullValue()); + assertThat(caseDetails.getProsecutionCaseReference(), is(PROSECUTOR_CASE_REFERENCE)); + assertThat(caseDetails.getProsecutorInformant(), is(PROSECUTOR_INFORMANT)); + assertThat(caseDetails.getProsecutionAuthority(), is(PROSECUTOR_AUTHORITY)); + assertThat(caseDetails.getOriginatingOrganisation(), is(ORIGINATING_ORGANISATION)); + } - final SelfDefinedInformationDetails selfDefinedInformation = defendantDetails.getSelfDefinedInformation(); - selfDefinedInformation.setDefendantDetails(defendantDetails); + @Test + void shouldConstructCaseDetails() { + final CaseDetails savedCase = caseDetailsRepository.save(createFirstDefendantCaseDetails()); - caseDetailsRepository.save(caseDetails); - final CaseDetails caseDetailsSvd = caseDetailsRepository.findCaseDetailsByProsecutionCaseReference(TestUtils.PROSECUTOR_CASE_REFERENCE); - assertCaseDetailsMatch(caseDetails, caseDetailsSvd); + assertThat(savedCase, notNullValue()); + assertThat(savedCase.getCaseId(), is(CASE_ID)); + assertThat(savedCase.getProsecutionCaseReference(), is(PROSECUTOR_CASE_REFERENCE)); } @Test - public void shouldConstructCaseDetails() { - final CaseDetails caseDetailsSvd = createFirstDefendantCaseDetails(); - final CaseDetails caseDetails = new CaseDetails(FIRST_DEFENDANT_CASE_ID, - PROSECUTOR_CASE_REFERENCE, - PROSECUTOR_INFORMANT, - PROSECUTOR_AUTHORITY, - ORIGINATING_ORGANISATION, - caseDetailsSvd.getDefendants(), - Set.of( new CivilFees(UUID.randomUUID(), CASE_ID,"someFeeType", - "someFeeStatus", - ""))); - assertCaseDetailsMatch(caseDetails, caseDetailsSvd); + void shouldFindAllCaseDetailsByProsecutionCaseReferences() { + caseDetailsRepository.save(createFirstDefendantCaseDetails()); + caseDetailsRepository.save(createSecondDefendantCaseDetails()); + + final List results = caseDetailsRepository.findAllCaseDetailsByProsecutionCaseReferences( + asList(PROSECUTOR_CASE_REFERENCE, PROSECUTOR_CASE_REFERENCE2)); + + assertThat(results.size(), is(2)); } @Test - public void shouldFindAllCaseDetailsByProsecutionCaseReferences() { - final CaseDetails firstDefendantCaseDetails = TestUtils.createFirstDefendantCaseDetails(); - final DefendantDetails firstDefendantDetails = firstDefendantCaseDetails.getDefendants().stream().findFirst().get(); - final PersonalInformationDetails personalInformation = firstDefendantDetails.getPersonalInformation(); - personalInformation.setDefendantDetails(firstDefendantDetails); - final SelfDefinedInformationDetails selfDefinedInformation = firstDefendantDetails.getSelfDefinedInformation(); - selfDefinedInformation.setDefendantDetails(firstDefendantDetails); - caseDetailsRepository.save(firstDefendantCaseDetails); - - final CaseDetails secondDefendantCaseDetails = TestUtils.createSecondDefendantCaseDetails(); - final DefendantDetails secondDefendantDetails = secondDefendantCaseDetails.getDefendants().stream().findFirst().get(); - final PersonalInformationDetails secondDefendantPersonalInformation = secondDefendantDetails.getPersonalInformation(); - secondDefendantPersonalInformation.setDefendantDetails(secondDefendantDetails); - final SelfDefinedInformationDetails secondDefendantSelfDefinedInformation= secondDefendantDetails.getSelfDefinedInformation(); - secondDefendantSelfDefinedInformation.setDefendantDetails(secondDefendantDetails); - caseDetailsRepository.save(secondDefendantCaseDetails); - - - final List resultedCaseDetails = caseDetailsRepository.findAllCaseDetailsByProsecutionCaseReferences(asList(TestUtils.PROSECUTOR_CASE_REFERENCE, PROSECUTOR_CASE_REFERENCE2)); - assertThat(resultedCaseDetails, notNullValue()); - assertThat(resultedCaseDetails.size(),is(2)); - assertCaseDetailsMatch(firstDefendantCaseDetails, resultedCaseDetails.get(0)); - assertCaseDetailsMatch(secondDefendantCaseDetails, resultedCaseDetails.get(1)); + void shouldThrowException_whenGivenProsecutionCaseReference_notExist() { + assertThrows(NoResultException.class, () -> + caseDetailsRepository.findCaseDetailsByProsecutionCaseReference(INVALID_PROSECUTOR_CASE_REFERENCE)); } - @Test - public void shouldThrowException_whenGivenProsecutionCaseReference_notExist() { - final CaseDetails firstDefendantCaseDetails = TestUtils.createFirstDefendantCaseDetails(); - final DefendantDetails firstDefendantDetails = firstDefendantCaseDetails.getDefendants().stream().findFirst().get(); - final PersonalInformationDetails personalInformation = firstDefendantDetails.getPersonalInformation(); - personalInformation.setDefendantDetails(firstDefendantDetails); - final SelfDefinedInformationDetails selfDefinedInformation = firstDefendantDetails.getSelfDefinedInformation(); - selfDefinedInformation.setDefendantDetails(firstDefendantDetails); - caseDetailsRepository.save(firstDefendantCaseDetails); - - final NoResultException expectedException = assertThrows(NoResultException.class, () ->caseDetailsRepository.findCaseDetailsByProsecutionCaseReference(INVALID_PROSECUTOR_CASE_REFERENCE)); - assertThat(expectedException.getMessage(), is("No entity found for query")); + private CaseDetails createFirstDefendantCaseDetails() { + return new CaseDetails( + CASE_ID, + PROSECUTOR_CASE_REFERENCE, + PROSECUTOR_INFORMANT, + PROSECUTOR_AUTHORITY, + ORIGINATING_ORGANISATION, + emptySet(), + null); } - private void assertCaseDetailsMatch(final CaseDetails caseDetails, final CaseDetails caseDetailsSvd) { - assertThat(caseDetails.getCaseId(), equalTo(caseDetailsSvd.getCaseId())); - assertThat(caseDetails.getProsecutionAuthority(), equalTo(caseDetailsSvd.getProsecutionAuthority())); - assertThat(caseDetails.getProsecutionCaseReference(), equalTo(caseDetailsSvd.getProsecutionCaseReference())); - assertThat(caseDetails.getProsecutorInformant(), equalTo(caseDetailsSvd.getProsecutorInformant())); - assertThat(caseDetails.getProsecutorInformant(), equalTo(caseDetailsSvd.getProsecutorInformant())); - assertThat(caseDetails.getDefendants().size(), equalTo(caseDetailsSvd.getDefendants().size())); + private CaseDetails createSecondDefendantCaseDetails() { + return new CaseDetails( + FIRST_DEFENDANT_CASE_ID, + PROSECUTOR_CASE_REFERENCE2, + PROSECUTOR_INFORMANT, + PROSECUTOR_AUTHORITY, + ORIGINATING_ORGANISATION, + emptySet(), + null); } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRespositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRespositoryTest.java index 6390edd2..5afed231 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRespositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantLegacyRespositoryTest.java @@ -1,194 +1,79 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; -import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; -import uk.gov.justice.cps.prosecutioncasefile.Cpr; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CPRDetails; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantLegacy; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantOffenderDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.Hearing; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.OffenceLegacy; -import java.time.LocalDate; +import java.util.HashSet; import java.util.List; -import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import com.google.common.collect.Sets; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(CdiTestRunner.class) public class DefendantLegacyRespositoryTest { - private static final String CASE_URN = "CASEURN"; - private static final String OFFENCE_CODE = "OF61131"; - private static final UUID CASE_ID = UUID.randomUUID(); - private static final UUID DEFENDANT_ID_ONE = UUID.randomUUID(); - private static final UUID DEFENDANT_ID_TWO = UUID.randomUUID(); - private static final UUID SUSPECT_ID_ONE = UUID.randomUUID(); - private static final UUID SUSPECT_ID_TWO = UUID.randomUUID(); - private static final UUID PERSON_ID = UUID.randomUUID(); - private static final UUID OFFENCE_ID_ONE = UUID.randomUUID(); - private static final UUID OFFENCE_ID_TWO = UUID.randomUUID(); - private static final String POLICE_DEFENDANT_ID = "POL-12345"; - private static final Integer COURT_ROOM = 1; - private static final String COURT_NAME = "Croydon Magistrates Court"; - private static final String COURT_ID = "COURTID-12345"; - private static final String TYPE_OF_COURT = "MAGISTRATES"; - private static final String HEARING_DATE = LocalDate.of(2019, 12, 2).toString(); - private final LocalDate ARREST_DATE = LocalDate.of(2019, 01, 01); - private final String CATEGORY = "CATEGORY"; - private final String INDICATED_PLEA = "Not Guilty"; - private final LocalDate CHARGE_DATE = LocalDate.of(2019, 03, 01); - private final LocalDate START_DATE = LocalDate.of(2015, 01, 01); - private final LocalDate END_DATE = LocalDate.of(2021, 01, 01); - private final int ORDER_INDEX = 1; - private final String PLEA = "Not Guilty"; - private final String POLICE_OFFENCE_ID = "policeid121212"; - private final Integer SEQUENCE_NUMBER = 1; - private final String WORDING = "Not Guilty"; - private final String SECTION = "SECTION"; - private final String REASON = "Reason"; - private final String DESCRIPTION = "Description"; - private final String CPR_CHECK_DIGIT = "A"; - private final String CPR_NUMBER = "10000000001"; - private final String CPR_OU = "XX45GD00"; - private final String CPR_YEAR = "09"; - - private DefendantLegacy defendantOne; - private DefendantLegacy defendantTwo; - - @Inject - private DefendantLegacyRepository defendantLegacyRepository; + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; - @Before - public void setup() { - createDefendants(); - } + private static final UUID DEFENDANT_ID = UUID.randomUUID(); + private static final UUID SUSPECT_ID = UUID.randomUUID(); + private static final UUID CASE_ID = UUID.randomUUID(); + private static final String CASE_URN = "18/0000001A"; - @After - public void teardown() { - removeDefendants(); - } + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Test - public void shouldFindDefendantById() throws Exception { - DefendantLegacy defendant = defendantLegacyRepository.findBy(DEFENDANT_ID_ONE); - assertThat(defendant.getDefendantId(), equalTo(DEFENDANT_ID_ONE)); - assertThat(defendant.getSuspectId(), equalTo(SUSPECT_ID_ONE)); - assertThat(defendant.getCaseId(), equalTo(CASE_ID)); - assertThat(defendant.getCaseUrn(), equalTo(CASE_URN)); - assertThat(defendant.getPersonId(), equalTo(PERSON_ID)); - assertThat(defendant.getPoliceDefendantId(), equalTo(POLICE_DEFENDANT_ID)); - assertThat(defendant.getSuspectId(), equalTo(SUSPECT_ID_ONE)); - - final Hearing hearing = defendant.getHearing(); - assertThat(hearing.getCourtId(), equalTo(COURT_ID)); - assertThat(hearing.getCourtName(), equalTo(COURT_NAME)); - assertThat(hearing.getCourtRoom(), equalTo(COURT_ROOM)); - assertThat(hearing.getHearingDate(), equalTo(HEARING_DATE)); - assertThat(hearing.getTypeOfCourt(), equalTo(TYPE_OF_COURT)); - - Optional offence = defendant.getOffences().stream().findFirst(); - assertThat(offence.isPresent(), is(true)); - assertThat(offence.get().getCode(), equalTo(OFFENCE_CODE)); - assertThat(offence.get().getOffenceId(), equalTo(OFFENCE_ID_ONE)); - assertThat(offence.get().getArrestDate(), equalTo(ARREST_DATE)); - assertThat(offence.get().getCategory(), equalTo(CATEGORY)); - assertThat(offence.get().getChargeDate(), equalTo(CHARGE_DATE)); - assertThat(offence.get().getDescription(), equalTo(DESCRIPTION)); - assertThat(offence.get().getEndDate(), equalTo(END_DATE)); - assertThat(offence.get().getIndicatedPlea(), equalTo(INDICATED_PLEA)); - assertThat(offence.get().getOrderIndex(), equalTo(ORDER_INDEX)); - assertThat(offence.get().getPlea(), equalTo(PLEA)); - assertThat(offence.get().getPoliceOffenceId(), equalTo(POLICE_OFFENCE_ID)); - assertThat(offence.get().getReason(), equalTo(REASON)); - assertThat(offence.get().getSection(), equalTo(SECTION)); - assertThat(offence.get().getSequenceNumber(), equalTo(SEQUENCE_NUMBER)); - assertThat(offence.get().getStartDate(), equalTo(START_DATE)); - assertThat(offence.get().getWording(), equalTo(WORDING)); - - final CPRDetails cpr = offence.get().getCpr(); - assertThat(cpr.getDefendantOffender().getCheckDigit(), equalTo(CPR_CHECK_DIGIT)); - assertThat(cpr.getDefendantOffender().getNumber(), equalTo(CPR_NUMBER)); - assertThat(cpr.getDefendantOffender().getOrganisationUnit(), equalTo(CPR_OU)); - assertThat(cpr.getDefendantOffender().getYear(), equalTo(CPR_YEAR)); - } + private DefendantLegacyRepository defendantLegacyRepository; - @Test - public void shouldReturnNullWhenNotFound() throws Exception { - DefendantLegacy defendant = defendantLegacyRepository.findBy(UUID.randomUUID()); - assertThat(defendant, nullValue()); + @BeforeEach + public void createRepository() { + defendantLegacyRepository = new DefendantLegacyRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantLegacyRepository); } @Test - public void shouldReturnDefendants() { - List defendants = defendantLegacyRepository.findByCaseId(CASE_ID); - assertThat(defendants.size(), is(2)); - } + void shouldSaveAndFindDefendantLegacy() { + final DefendantLegacy defendantLegacy = createDefendantLegacy(DEFENDANT_ID, CASE_ID); - private void createDefendants() { - defendantOne = new DefendantLegacy(DEFENDANT_ID_ONE, SUSPECT_ID_ONE, POLICE_DEFENDANT_ID, PERSON_ID, CASE_ID, CASE_URN, - Sets.newHashSet(createOffence(OFFENCE_ID_ONE))); + defendantLegacyRepository.save(defendantLegacy); - defendantOne.setHearing(createHearing()); + final DefendantLegacy found = defendantLegacyRepository.findBy(DEFENDANT_ID); + assertThat(found, notNullValue()); + assertThat(found.getDefendantId(), is(DEFENDANT_ID)); + assertThat(found.getSuspectId(), is(SUSPECT_ID)); + assertThat(found.getCaseId(), is(CASE_ID)); + assertThat(found.getCaseUrn(), is(CASE_URN)); + } - defendantLegacyRepository.save(defendantOne); + @Test + void shouldFindByCaseId() { + final UUID anotherCaseId = UUID.randomUUID(); + defendantLegacyRepository.save(createDefendantLegacy(DEFENDANT_ID, CASE_ID)); + defendantLegacyRepository.save(createDefendantLegacy(UUID.randomUUID(), anotherCaseId)); - defendantTwo = new DefendantLegacy(DEFENDANT_ID_TWO, SUSPECT_ID_TWO, POLICE_DEFENDANT_ID, PERSON_ID, CASE_ID, CASE_URN, - Sets.newHashSet(createOffence(OFFENCE_ID_TWO))); + final List results = defendantLegacyRepository.findByCaseId(CASE_ID); - defendantLegacyRepository.save(defendantTwo); + assertThat(results, hasSize(1)); + assertThat(results.get(0).getDefendantId(), is(DEFENDANT_ID)); } - private OffenceLegacy createOffence(UUID offenceId) { - OffenceLegacy offence = new OffenceLegacy(); - offence.setOffenceId(offenceId); - offence.setCode(OFFENCE_CODE); - offence.setCpr(createCpr()); - offence.setCategory(CATEGORY); - offence.setChargeDate(CHARGE_DATE); - offence.setDescription(DESCRIPTION); - offence.setStartDate(START_DATE); - offence.setEndDate(END_DATE); - offence.setIndicatedPlea(INDICATED_PLEA); - offence.setOrderIndex(ORDER_INDEX); - offence.setPoliceOffenceId(POLICE_OFFENCE_ID); - offence.setPlea(PLEA); - offence.setReason(REASON); - offence.setSection(SECTION); - offence.setSequenceNumber(SEQUENCE_NUMBER); - offence.setArrestDate(ARREST_DATE); - offence.setWording(WORDING); - offence.setCpr(createCpr()); - - return offence; - } + @Test + void shouldRemoveDefendantLegacy() { + final DefendantLegacy defendantLegacy = createDefendantLegacy(DEFENDANT_ID, CASE_ID); + defendantLegacyRepository.save(defendantLegacy); - private Hearing createHearing() { - final Hearing hearing = new Hearing(COURT_ID, COURT_NAME, COURT_ROOM, TYPE_OF_COURT, HEARING_DATE); - return hearing; - } + defendantLegacyRepository.remove(defendantLegacy); - private CPRDetails createCpr() { - final DefendantOffenderDetails defendantOffenderDetails = new DefendantOffenderDetails(CPR_YEAR, CPR_OU, CPR_NUMBER, CPR_CHECK_DIGIT); - final CPRDetails cpr = new CPRDetails(defendantOffenderDetails); - return cpr; + assertThat(defendantLegacyRepository.findBy(DEFENDANT_ID), nullValue()); } - private void removeDefendants() { - defendantLegacyRepository.remove(defendantOne); - defendantLegacyRepository.remove(defendantTwo); + private DefendantLegacy createDefendantLegacy(final UUID defendantId, final UUID caseId) { + return new DefendantLegacy(defendantId, SUSPECT_ID, "POL-001", UUID.randomUUID(), caseId, CASE_URN, new HashSet<>()); } - } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepositoryTest.java index de7d4f48..a13e82e3 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/DefendantRepositoryTest.java @@ -1,113 +1,81 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; - -import static java.util.Collections.singleton; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.APPLIED_PROSECUTOR_COSTS; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.ASN; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.DEFENDANT_ID; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.DOCUMENTATION_LANGUAGE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.DRIVER_NUMBER; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.HEARING_LANGUAGE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.LANGUAGE_REQUIREMENTS; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.NATIONAL_INSURANCE_NUMBER; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.NUM_PREVIOUS_CONVICTIONS; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.POSTING_DATE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.PROSECUTOR_DEFENDANT_REFERENCE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.SPECIFIC_REQUIREMENTS; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createFirstDefendantOffence; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createFirstDefendantPersonalInformation; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createFirstDefendantSelfDefinedInformation; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.OffenceDetails; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.SelfDefinedInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.UUID; -import javax.inject.Inject; - -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@RunWith(CdiTestRunner.class) public class DefendantRepositoryTest { - @Inject - private DefendantRepository defendantRepository; + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; - @Test - public void shouldFindDefendantById() { - final DefendantDetails defendantDetails = TestUtils.createFirstDefendant(); + private static final String DEFENDANT_ID = UUID.randomUUID().toString(); - final PersonalInformationDetails personalInformation = defendantDetails.getPersonalInformation(); - personalInformation.setDefendantDetails(defendantDetails); + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - final SelfDefinedInformationDetails selfDefinedInformation = defendantDetails.getSelfDefinedInformation(); - selfDefinedInformation.setDefendantDetails(defendantDetails); + private DefendantRepository defendantRepository; - defendantRepository.save(defendantDetails); + @BeforeEach + public void createRepository() { + defendantRepository = new DefendantRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantRepository); + } - final List defendantDetailsList = defendantRepository.findByDefendantId(TestUtils.DEFENDANT_ID.toString()); + @Test + void shouldSaveAndFindDefendant() { + final DefendantDetails defendant = createDefendant(DEFENDANT_ID); - assertThat(defendantDetailsList.size(), is(1)); - final DefendantDetails defendantDetailsSvd = defendantDetailsList.get(0); + defendantRepository.save(defendant); - assertDefendantsMatch(defendantDetails, defendantDetailsSvd); + final DefendantDetails found = defendantRepository.findBy(DEFENDANT_ID); + assertThat(found, notNullValue()); + assertThat(found.getDefendantId(), is(DEFENDANT_ID)); + assertThat(found.getAsn(), is("ASN123")); } @Test - public void shouldConstructDefendantDetails() { - final PersonalInformationDetails personalInformationDetails = createFirstDefendantPersonalInformation(); - final SelfDefinedInformationDetails selfDefinedInformationDetails = createFirstDefendantSelfDefinedInformation(); - final OffenceDetails offenceDetails = createFirstDefendantOffence(); - - final DefendantDetails defendantDetails = new DefendantDetails(DEFENDANT_ID.toString(), ASN, DOCUMENTATION_LANGUAGE, - HEARING_LANGUAGE, LANGUAGE_REQUIREMENTS, SPECIFIC_REQUIREMENTS, NUM_PREVIOUS_CONVICTIONS, POSTING_DATE, DRIVER_NUMBER, NATIONAL_INSURANCE_NUMBER, - PROSECUTOR_DEFENDANT_REFERENCE, APPLIED_PROSECUTOR_COSTS, personalInformationDetails, selfDefinedInformationDetails, singleton(offenceDetails), null, null,null); - - final DefendantDetails defendantDetailsSvd = new DefendantDetails(); - defendantDetailsSvd.setDefendantId(DEFENDANT_ID.toString()); - defendantDetailsSvd.setAsn(ASN); - defendantDetailsSvd.setDocumentationLanguage(DOCUMENTATION_LANGUAGE); - defendantDetailsSvd.setHearingLanguage(HEARING_LANGUAGE); - defendantDetailsSvd.setLanguageRequirement(LANGUAGE_REQUIREMENTS); - defendantDetailsSvd.setSpecificRequirements(SPECIFIC_REQUIREMENTS); - defendantDetailsSvd.setNumPreviousConvictions(NUM_PREVIOUS_CONVICTIONS); - defendantDetailsSvd.setPostingDate(POSTING_DATE); - defendantDetailsSvd.setDriverNumber(DRIVER_NUMBER); - defendantDetailsSvd.setNationalInsuranceNumber(NATIONAL_INSURANCE_NUMBER); - defendantDetailsSvd.setProsecutorDefendantReference(PROSECUTOR_DEFENDANT_REFERENCE); - defendantDetailsSvd.setAppliedProsecutorCosts(APPLIED_PROSECUTOR_COSTS); - - defendantDetailsSvd.setPersonalInformation(personalInformationDetails); - defendantDetailsSvd.setSelfDefinedInformation(selfDefinedInformationDetails); - defendantDetailsSvd.setOffences(singleton(offenceDetails)); - assertDefendantsMatch(defendantDetails, defendantDetailsSvd); + void shouldFindByDefendantId() { + final String anotherDefendantId = UUID.randomUUID().toString(); + defendantRepository.save(createDefendant(DEFENDANT_ID)); + defendantRepository.save(createDefendant(anotherDefendantId)); + + final List results = defendantRepository.findByDefendantId(DEFENDANT_ID); + + assertThat(results, hasSize(1)); + assertThat(results.get(0).getDefendantId(), is(DEFENDANT_ID)); } - private void assertDefendantsMatch(final DefendantDetails defendantDetails, final DefendantDetails defendantDetailsSvd) { - assertThat(defendantDetails.getDefendantId(), equalTo(defendantDetailsSvd.getDefendantId())); - assertThat(defendantDetails.getAsn(), equalTo(defendantDetailsSvd.getAsn())); - assertThat(defendantDetails.getHearingLanguage(), equalTo(defendantDetailsSvd.getHearingLanguage())); - assertThat(defendantDetails.getAppliedProsecutorCosts(), equalTo(defendantDetailsSvd.getAppliedProsecutorCosts())); - assertThat(defendantDetails.getNationalInsuranceNumber(), equalTo(defendantDetailsSvd.getNationalInsuranceNumber())); - assertThat(defendantDetails.getPersonalInformation().getPersonalInformationId(), equalTo(defendantDetailsSvd.getPersonalInformation().getPersonalInformationId())); - assertThat(defendantDetails.getSelfDefinedInformation().getSelfDefinedInformationId(), equalTo(defendantDetailsSvd.getSelfDefinedInformation().getSelfDefinedInformationId())); - assertThat(defendantDetails.getSpecificRequirements(), equalTo(defendantDetailsSvd.getSpecificRequirements())); - assertThat(defendantDetails.getLanguageRequirement(), equalTo(defendantDetailsSvd.getLanguageRequirement())); - assertThat(defendantDetails.getDocumentationLanguage(), equalTo(defendantDetailsSvd.getDocumentationLanguage())); - assertThat(defendantDetails.getNumPreviousConvictions(), equalTo(defendantDetailsSvd.getNumPreviousConvictions())); - assertThat(defendantDetails.getDocumentationLanguage(), equalTo(defendantDetailsSvd.getDocumentationLanguage())); - assertThat(defendantDetails.getPostingDate(), equalTo(defendantDetailsSvd.getPostingDate())); - assertThat(defendantDetails.getDriverNumber(), equalTo(defendantDetailsSvd.getDriverNumber())); - assertThat(defendantDetails.getOffences().size(), equalTo(defendantDetailsSvd.getOffences().size())); - assertThat(defendantDetails.getProsecutorDefendantReference(), equalTo(defendantDetailsSvd.getProsecutorDefendantReference())); + @Test + void shouldRemoveDefendant() { + final DefendantDetails defendant = createDefendant(DEFENDANT_ID); + defendantRepository.save(defendant); + + defendantRepository.remove(defendant); + + assertThat(defendantRepository.findBy(DEFENDANT_ID), nullValue()); } + private DefendantDetails createDefendant(final String defendantId) { + final PersonalInformationDetails personalInformation = new PersonalInformationDetails( + "Mr", "John", "Smith", "Engineer", 100, null, null); + return new DefendantDetails( + defendantId, "ASN123", null, null, null, null, null, null, + null, null, null, null, + personalInformation, null, new HashSet<>(), new ArrayList<>(), null, null); + } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepositoryTest.java index 6bcd9cc0..82082e44 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceLegacyRepositoryTest.java @@ -1,39 +1,82 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; + +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; +import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantLegacy; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.OffenceLegacy; +import java.time.LocalDate; +import java.util.HashSet; import java.util.UUID; -import javax.inject.Inject; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@RunWith(CdiTestRunner.class) public class OffenceLegacyRepositoryTest { + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; + private static final UUID OFFENCE_ID = UUID.randomUUID(); + private static final UUID DEFENDANT_ID = UUID.randomUUID(); + private static final UUID CASE_ID = UUID.randomUUID(); + + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private OffenceLegacyRepository offenceLegacyRepository; + private DefendantLegacyRepository defendantLegacyRepository; + + @BeforeEach + public void createRepositories() { + offenceLegacyRepository = new OffenceLegacyRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(offenceLegacyRepository); + defendantLegacyRepository = new DefendantLegacyRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantLegacyRepository); + } @Test - public void shouldFindOffence() { - OffenceLegacy offence = getOffence(); + void shouldSaveAndFindOffenceLegacy() { + final DefendantLegacy defendant = new DefendantLegacy(DEFENDANT_ID, UUID.randomUUID(), null, UUID.randomUUID(), CASE_ID, "18/0000001A", new HashSet<>()); + defendantLegacyRepository.save(defendant); + + final OffenceLegacy offence = createOffenceLegacy(OFFENCE_ID, defendant); + offenceLegacyRepository.save(offence); + + final OffenceLegacy found = offenceLegacyRepository.findBy(OFFENCE_ID); + assertThat(found, notNullValue()); + assertThat(found.getOffenceId(), is(OFFENCE_ID)); + assertThat(found.getCode(), is("RT88191")); + assertThat(found.getWording(), is("Speeding offence")); + } + + @Test + void shouldRemoveOffenceLegacy() { + final DefendantLegacy defendant = new DefendantLegacy(DEFENDANT_ID, UUID.randomUUID(), null, UUID.randomUUID(), CASE_ID, "18/0000001A", new HashSet<>()); + defendantLegacyRepository.save(defendant); + + final OffenceLegacy offence = createOffenceLegacy(OFFENCE_ID, defendant); offenceLegacyRepository.save(offence); - OffenceLegacy svdOffence = offenceLegacyRepository.findBy(offence.getOffenceId()); - assertThat(svdOffence.getOffenceId(), equalTo(offence.getOffenceId())); offenceLegacyRepository.remove(offence); + + assertThat(offenceLegacyRepository.findBy(OFFENCE_ID), nullValue()); } - private OffenceLegacy getOffence() { - OffenceLegacy offence = new OffenceLegacy(); - offence.setOffenceId(OFFENCE_ID); + private OffenceLegacy createOffenceLegacy(final UUID offenceId, final DefendantLegacy defendant) { + final OffenceLegacy offence = new OffenceLegacy(); + offence.setOffenceId(offenceId); + offence.setCode("RT88191"); + offence.setWording("Speeding offence"); + offence.setPlea("NOT_GUILTY"); + offence.setSequenceNumber(1); + offence.setStartDate(LocalDate.now()); + offence.setDefendant(defendant); + offence.setOrderIndex(1); return offence; } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepositoryTest.java index da1967c5..8479d084 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/OffenceRepositoryTest.java @@ -1,78 +1,88 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.APPLIED_COMPENSATION; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.BACK_DUTY; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.BACK_DUTY_FROM; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.BACK_DUTY_TO; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.CHARGE_DATE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_CODE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_COMMITTED_DATE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_COMMITTED_END_DATE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_DATE_CODE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_ID; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_LOCATION; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_SEQUENCE_NUMBER; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_WORDING; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OFFENCE_WORDING_WELSH; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.STATEMENT_OF_FACT; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.STATEMENT_OF_FACT_WELSH; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.VEHICLE_MAKE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.VEHICLE_REGISTRATION_MARK; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createFirstDefendantOffence; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; +import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.OffenceDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils; +import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails; -import javax.inject.Inject; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.UUID; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@RunWith(CdiTestRunner.class) public class OffenceRepositoryTest { - @Inject + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; + + private static final UUID OFFENCE_ID = UUID.randomUUID(); + private static final String DEFENDANT_ID = UUID.randomUUID().toString(); + + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private OffenceRepository offenceRepository; + private DefendantRepository defendantRepository; + + @BeforeEach + public void createRepositories() { + offenceRepository = new OffenceRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(offenceRepository); + defendantRepository = new DefendantRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantRepository); + } @Test - public void shouldFindOffenceById() { - final OffenceDetails offence = TestUtils.createFirstDefendantOffence(); + void shouldSaveAndFindOffence() { + final DefendantDetails defendant = saveDefendant(); + final OffenceDetails offence = createOffence(OFFENCE_ID, defendant); + offenceRepository.save(offence); - final OffenceDetails offenceDetailsSvd = offenceRepository.findBy(offence.getOffenceId()); - assertOffenceMatches(offence, offenceDetailsSvd); + + final OffenceDetails found = offenceRepository.findBy(OFFENCE_ID); + assertThat(found, notNullValue()); + assertThat(found.getOffenceId(), is(OFFENCE_ID)); + assertThat(found.getOffenceCode(), is("RT88191")); + assertThat(found.getOffenceWording(), is("Speeding offence")); } @Test - public void shouldConstructOffence() { - final OffenceDetails offenceDetails = new OffenceDetails(OFFENCE_ID, APPLIED_COMPENSATION, BACK_DUTY, BACK_DUTY_FROM, BACK_DUTY_TO, CHARGE_DATE, OFFENCE_CODE, OFFENCE_COMMITTED_DATE, - OFFENCE_COMMITTED_END_DATE, OFFENCE_DATE_CODE, OFFENCE_LOCATION, OFFENCE_SEQUENCE_NUMBER, OFFENCE_WORDING, OFFENCE_WORDING_WELSH, STATEMENT_OF_FACT, STATEMENT_OF_FACT_WELSH, - VEHICLE_MAKE, VEHICLE_REGISTRATION_MARK, null); - final OffenceDetails offenceDetailsSvd = createFirstDefendantOffence(); - assertOffenceMatches(offenceDetails, offenceDetailsSvd); + void shouldRemoveOffence() { + final DefendantDetails defendant = saveDefendant(); + final OffenceDetails offence = createOffence(OFFENCE_ID, defendant); + offenceRepository.save(offence); + + offenceRepository.remove(offence); + + assertThat(offenceRepository.findBy(OFFENCE_ID), nullValue()); + } + + private DefendantDetails saveDefendant() { + final PersonalInformationDetails personalInformation = new PersonalInformationDetails( + "Mr", "John", "Smith", null, null, null, null); + final DefendantDetails defendant = new DefendantDetails( + DEFENDANT_ID, "ASN123", null, null, null, null, null, null, + null, null, null, null, + personalInformation, null, new HashSet<>(), new ArrayList<>(), null, null); + return defendantRepository.save(defendant); } - private void assertOffenceMatches(final OffenceDetails offence, final OffenceDetails offenceDetailsSvd) { - assertThat(offence.getOffenceId(), equalTo(offenceDetailsSvd.getOffenceId())); - assertThat(offence.getAppliedCompensation(), equalTo(offenceDetailsSvd.getAppliedCompensation())); - assertThat(offence.getBackDuty(), equalTo(offenceDetailsSvd.getBackDuty())); - assertThat(offence.getOffenceCode(), equalTo(offenceDetailsSvd.getOffenceCode())); - assertThat(offence.getChargeDate(), equalTo(offenceDetailsSvd.getChargeDate())); - assertThat(offence.getOffenceLocation(), equalTo(offenceDetailsSvd.getOffenceLocation())); - assertThat(offence.getBackDutyDateFrom(), equalTo(offenceDetailsSvd.getBackDutyDateFrom())); - assertThat(offence.getBackDutyDateTo(), equalTo(offenceDetailsSvd.getBackDutyDateTo())); - assertThat(offence.getOffenceCommittedDate(), equalTo(offenceDetailsSvd.getOffenceCommittedDate())); - assertThat(offence.getDefendant(), equalTo(offenceDetailsSvd.getDefendant())); - assertThat(offence.getOffenceCommittedEndDate(), equalTo(offenceDetailsSvd.getOffenceCommittedEndDate())); - assertThat(offence.getOffenceDateCode(), equalTo(offenceDetailsSvd.getOffenceDateCode())); - assertThat(offence.getOffenceSequenceNumber(), equalTo(offenceDetailsSvd.getOffenceSequenceNumber())); - assertThat(offence.getOffenceWording(), equalTo(offenceDetailsSvd.getOffenceWording())); - assertThat(offence.getOffenceWordingWelsh(), equalTo(offenceDetailsSvd.getOffenceWordingWelsh())); - assertThat(offence.getStatementOfFacts(), equalTo(offenceDetailsSvd.getStatementOfFacts())); - assertThat(offence.getStatementOfFactsWelsh(), equalTo(offenceDetailsSvd.getStatementOfFactsWelsh())); - assertThat(offence.getVehicleMake(), equalTo(offenceDetailsSvd.getVehicleMake())); - assertThat(offence.getVehicleRegistrationMark(), equalTo(offenceDetailsSvd.getVehicleRegistrationMark())); + private OffenceDetails createOffence(final UUID offenceId, final DefendantDetails defendant) { + final OffenceDetails offence = new OffenceDetails( + offenceId, null, null, null, null, + LocalDate.now(), "RT88191", LocalDate.now(), null, + 1, "London", 1, "Speeding offence", null, + null, null, null, null, null); + offence.setDefendant(defendant); + return offence; } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRespositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRespositoryTest.java index 9e9a37d6..c973bc00 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRespositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/PersonalInformationRespositoryTest.java @@ -1,116 +1,73 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.FIRST_NAME; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.LAST_NAME; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OCCUPATION; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.OCCUPATION_CODE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.TITLE; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createAddress; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createContactDetails; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createFirstDefendant; - -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.AddressDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.ContactDetails; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.SelfDefinedInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils; - -import java.util.List; -import javax.inject.Inject; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.UUID; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@RunWith(CdiTestRunner.class) public class PersonalInformationRespositoryTest { - @Inject - private PersonalInformationRepository personalInformationRepository; + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; - @Inject - private DefendantRepository defendantRepository; + private static final String DEFENDANT_ID = UUID.randomUUID().toString(); - private PersonalInformationDetails personalInformationDetails; + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - private DefendantDetails defendantDetails; + private PersonalInformationRepository personalInformationRepository; + private DefendantRepository defendantRepository; - @Before - public void setUp() { - createAndSaveDefendant(); + @BeforeEach + public void createRepositories() { + personalInformationRepository = new PersonalInformationRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(personalInformationRepository); + defendantRepository = new DefendantRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantRepository); } @Test - public void shouldUpdatePersonalInformation() { - final String FIRST_NAME = "Percival"; - personalInformationDetails.setFirstName(FIRST_NAME); - personalInformationRepository.save(personalInformationDetails); - final List personalInformationDetailsList = personalInformationRepository.findAll(); - final PersonalInformationDetails personalInformationDetailsSvd = personalInformationDetailsList.get(0); - assertThat(personalInformationDetailsSvd.getFirstName(), equalTo(FIRST_NAME)); - assertPersonalInformationMatches(personalInformationDetails, personalInformationDetailsSvd); - } + void shouldFindPersonalInformationById() { + saveDefendantWithPersonalInformation("John", "Smith"); - @Test - public void shouldConstructPersonalInformation() { - final DefendantDetails defendantDetails = createFirstDefendant(); - final AddressDetails addressDetails = createAddress(); - final ContactDetails contactDetails = createContactDetails(); - final PersonalInformationDetails personalInformationDetails = new PersonalInformationDetails(TITLE, FIRST_NAME, LAST_NAME, OCCUPATION, OCCUPATION_CODE, addressDetails, contactDetails); - personalInformationDetails.setDefendantDetails(defendantDetails); - - final PersonalInformationDetails personalInformationDetailsSvd = new PersonalInformationDetails(); - personalInformationDetailsSvd.setFirstName(FIRST_NAME); - personalInformationDetailsSvd.setTitle(TITLE); - personalInformationDetailsSvd.setLastName(LAST_NAME); - personalInformationDetailsSvd.setOccupation(OCCUPATION); - personalInformationDetailsSvd.setOccupationCode(OCCUPATION_CODE); - personalInformationDetailsSvd.setAddress(addressDetails); - personalInformationDetailsSvd.setContactDetails(contactDetails); - personalInformationDetailsSvd.setDefendantDetails(defendantDetails); - - assertPersonalInformationMatches(personalInformationDetails, personalInformationDetailsSvd); - } + final PersonalInformationDetails found = personalInformationRepository.findBy(UUID.fromString(DEFENDANT_ID)); - private void assertPersonalInformationMatches(final PersonalInformationDetails personalInformationDetails, final PersonalInformationDetails personalInformationDetailsSvd) { - assertThat(personalInformationDetails.getPersonalInformationId(), equalTo(personalInformationDetailsSvd.getPersonalInformationId())); - assertThat(personalInformationDetails.getLastName(), equalTo(personalInformationDetailsSvd.getLastName())); - assertThat(personalInformationDetails.getAddress().getAddress1(), equalTo(personalInformationDetailsSvd.getAddress().getAddress1())); - assertThat(personalInformationDetails.getAddress().getAddress2(), equalTo(personalInformationDetailsSvd.getAddress().getAddress2())); - assertThat(personalInformationDetails.getAddress().getAddress3(), equalTo(personalInformationDetailsSvd.getAddress().getAddress3())); - assertThat(personalInformationDetails.getAddress().getAddress4(), equalTo(personalInformationDetailsSvd.getAddress().getAddress4())); - assertThat(personalInformationDetails.getAddress().getAddress5(), equalTo(personalInformationDetailsSvd.getAddress().getAddress5())); - assertThat(personalInformationDetails.getAddress().getPostcode(), equalTo(personalInformationDetailsSvd.getAddress().getPostcode())); - - assertThat(personalInformationDetails.getOccupation(), equalTo(personalInformationDetailsSvd.getOccupation())); - assertThat(personalInformationDetails.getTitle(), equalTo(personalInformationDetailsSvd.getTitle())); - assertThat(personalInformationDetails.getOccupationCode(), equalTo(personalInformationDetailsSvd.getOccupationCode())); - assertThat(personalInformationDetails.getDefendantDetails().getNationalInsuranceNumber(), equalTo(personalInformationDetailsSvd.getDefendantDetails().getNationalInsuranceNumber())); - - assertThat(personalInformationDetails.getContactDetails().isPresent(), equalTo(true)); - - assertThat(personalInformationDetails.getContactDetails().get().getHome(), equalTo(personalInformationDetailsSvd.getContactDetails().get().getHome())); - assertThat(personalInformationDetails.getContactDetails().get().getMobile(), equalTo(personalInformationDetailsSvd.getContactDetails().get().getMobile())); - assertThat(personalInformationDetails.getContactDetails().get().getPrimaryEmail(), equalTo(personalInformationDetailsSvd.getContactDetails().get().getPrimaryEmail())); - assertThat(personalInformationDetails.getContactDetails().get().getSecondaryEmail(), equalTo(personalInformationDetailsSvd.getContactDetails().get().getSecondaryEmail())); - assertThat(personalInformationDetails.getContactDetails().get().getWork(), equalTo(personalInformationDetailsSvd.getContactDetails().get().getWork())); + assertThat(found, notNullValue()); + assertThat(found.getFirstName(), is("John")); + assertThat(found.getLastName(), is("Smith")); } - private void createAndSaveDefendant() { - defendantDetails = TestUtils.createFirstDefendant(); + @Test + void shouldSavePersonalInformation() { + saveDefendantWithPersonalInformation("John", "Smith"); - personalInformationDetails = defendantDetails.getPersonalInformation(); - personalInformationDetails.setDefendantDetails(defendantDetails); + final PersonalInformationDetails found = personalInformationRepository.findBy(UUID.fromString(DEFENDANT_ID)); + assertThat(found, notNullValue()); - final SelfDefinedInformationDetails selfDefinedInformation = defendantDetails.getSelfDefinedInformation(); - selfDefinedInformation.setDefendantDetails(defendantDetails); + found.setFirstName("Jane"); + personalInformationRepository.save(found); - defendantRepository.save(defendantDetails); + final PersonalInformationDetails updated = personalInformationRepository.findBy(UUID.fromString(DEFENDANT_ID)); + assertThat(updated.getFirstName(), is("Jane")); } + private void saveDefendantWithPersonalInformation(final String firstName, final String lastName) { + final PersonalInformationDetails personalInformation = new PersonalInformationDetails( + "Mr", firstName, lastName, null, null, null, null); + final DefendantDetails defendant = new DefendantDetails( + DEFENDANT_ID, "ASN123", null, null, null, null, null, null, + null, null, null, null, + personalInformation, null, new HashSet<>(), new ArrayList<>(), null, null); + defendantRepository.save(defendant); + } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepositoryTest.java index 5cd9e132..2aac89cd 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/ResolvedCasesRepositoryTest.java @@ -2,123 +2,115 @@ import static java.util.Optional.empty; import static java.util.Optional.of; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.ResolvedCases; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(CdiTestRunner.class) public class ResolvedCasesRepositoryTest { - private static final List resolvedCasesList = new ArrayList<>(); - private final static long FILTER_RESULTS_FOR_JUST_DATE_COUNT = 10; - private final static long FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_COUNT = 20; - private final static long FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_AND_COURT_LOCATION_COUNT = 30; - private final static long FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_AND_COURT_LOCATION_AND_CASE_TYPE_COUNT = 40; + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; - private static final String REGION = "region"; - private static final String COURT_LOCATION = "courtLocation"; - private static final String CASE_TYPE = "caseType"; + private static final LocalDate RESOLUTION_DATE = LocalDate.of(2024, 1, 15); + private static final LocalDate OTHER_DATE = LocalDate.of(2024, 2, 15); + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - public static LocalDate fromDate = LocalDate.of(2020, 02, 1); + private final List resolvedCasesList = new ArrayList<>(); - @Inject private ResolvedCasesRepository resolvedCasesRepository; - @Before - public void setUp(){ - for (int i = 0; i < FILTER_RESULTS_FOR_JUST_DATE_COUNT; i++) { - final UUID caseId = UUID.randomUUID(); - final UUID ID = UUID.randomUUID(); - resolvedCasesRepository.save(createResolvedCases(ID, caseId, fromDate, empty(), empty(), empty())); - } - - for (int i = 0; i < FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_COUNT; i++) { - final UUID caseId = UUID.randomUUID(); - final UUID ID = UUID.randomUUID(); - resolvedCasesRepository.save(createResolvedCases(ID, caseId, fromDate.plusDays(1), of(REGION), empty(), empty())); - } + @BeforeEach + public void createRepositoryAndInsertTestData() { + resolvedCasesRepository = new ResolvedCasesRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(resolvedCasesRepository); + resolvedCasesList.clear(); - for (int i = 0; i < FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_AND_COURT_LOCATION_COUNT; i++) { - final UUID caseId = UUID.randomUUID(); - UUID ID = UUID.randomUUID(); - resolvedCasesRepository.save(createResolvedCases(ID, caseId, fromDate.plusDays(2), of(REGION), of(COURT_LOCATION), empty())); - } - - for (int i = 0; i < FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_AND_COURT_LOCATION_AND_CASE_TYPE_COUNT; i++) { - final UUID caseId = UUID.randomUUID(); - UUID ID = UUID.randomUUID(); - resolvedCasesRepository.save(createResolvedCases(ID, caseId, fromDate.plusDays(3), of(REGION), of(COURT_LOCATION), of(CASE_TYPE))); - } + insertResolvedCases(10, "NW", "Manchester", "Summary"); + insertResolvedCases(20, "NW", "Liverpool", "Crown"); + insertResolvedCases(30, "NE", "Leeds", "Summary"); + insertResolvedCases(40, "NE", "Sheffield", "Crown"); } - @After - public void tearDown() { + @AfterEach + public void removeTestData() { for (final ResolvedCases resolvedCases : resolvedCasesList) { resolvedCasesRepository.remove(resolvedCases); } } @Test - public void shouldTestCountOfCasesFixedByDate() { - long count = resolvedCasesRepository.countOfCasesFixedByDate(fromDate, empty(), empty(), empty()); - assertThat(count, is(FILTER_RESULTS_FOR_JUST_DATE_COUNT)); + void shouldCountAllCasesWithNoFilters() { + final Long count = resolvedCasesRepository.countOfCasesFixedByDate(RESOLUTION_DATE, empty(), empty(), empty()); + + assertThat(count, is(100L)); } @Test - public void shouldTestCountOfCasesFixedByDateAndRegion() { - long count = resolvedCasesRepository.countOfCasesFixedByDate(fromDate.plusDays(1), of(REGION), empty(), empty()); - assertThat(count, is(FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_COUNT)); + void shouldCountZeroForDifferentDate() { + final Long count = resolvedCasesRepository.countOfCasesFixedByDate(OTHER_DATE, empty(), empty(), empty()); + + assertThat(count, is(0L)); } @Test - public void shouldTestCountOfCasesFixedByDateAndRegionAndCourtLocation() { - long count = resolvedCasesRepository.countOfCasesFixedByDate(fromDate.plusDays(2), of(REGION), of(COURT_LOCATION), empty()); - assertThat(count, is(FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_AND_COURT_LOCATION_COUNT)); + void shouldCountCasesFilteredByRegion() { + final Long count = resolvedCasesRepository.countOfCasesFixedByDate(RESOLUTION_DATE, of("NW"), empty(), empty()); + + assertThat(count, is(30L)); } @Test - public void shouldTestCountOfCasesFixedByDateAndRegionAndCourtLocationAndCaseType() { - long count = resolvedCasesRepository.countOfCasesFixedByDate(fromDate.plusDays(3), of(REGION), of(COURT_LOCATION), of(CASE_TYPE)); - assertThat(count, is(FILTER_RESULTS_FOR_JUST_DATE_AND_REGION_AND_COURT_LOCATION_AND_CASE_TYPE_COUNT)); + void shouldCountCasesFilteredByRegionAndCourtLocation() { + final Long count = resolvedCasesRepository.countOfCasesFixedByDate(RESOLUTION_DATE, of("NW"), of("Manchester"), empty()); + + assertThat(count, is(10L)); } - public ResolvedCases createResolvedCases(final UUID ID, final UUID caseId, - final LocalDate localDate, - final Optional region, - final Optional courtLocation, - final Optional caseType) { - final ResolvedCases lResolvedCases = new ResolvedCases(); - lResolvedCases.setCaseId(caseId); - lResolvedCases.setId(ID); - lResolvedCases.setResolutionDate(localDate); - if (region.isPresent()) { - lResolvedCases.setRegion(region.get()); - } - if (courtLocation.isPresent()) { - lResolvedCases.setCourtLocation(courtLocation.get()); - } - if (caseType.isPresent()) { - lResolvedCases.setCaseType(caseType.get()); + @Test + void shouldCountCasesFilteredByRegionAndCourtLocationAndCaseType() { + final Long count = resolvedCasesRepository.countOfCasesFixedByDate(RESOLUTION_DATE, of("NE"), of("Leeds"), of("Summary")); + + assertThat(count, is(30L)); + } + + @Test + void shouldCountCasesFilteredByCaseType() { + final Long count = resolvedCasesRepository.countOfCasesFixedByDate(RESOLUTION_DATE, empty(), empty(), of("Crown")); + + assertThat(count, is(60L)); + } + + @Test + void shouldCountCasesFilteredByCourtLocation() { + final Long count = resolvedCasesRepository.countOfCasesFixedByDate(RESOLUTION_DATE, empty(), of("Sheffield"), empty()); + + assertThat(count, is(40L)); + } + + private void insertResolvedCases(final int count, final String region, final String courtLocation, final String caseType) { + for (int i = 0; i < count; i++) { + final ResolvedCases resolvedCases = new ResolvedCases(); + resolvedCases.setId(UUID.randomUUID()); + resolvedCases.setCaseId(UUID.randomUUID()); + resolvedCases.setResolutionDate(RESOLUTION_DATE); + resolvedCases.setRegion(region); + resolvedCases.setCourtLocation(courtLocation); + resolvedCases.setCaseType(caseType); + resolvedCasesRepository.save(resolvedCases); + resolvedCasesList.add(resolvedCases); } - resolvedCasesList.add(lResolvedCases); - return lResolvedCases; } -} \ No newline at end of file +} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepositoryTest.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepositoryTest.java index 7d82b62e..5b8a5b3f 100644 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepositoryTest.java +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/repository/SelfDefinedInformationRepositoryTest.java @@ -1,92 +1,78 @@ package uk.gov.moj.cpp.prosecutioncasefile.persistence.repository; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.ADDITIONAL_NATIONALITY; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.DATE_OF_BIRTH; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.ETHNICITY; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.GENDER; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.NATIONALITY; -import static uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils.createFirstDefendant; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; +import uk.gov.moj.cpp.prosecution.casefile.json.schemas.Gender; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails; import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.SelfDefinedInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.util.TestUtils; -import java.util.List; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(CdiTestRunner.class) public class SelfDefinedInformationRepositoryTest { - @Inject - private SelfDefinedInformationRepository selfDefinedInformationRepository; + private static final String PERSISTENCE_UNIT = "prosecutioncasefile-test-persistence-unit"; - @Inject - private DefendantRepository defendantRepository; + private static final String DEFENDANT_ID = UUID.randomUUID().toString(); - private SelfDefinedInformationDetails selfDefinedInformationDetails; + @RegisterExtension + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - private DefendantDetails defendantDetails; + private SelfDefinedInformationRepository selfDefinedInformationRepository; + private DefendantRepository defendantRepository; - @Before - public void setUp() { - createAndSaveDefendant(); + @BeforeEach + public void createRepositories() { + selfDefinedInformationRepository = new SelfDefinedInformationRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(selfDefinedInformationRepository); + defendantRepository = new DefendantRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantRepository); } @Test - public void shouldUpdateSelfDefinedInformation() { - final String ADDITIONAL_NATIONALITY = "American"; - selfDefinedInformationDetails.setAdditionalNationality(ADDITIONAL_NATIONALITY); - selfDefinedInformationRepository.save(selfDefinedInformationDetails); - - final List selfDefinedInformationDetailsList = selfDefinedInformationRepository.findAll(); - assertThat(selfDefinedInformationDetailsList.size(), equalTo(1)); - final SelfDefinedInformationDetails selfDefinedInformationDetailsSvd = selfDefinedInformationDetailsList.get(0); - assertThat(selfDefinedInformationDetailsSvd.getAdditionalNationality(), equalTo(ADDITIONAL_NATIONALITY)); - assertSelfDefinedInformationMatches(selfDefinedInformationDetails, selfDefinedInformationDetailsSvd); - } + void shouldFindSelfDefinedInformationById() { + saveDefendantWithSelfDefinedInformation("British", Gender.MALE); - @Test - public void shouldConstructSelfDefinedInformation() { - final DefendantDetails defendantDetails = createFirstDefendant(); - final SelfDefinedInformationDetails selfDefinedInformationDetails = new SelfDefinedInformationDetails(ADDITIONAL_NATIONALITY, DATE_OF_BIRTH, ETHNICITY, GENDER, NATIONALITY); - selfDefinedInformationDetails.setDefendantDetails(defendantDetails); - final SelfDefinedInformationDetails selfDefinedInformationDetailsSvd = new SelfDefinedInformationDetails(); - selfDefinedInformationDetailsSvd.setAdditionalNationality(ADDITIONAL_NATIONALITY); - selfDefinedInformationDetailsSvd.setDateOfBirth(DATE_OF_BIRTH); - selfDefinedInformationDetailsSvd.setEthnicity(ETHNICITY); - selfDefinedInformationDetailsSvd.setGender(GENDER); - selfDefinedInformationDetailsSvd.setNationality(NATIONALITY); - selfDefinedInformationDetailsSvd.setDefendantDetails(defendantDetails); - assertSelfDefinedInformationMatches(selfDefinedInformationDetails, selfDefinedInformationDetailsSvd); - } + final SelfDefinedInformationDetails found = selfDefinedInformationRepository.findBy(UUID.fromString(DEFENDANT_ID)); - private void assertSelfDefinedInformationMatches(final SelfDefinedInformationDetails selfDefinedInformationDetails, final SelfDefinedInformationDetails selfDefinedInformationDetailsSvd) { - assertThat(selfDefinedInformationDetailsSvd.getSelfDefinedInformationId(), equalTo(selfDefinedInformationDetails.getSelfDefinedInformationId())); - assertThat(selfDefinedInformationDetailsSvd.getEthnicity(), equalTo(selfDefinedInformationDetailsSvd.getEthnicity())); - assertThat(selfDefinedInformationDetailsSvd.getDateOfBirth(), equalTo(selfDefinedInformationDetails.getDateOfBirth())); - assertThat(selfDefinedInformationDetailsSvd.getDefendantDetails().getDefendantId(), equalTo(selfDefinedInformationDetails.getDefendantDetails().getDefendantId())); - assertThat(selfDefinedInformationDetailsSvd.getGender(), equalTo(selfDefinedInformationDetails.getGender())); - assertThat(selfDefinedInformationDetailsSvd.getNationality(), equalTo(selfDefinedInformationDetails.getNationality())); + assertThat(found, notNullValue()); + assertThat(found.getNationality(), is("British")); + assertThat(found.getGender(), is(Gender.MALE)); } - private void createAndSaveDefendant() { - defendantDetails = TestUtils.createFirstDefendant(); + @Test + void shouldSaveSelfDefinedInformation() { + saveDefendantWithSelfDefinedInformation("British", Gender.MALE); - final PersonalInformationDetails personalInformationDetails = defendantDetails.getPersonalInformation(); - personalInformationDetails.setDefendantDetails(defendantDetails); + final SelfDefinedInformationDetails found = selfDefinedInformationRepository.findBy(UUID.fromString(DEFENDANT_ID)); + assertThat(found, notNullValue()); - selfDefinedInformationDetails = defendantDetails.getSelfDefinedInformation(); - selfDefinedInformationDetails.setDefendantDetails(defendantDetails); + found.setNationality("French"); + selfDefinedInformationRepository.save(found); + + final SelfDefinedInformationDetails updated = selfDefinedInformationRepository.findBy(UUID.fromString(DEFENDANT_ID)); + assertThat(updated.getNationality(), is("French")); + } - defendantRepository.save(defendantDetails); + private void saveDefendantWithSelfDefinedInformation(final String nationality, final Gender gender) { + final PersonalInformationDetails personalInformation = new PersonalInformationDetails( + "Mr", "John", "Smith", null, null, null, null); + final SelfDefinedInformationDetails selfDefinedInformation = new SelfDefinedInformationDetails( + null, LocalDate.of(1990, 5, 15), "White British", gender, nationality); + final DefendantDetails defendant = new DefendantDetails( + DEFENDANT_ID, "ASN123", null, null, null, null, null, null, + null, null, null, null, + personalInformation, selfDefinedInformation, new HashSet<>(), new ArrayList<>(), null, null); + defendantRepository.save(defendant); } } diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/util/TestUtils.java b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/util/TestUtils.java deleted file mode 100644 index 1c3a78c8..00000000 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncasefile/persistence/util/TestUtils.java +++ /dev/null @@ -1,296 +0,0 @@ -package uk.gov.moj.cpp.prosecutioncasefile.persistence.util; - -import static java.time.LocalDate.now; -import static java.util.Collections.singleton; -import static java.util.UUID.fromString; -import static java.util.UUID.randomUUID; - -import uk.gov.moj.cpp.prosecution.casefile.json.schemas.Gender; -import uk.gov.moj.cpp.prosecution.casefile.json.schemas.Language; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.AddressDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.BusinessValidationErrorDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.CaseDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.ContactDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.DefendantDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.OffenceDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.PersonalInformationDetails; -import uk.gov.moj.cpp.prosecutioncasefile.persistence.entity.SelfDefinedInformationDetails; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.util.UUID; - -public class TestUtils { - public static final UUID CASE_ID = randomUUID(); - public static final UUID FIRST_DEFENDANT_CASE_ID = fromString("cf65ac42-c3e8-4dc8-8521-32b7f0b85b00"); - public static final UUID SECOND_DEFENDANT_CASE_ID = fromString("bd05d47e-c993-412a-b08c-2955ea59809d"); - public static final UUID VALUE_DEFENDANT_ID = randomUUID(); - public static final String VALUE_OFFENCE_ID = randomUUID().toString(); - - public static final UUID DEFENDANT_ID = randomUUID(); //"1d-1n-t3st"; // NON UUID - public static final UUID OFFENCE_ID = randomUUID(); - public static final String CASE_URN = "CASEURN"; - public static final String ASN = "001"; - public static final Language DOCUMENTATION_LANGUAGE = Language.E; - public static final Language HEARING_LANGUAGE = Language.W; - public static final String LANGUAGE_REQUIREMENTS = "no special language needs"; - public static final String SPECIFIC_REQUIREMENTS = "no special requirements needed"; - public static final Integer NUM_PREVIOUS_CONVICTIONS = 3; - public static final LocalDate POSTING_DATE = now(); - public static final String DRIVER_NUMBER = "AS"; - public static final String NATIONAL_INSURANCE_NUMBER = "AA123456C"; - public static final String PROSECUTOR_DEFENDANT_REFERENCE = "DEFENDANT-REF-01"; - - public static final BigDecimal APPLIED_PROSECUTOR_COSTS = new BigDecimal(100); - public static final String PROSECUTOR_AUTHORITY = "TFL"; - public static final String PROSECUTOR_CASE_REFERENCE = "TFL75947ZQ8UE"; - public static final String PROSECUTOR_CASE_REFERENCE2 = "TFL95000ZQ8UE"; - public static final String INVALID_PROSECUTOR_CASE_REFERENCE = "TFL0000000000"; - public static final String PROSECUTOR_INFORMANT = "John"; - public static final String ORIGINATING_ORGANISATION = "GAAAA01"; - - public static final String FIRST_NAME = "John"; - public static final String LAST_NAME = "Doe"; - public static final String ADDRESS_1 = "Flat 8, Lant House"; - public static final String ADDRESS_2 = "Lant Street"; - public static final String ADDRESS_3 = "London"; - public static final String ADDRESS_4 = "Greater London"; - public static final String ADDRESS_5 = "UK"; - public static final BigDecimal APPLIED_COMPENSATION = new BigDecimal(200); - public static final BigDecimal BACK_DUTY = new BigDecimal(340); - public static final LocalDate BACK_DUTY_FROM = LocalDate.of(2002, 4, 1); - public static final LocalDate BACK_DUTY_TO = LocalDate.of(2012, 4, 1); - public static final LocalDate CHARGE_DATE = LocalDate.of(2017, 6, 25); - public static final String HOME = "20 7234 3456"; - public static final String MOBILE = "07911 123456"; - public static final String OCCUPATION = "TA"; - public static final Integer OCCUPATION_CODE = 666; - public static final String NATIONALITY = "Slovak"; - public static final String ADDITIONAL_NATIONALITY = "English"; - public static final Gender GENDER = Gender.MALE; - public static final LocalDate DATE_OF_BIRTH = LocalDate.of(1989, 4, 18); - public static final String ETHNICITY = "white"; - - public static final String EMAIL = "john.doe@hmcts.com"; - public static final String SECONDARY_EMAIL = "john.doe@kainos.com"; - public static final String TITLE = "Mr"; - public static final String WORK = "Code Writer"; - - public static final String OFFENCE_CODE = "OF61131"; - public static final Integer OFFENCE_DATE_CODE = 1; - public static final LocalDate OFFENCE_COMMITTED_DATE = LocalDate.of(2017, 2, 2); - public static final LocalDate OFFENCE_COMMITTED_END_DATE = LocalDate.of(2017, 4, 2); - public static final String OFFENCE_LOCATION = "Croydon"; - public static final Integer OFFENCE_SEQUENCE_NUMBER = 2; - public static final String OFFENCE_WORDING = "Forgot to pay the TV license again :'("; - public static final String OFFENCE_WORDING_WELSH = "Forgot to pay the TV license again :'( --WELSH"; - public static final String STATEMENT_OF_FACT = "John Doe missed a TV license payment for the 2nd time"; - public static final String STATEMENT_OF_FACT_WELSH = "John Doe missed a TV license payment for the 2nd time --WELSH"; - public static final String VEHICLE_MAKE = "Ford"; - public static final String VEHICLE_REGISTRATION_MARK = "AA11 ABC"; - - - public static CaseDetails createFirstDefendantCaseDetails() { - final CaseDetails caseDetails = new CaseDetails(); - setCaseDetails(caseDetails, FIRST_DEFENDANT_CASE_ID, PROSECUTOR_CASE_REFERENCE); - caseDetails.setDefendants(singleton(createFirstDefendant())); - return caseDetails; - } - public static CaseDetails createSecondDefendantCaseDetails() { - final CaseDetails caseDetails = new CaseDetails(); - setCaseDetails(caseDetails, SECOND_DEFENDANT_CASE_ID, PROSECUTOR_CASE_REFERENCE2); - caseDetails.setDefendants(singleton(createSecondDefendant())); - return caseDetails; - } - - private static void setCaseDetails(CaseDetails caseDetails, UUID caseId, String prosecutorCaseReference2) { - caseDetails.setCaseId(caseId); - caseDetails.setProsecutionAuthority(PROSECUTOR_AUTHORITY); - caseDetails.setProsecutionCaseReference(prosecutorCaseReference2); - caseDetails.setProsecutorInformant(PROSECUTOR_INFORMANT); - caseDetails.setOriginatingOrganisation(ORIGINATING_ORGANISATION); - } - - public static DefendantDetails createFirstDefendant() { - final DefendantDetails defendant = new DefendantDetails(); - setDefendant(defendant, DEFENDANT_ID); - defendant.setPersonalInformation(createFirstDefendantPersonalInformation()); - defendant.setSelfDefinedInformation(createFirstDefendantSelfDefinedInformation()); - defendant.setOffences(singleton(createFirstDefendantOffence())); - return defendant; - } - - public static DefendantDetails createSecondDefendant() { - final DefendantDetails defendant = new DefendantDetails(); - setDefendant(defendant, randomUUID()); - defendant.setPersonalInformation(createSecondDefendantPersonalInformation()); - defendant.setSelfDefinedInformation(createSecondDefendantSelfDefinedInformation()); - defendant.setOffences(singleton(createSecondDefendantOffence())); - return defendant; - } - - private static void setDefendant(DefendantDetails defendant, UUID randomUUID) { - defendant.setDefendantId(randomUUID.toString()); - defendant.setAsn(ASN); - defendant.setDocumentationLanguage(DOCUMENTATION_LANGUAGE); - defendant.setAppliedProsecutorCosts(APPLIED_PROSECUTOR_COSTS); - defendant.setHearingLanguage(HEARING_LANGUAGE); - defendant.setLanguageRequirement(LANGUAGE_REQUIREMENTS); - defendant.setSpecificRequirements(SPECIFIC_REQUIREMENTS); - defendant.setNumPreviousConvictions(NUM_PREVIOUS_CONVICTIONS); - defendant.setPostingDate(POSTING_DATE); - defendant.setDriverNumber(DRIVER_NUMBER); - defendant.setNationalInsuranceNumber(NATIONAL_INSURANCE_NUMBER); - defendant.setProsecutorDefendantReference(PROSECUTOR_DEFENDANT_REFERENCE); - } - - public static SelfDefinedInformationDetails createFirstDefendantSelfDefinedInformation() { - final SelfDefinedInformationDetails selfDefinedInformation = new SelfDefinedInformationDetails(); - setSelfDefinedInformation(selfDefinedInformation, DEFENDANT_ID); - - return selfDefinedInformation; - } - - public static SelfDefinedInformationDetails createSecondDefendantSelfDefinedInformation() { - final SelfDefinedInformationDetails selfDefinedInformation = new SelfDefinedInformationDetails(); - setSelfDefinedInformation(selfDefinedInformation, randomUUID()); - return selfDefinedInformation; - } - private static void setSelfDefinedInformation(SelfDefinedInformationDetails selfDefinedInformation, UUID defendantId) { - selfDefinedInformation.setSelfDefinedInformationId(defendantId.toString()); - selfDefinedInformation.setDateOfBirth(DATE_OF_BIRTH); - selfDefinedInformation.setEthnicity(ETHNICITY); - selfDefinedInformation.setGender(GENDER); - selfDefinedInformation.setNationality(NATIONALITY); - selfDefinedInformation.setAdditionalNationality(ADDITIONAL_NATIONALITY); - } - - public static AddressDetails createAddress() { - final AddressDetails addressDetails = new AddressDetails(); - addressDetails.setAddress1(ADDRESS_1); - addressDetails.setAddress2(ADDRESS_2); - addressDetails.setAddress3(ADDRESS_3); - addressDetails.setAddress4(ADDRESS_4); - addressDetails.setAddress5(ADDRESS_5); - return addressDetails; - } - - public static ContactDetails createContactDetails() { - final ContactDetails contactDetails = new ContactDetails(); - contactDetails.setHome(HOME); - contactDetails.setMobile(MOBILE); - contactDetails.setPrimaryEmail(EMAIL); - contactDetails.setSecondaryEmail(SECONDARY_EMAIL); - contactDetails.setWork(WORK); - - return contactDetails; - } - - public static PersonalInformationDetails createFirstDefendantPersonalInformation() { - final PersonalInformationDetails personalInformation = new PersonalInformationDetails(); - setPersonalInformation(personalInformation, DEFENDANT_ID); - - return personalInformation; - } - - public static PersonalInformationDetails createSecondDefendantPersonalInformation() { - final PersonalInformationDetails personalInformation = new PersonalInformationDetails(); - setPersonalInformation(personalInformation, randomUUID()); - - return personalInformation; - } - - private static void setPersonalInformation(PersonalInformationDetails personalInformation, UUID randomUUID) { - personalInformation.setPersonalInformationId(randomUUID.toString()); - personalInformation.setTitle(TITLE); - personalInformation.setFirstName(FIRST_NAME); - personalInformation.setLastName(LAST_NAME); - personalInformation.setOccupation(OCCUPATION); - personalInformation.setOccupationCode(OCCUPATION_CODE); - personalInformation.setContactDetails(createContactDetails()); - personalInformation.setAddress(createAddress()); - } - - public static OffenceDetails createFirstDefendantOffence() { - final OffenceDetails offence = new OffenceDetails(); - setOffence(offence, OFFENCE_ID); - - return offence; - } - - private static void setOffence(OffenceDetails offence, UUID offenceId) { - offence.setOffenceId(offenceId); - offence.setAppliedCompensation(APPLIED_COMPENSATION); - offence.setBackDuty(BACK_DUTY); - offence.setBackDutyDateFrom(BACK_DUTY_FROM); - offence.setBackDutyDateTo(BACK_DUTY_TO); - offence.setChargeDate(CHARGE_DATE); - offence.setOffenceCode(OFFENCE_CODE); - offence.setOffenceCommittedDate(OFFENCE_COMMITTED_DATE); - offence.setOffenceCommittedEndDate(OFFENCE_COMMITTED_END_DATE); - offence.setOffenceLocation(OFFENCE_LOCATION); - offence.setOffenceSequenceNumber(OFFENCE_SEQUENCE_NUMBER); - offence.setOffenceWording(OFFENCE_WORDING); - offence.setOffenceWordingWelsh(OFFENCE_WORDING_WELSH); - offence.setStatementOfFacts(STATEMENT_OF_FACT); - offence.setStatementOfFactsWelsh(STATEMENT_OF_FACT_WELSH); - offence.setOffenceDateCode(OFFENCE_DATE_CODE); - offence.setVehicleMake(VEHICLE_MAKE); - offence.setVehicleRegistrationMark(VEHICLE_REGISTRATION_MARK); - } - - public static OffenceDetails createSecondDefendantOffence() { - final OffenceDetails offence = new OffenceDetails(); - setOffence(offence, randomUUID()); - - return offence; - } - - public static BusinessValidationErrorDetails createDefendantLevelError() { - final BusinessValidationErrorDetails defendantLevelError = new BusinessValidationErrorDetails(); - defendantLevelError.setCaseId(FIRST_DEFENDANT_CASE_ID); - defendantLevelError.setCaseType("S"); - defendantLevelError.setCourtName("CourtName"); - defendantLevelError.setUrn(CASE_URN); - defendantLevelError.setDefendantBailStatus("DefendantStatus"); - defendantLevelError.setDefendantChargeDate(LocalDate.now()); - defendantLevelError.setDefendantHearingDate(LocalDate.now()); - defendantLevelError.setDefendantId(VALUE_DEFENDANT_ID); - defendantLevelError.setFieldName("DefendantFieldName"); - defendantLevelError.setDisplayName("DefendantDisplayFieldName"); - defendantLevelError.setErrorValue("Error Value"); - defendantLevelError.setFirstName(FIRST_NAME); - defendantLevelError.setLastName(LAST_NAME); - return defendantLevelError; - } - - public static BusinessValidationErrorDetails createCaseLevelError() { - final BusinessValidationErrorDetails caselevelError = new BusinessValidationErrorDetails(); - caselevelError.setCaseId(FIRST_DEFENDANT_CASE_ID); - caselevelError.setCaseType("S"); - caselevelError.setCourtName("CourtName"); - caselevelError.setUrn(CASE_URN); - caselevelError.setFieldName("CaseFieldName"); - caselevelError.setDisplayName("DisplayCaseFieldName"); - caselevelError.setErrorValue("Case Error Value"); - caselevelError.setId(randomUUID()); - return caselevelError; - } - - public static BusinessValidationErrorDetails createOffenceLevelError() { - final BusinessValidationErrorDetails offenceLevelError = new BusinessValidationErrorDetails(); - offenceLevelError.setCaseId(FIRST_DEFENDANT_CASE_ID); - offenceLevelError.setCaseType("S"); - offenceLevelError.setCourtName("CourtName"); - offenceLevelError.setUrn(CASE_URN); - offenceLevelError.setDefendantBailStatus("DefendantStatus"); - offenceLevelError.setDefendantChargeDate(LocalDate.now()); - offenceLevelError.setDefendantHearingDate(LocalDate.now()); - offenceLevelError.setDefendantId(VALUE_DEFENDANT_ID); - offenceLevelError.setFieldName("OffenceFieldName"); - offenceLevelError.setFieldId(VALUE_OFFENCE_ID); - offenceLevelError.setDisplayName("DisplayOffenceFieldName"); - offenceLevelError.setErrorValue("Offence Error Value"); - return offenceLevelError; - } -} diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/resources/META-INF/apache-deltaspike_test-container.properties b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/resources/META-INF/apache-deltaspike_test-container.properties deleted file mode 100755 index b1e0c5c6..00000000 --- a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/resources/META-INF/apache-deltaspike_test-container.properties +++ /dev/null @@ -1,11 +0,0 @@ -DS.prosecutioncasefile = new://Resource?type=DataSource -DS.prosecutioncasefile.JdbcDriver = org.h2.Driver -DS.prosecutioncasefile.JdbcUrl = jdbc:h2:mem:test;MODE=PostgreSQL; -DS.prosecutioncasefile.JtaManaged = true -DS.prosecutioncasefile.UserName = sa -DS.prosecutioncasefile.Password = -prosecutioncasefile-persistence-unit.hibernate.dialect = org.hibernate.dialect.HSQLDialect -prosecutioncasefile-persistence-unit.hibernate.hbm2ddl.auto = create-drop -prosecutioncasefile-persistence-unit.hibernate.show_sql = true -globalAlternatives.org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy=org.apache.deltaspike.jpa.impl.transaction.BeanManagedUserTransactionStrategy -tomee.jpa.factory.lazy = true diff --git a/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/resources/META-INF/persistence.xml b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/resources/META-INF/persistence.xml new file mode 100644 index 00000000..587f884e --- /dev/null +++ b/prosecutioncasefile-viewstore/prosecutioncasefile-viewstore-persistence/src/test/resources/META-INF/persistence.xml @@ -0,0 +1,21 @@ + + + + + org.hibernate.jpa.HibernatePersistenceProvider + ../classes + false + + + + + + + + + + +