diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index bc86372cc1..02b8fb0c1d 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -21,7 +21,7 @@ resources: type: github name: hmcts/cpp-azure-devops-templates endpoint: 'hmcts' - ref: 'main' + ref: 'dev/enforcer-disabled' pool: name: "MDV-ADO-AGENT-AKS-01" @@ -41,6 +41,7 @@ stages: parameters: sonarqube_project: ${{ variables['sonarqubeProject'] }} sonarQubeType: 'sonarQubeAKS' + runSonarqubeStatus: 'false' - ${{ if eq(variables['Build.Reason'], 'IndividualCI') }}: - template: pipelines/context-validation.yaml@cppAzureDevOpsTemplates @@ -48,4 +49,4 @@ stages: repo: "$(Build.Repository.Name)" sonarQubeType: 'sonarQubeAKS' serviceName: ${{ variables['service_Name'] }} - itTestFolder: ${{ variables['itTest_Folder'] }} + itTestFolder: ${{ variables['itTest_Folder'] }} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7fda4a0d3a..c21c2dec49 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT pom @@ -42,12 +42,12 @@ 4.1.4-ATCM 17.0.57 17.0.1 - 17.103.131 + 17.103.129 17.0.38 17.0.11 0.1.49 17.104.48 - 17.0.252 + 17.0.262 17.0.66 4.1.4-ATCM true diff --git a/sjp-command/pom.xml b/sjp-command/pom.xml index 95ea11b400..8b31ea279c 100644 --- a/sjp-command/pom.xml +++ b/sjp-command/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-api/pom.xml b/sjp-command/sjp-command-api/pom.xml index 1d734c542d..d2c24531ab 100644 --- a/sjp-command/sjp-command-api/pom.xml +++ b/sjp-command/sjp-command-api/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java index 420dfbfece..710efd3c8a 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static java.util.Objects.nonNull; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java index 15918bc365..e556726bf8 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java @@ -11,7 +11,7 @@ import uk.gov.justice.services.messaging.JsonObjects; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -42,7 +42,7 @@ public void updateEmployer(final JsonEnvelope envelope) { employerDetails.add(ADDRESS, normalizePostcodeInAddress(payloadAsJsonObject.getJsonObject(ADDRESS))); } - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(CASE_ID, payloadAsJsonObject.getString(CASE_ID)) .add(DEFENDANT_ID, payloadAsJsonObject.getString(DEFENDANT_ID)) .add("employer", employerDetails) diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java index cb857a721e..d8ff45d975 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java @@ -30,7 +30,7 @@ import java.util.Objects; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonReader; @@ -143,7 +143,7 @@ private void checkValidationErrors(Map> validationErrors) { private JsonObject getCaseDetail(final Envelope envelope) { - final JsonObject queryCasePayload = Json.createObjectBuilder() + final JsonObject queryCasePayload = JsonObjects.createObjectBuilder() .add("caseId", envelope.payload().getCaseId().toString()) .build(); @@ -166,7 +166,7 @@ private JsonObjectBuilder replacePostcodeInPayload(final JsonObject payload, fin } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java index fdd01aa464..c046d69984 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import uk.gov.justice.services.core.annotation.Handles; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java index 38a3bb4b0b..84132ed5fa 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java @@ -16,7 +16,7 @@ import uk.gov.moj.cpp.sjp.domain.SessionCourt; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -43,7 +43,7 @@ public void startSession(final JsonEnvelope startSessionCommand) { final SessionCourt sessionCourt = referenceDataService.getCourtByCourtHouseOUCode(courtHouseOUCode, startSessionCommand) .orElseThrow(() -> new BadRequestException(String.format("Court house with ou code %s not found", courtHouseOUCode))); - final JsonObjectBuilder startSessionBuilder = Json.createObjectBuilder() + final JsonObjectBuilder startSessionBuilder = JsonObjects.createObjectBuilder() .add(SESSION_ID, commandPayload.getString(SESSION_ID)) .add("courtHouseCode", courtHouseOUCode) .add("courtHouseName", sessionCourt.getCourtHouseName()) diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java index 61107d6435..23d9b5c2f4 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import uk.gov.justice.services.core.annotation.Handles; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java index 3604c66180..0bc9ab1da5 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.api.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java index 7710cb4622..f8558b6d3a 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.api.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java index a69f758c58..3d75f3699f 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java index 6496887122..1b3bca2e24 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java index a139f33e2f..c3f4e26c03 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java index dbb0802abc..ff267430da 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java @@ -5,7 +5,7 @@ import static java.util.Collections.singletonMap; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApiTest.java index 63fb0ce9a2..9cce069a08 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApiTest.java @@ -18,7 +18,7 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -75,7 +75,7 @@ public void shouldUpdateCaseReopenedWhenValidDates() { @Test public void shouldUndoCaseReopened() { - final JsonEnvelope command = EnvelopeFactory.createEnvelope(COMMAND_UNDO, Json.createObjectBuilder().build()); + final JsonEnvelope command = EnvelopeFactory.createEnvelope(COMMAND_UNDO, JsonObjects.createObjectBuilder().build()); caseReopenedApi.undoCaseReopenedInLibra(command); @@ -116,7 +116,7 @@ private void shouldPropagateCommandWhenValidDates(final Consumer f private JsonEnvelope getEnvelope(final String reopenedDate, final String command) { return EnvelopeFactory.createEnvelope(command, - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("caseId", caseId) .add("reopenedDate", reopenedDate) .add("libraCaseNumber", libraCaseId) diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java index 0ada4d17a0..9367ebe4ef 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java index cfb4227328..b8948d2834 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java @@ -2,8 +2,8 @@ import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java index 693b075c56..868874ba24 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java @@ -8,8 +8,8 @@ import static java.util.Objects.nonNull; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java index 17906fcd8e..ff7e07afc5 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.Collections.singletonMap; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java index 9d5cb67efb..1c008175df 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java @@ -2,8 +2,8 @@ import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java index ea9a8514ae..634736c613 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -335,21 +335,21 @@ private JsonObject getValidCaseDetail() { } private JsonObject getCaseDetail(final Plea plea, final JsonValue completed) { - final JsonObjectBuilder caseDetailBuilder = Json.createObjectBuilder() + final JsonObjectBuilder caseDetailBuilder = JsonObjects.createObjectBuilder() .add("id", caseId.toString()) .add("completed", completed) .add("assigned", JsonValue.FALSE) .add("status", NO_PLEA_RECEIVED_READY_FOR_DECISION.name()); - final JsonObjectBuilder offenceObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceObjectBuilder = JsonObjects.createObjectBuilder(); offenceObjectBuilder.add("pendingWithdrawal", JsonValue.FALSE); Optional.ofNullable(plea) .ifPresent(value -> offenceObjectBuilder.add("plea", plea.name())); - final JsonArray offences = Json.createArrayBuilder().add(offenceObjectBuilder.build()).build(); + final JsonArray offences = JsonObjects.createArrayBuilder().add(offenceObjectBuilder.build()).build(); - final JsonObject defendant = Json.createObjectBuilder() + final JsonObject defendant = JsonObjects.createObjectBuilder() .add("offences", offences) .build(); @@ -358,11 +358,11 @@ private JsonObject getCaseDetail(final Plea plea, final JsonValue completed) { return caseDetailBuilder.build(); } private JsonObject getCaseDetailPostConvention( final String adjournedTo, final String convention,final String conventionDate) { - final JsonObjectBuilder caseDetailBuilder = Json.createObjectBuilder() + final JsonObjectBuilder caseDetailBuilder = JsonObjects.createObjectBuilder() .add("id", caseId.toString()) .add("adjournedTo", adjournedTo); - final JsonObjectBuilder offenceObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceObjectBuilder = JsonObjects.createObjectBuilder(); Optional.ofNullable(convention) .ifPresent(value -> offenceObjectBuilder.add("convention", convention)); @@ -370,9 +370,9 @@ private JsonObject getCaseDetailPostConvention( final String adjournedTo, final .ifPresent(value -> offenceObjectBuilder.add("conventionDate", conventionDate)); - final JsonArray offences = Json.createArrayBuilder().add(offenceObjectBuilder.build()).build(); + final JsonArray offences = JsonObjects.createArrayBuilder().add(offenceObjectBuilder.build()).build(); - final JsonObject defendant = Json.createObjectBuilder() + final JsonObject defendant = JsonObjects.createObjectBuilder() .add("offences", offences) .build(); diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApiTest.java index c6a8afa0f1..b7bf6c83ca 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.Collections.singletonMap; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApiTest.java index 9cdfe5f73b..88a13329b5 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApiTest.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java index 823447b797..a8a31cceaf 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java index 41f2e22378..976a6387c8 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java index 7af3bc20a2..e055b0bc35 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.CoreMatchers; @@ -136,8 +136,8 @@ public void shouldEnhanceAndRenameStartSessionCommand() { .withPayloadOf(sessionId.toString(), "sessionId") .withPayloadOf(courtHouseOUCode, "courtHouseOUCode") .withPayloadOf("Jay", "magistrate") - .withPayloadOf(Json.createObjectBuilder().add("userId", userId.toString()).build(), "legalAdviser") - .withPayloadOf(Json.createArrayBuilder().add("P1").add("P2").build(), "prosecutors") + .withPayloadOf(JsonObjects.createObjectBuilder().add("userId", userId.toString()).build(), "legalAdviser") + .withPayloadOf(JsonObjects.createArrayBuilder().add("P1").add("P2").build(), "prosecutors") .build(); final SessionCourt sessionCourt = new SessionCourt("Wimbledon Magistrates' Court", "2577"); @@ -190,7 +190,7 @@ public void shouldRenameEndSessionCommand() { @Test public void endSessionShouldValidateSessionIdIsNotNull() { - final JsonObject payload = Json.createObjectBuilder().addNull("sessionId").build(); + final JsonObject payload = JsonObjects.createObjectBuilder().addNull("sessionId").build(); final JsonEnvelope envelope = envelope().with(metadataWithRandomUUID(END_SESSION_COMMAND_NAME)) .withPayloadFrom(payload) .build(); diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApiTest.java index 5085bea5ca..2882c0b0a8 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.Collections.singletonMap; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApiTest.java index 4f725d83dc..cd4999296d 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApiTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java index b41bf1820f..21d8d3f73f 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java index c259bdaca0..eda66f16d0 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java @@ -4,7 +4,7 @@ import static java.lang.Boolean.FALSE; import static java.util.Arrays.asList; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java index d025fa9f5f..fe0b43e29f 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java index ab31e234da..c3bc112f54 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.api.service; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java index daf730def0..b161d7ac51 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java @@ -38,7 +38,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -183,7 +183,7 @@ private void runValidationWithCaseDetailParameters(final Boolean completed, fina private JsonObject getCaseDetail(final Boolean completed, final Boolean assigned, final CaseStatus status, final Boolean pendingWithdrawal, final Plea plea) { - final JsonObjectBuilder caseDetailBuilder = Json.createObjectBuilder() + final JsonObjectBuilder caseDetailBuilder = JsonObjects.createObjectBuilder() .add("id", UUID.randomUUID().toString()); Optional.ofNullable(completed) @@ -195,7 +195,7 @@ private JsonObject getCaseDetail(final Boolean completed, final Boolean assigned Optional.ofNullable(status) .ifPresent(value -> caseDetailBuilder.add("status", value.name())); - final JsonObjectBuilder offenceObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceObjectBuilder = JsonObjects.createObjectBuilder(); Optional.ofNullable(pendingWithdrawal) .ifPresent(value -> offenceObjectBuilder.add("pendingWithdrawal", value)); @@ -203,9 +203,9 @@ private JsonObject getCaseDetail(final Boolean completed, final Boolean assigned Optional.ofNullable(plea) .ifPresent(value -> offenceObjectBuilder.add("plea", value.name())); - final JsonArray offences = Json.createArrayBuilder().add(offenceObjectBuilder.build()).build(); + final JsonArray offences = JsonObjects.createArrayBuilder().add(offenceObjectBuilder.build()).build(); - final JsonObject defendant = Json.createObjectBuilder() + final JsonObject defendant = JsonObjects.createObjectBuilder() .add("offences", offences) .build(); diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java index feeade13ad..2fb5913638 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java @@ -6,7 +6,7 @@ import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java index 3d554edba8..a361f42103 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java @@ -3,8 +3,8 @@ import static java.math.BigDecimal.ONE; import static java.math.BigDecimal.TEN; import static java.math.BigDecimal.ZERO; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java index 35f1fcf261..285f38670f 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java @@ -4,7 +4,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java index 55eba93026..14f1b2cf8b 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java @@ -18,7 +18,7 @@ import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonValue; import org.junit.jupiter.api.BeforeAll; @@ -61,7 +61,7 @@ static Stream data() { public void validEnvelope(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -75,7 +75,7 @@ public void validEnvelope(String schema) { public void invalidEnvelope_reason_notFound(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -90,7 +90,7 @@ public void invalidEnvelope_reason_notFound(String schema) { public void invalidEnvelope_reason_empty(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", "") .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -106,7 +106,7 @@ public void invalidEnvelope_reason_empty(String schema) { public void invalidEnvelope_reason_foundNull(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", JsonValue.NULL) .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -122,7 +122,7 @@ public void invalidEnvelope_reason_foundNull(String schema) { public void invalidEnvelope_libraCaseNumber_notFound(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", "Reason") .add("reopenedDate", "2017-01-01").build()); @@ -137,7 +137,7 @@ public void invalidEnvelope_libraCaseNumber_notFound(String schema) { public void invalidEnvelope_libraCaseNumber_reason_empty(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", "") .add("reopenedDate", "2017-01-01").build()); @@ -153,7 +153,7 @@ public void invalidEnvelope_libraCaseNumber_reason_empty(String schema) { public void invalidEnvelope_libraCaseNumber_foundNull(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", JsonValue.NULL) .add("reopenedDate", "2017-01-01") @@ -170,7 +170,7 @@ public void invalidEnvelope_libraCaseNumber_foundNull(String schema) { public void invalidEnvelope_reopenedDate_notFound(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", "LIBRA12345") .build()); @@ -187,7 +187,7 @@ public void invalidEnvelope_reopenedDate_notFound(String schema) { public void invalidEnvelope_reopenedDate_invalidDate(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-13-01") diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java index 4e5e7ad4bf..49994bfabc 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.schema; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java index c19cc7241a..628e6a3f9d 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.utils; import static java.util.Collections.singletonList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.json.schemas.domains.sjp.Address.address; import static uk.gov.justice.json.schemas.domains.sjp.command.Employer.employer; import static uk.gov.justice.json.schemas.domains.sjp.command.PersonalDetails.personalDetails; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java index 0bf71cae9b..475268cd73 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java @@ -5,7 +5,7 @@ import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/sjp-command/sjp-command-controller/pom.xml b/sjp-command/sjp-command-controller/pom.xml index a7eceee905..ab62dcabec 100644 --- a/sjp-command/sjp-command-controller/pom.xml +++ b/sjp-command/sjp-command-controller/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java index 88f26fec38..3eb39e7389 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.controller; import static java.util.UUID.fromString; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java index f75d9e4e59..d54d91981c 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.controller; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java index 56add7b831..7ab20a28dc 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java @@ -3,7 +3,7 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import uk.gov.justice.services.common.util.Clock; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java index 67081958d0..5ffbbe99a2 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java @@ -7,7 +7,7 @@ import javax.inject.Inject; import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java index 93bc8c1ef2..6c631f3281 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java index cc01cd66a0..360dff7b3b 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java index b15621ca74..ae3dbd7b7b 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java @@ -3,7 +3,7 @@ import static java.util.Optional.empty; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java index 3f23ba4f5f..fcf5362221 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java index afb591de66..5e2b92a008 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.service; import static java.lang.String.format; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java index ed46c6c290..8c806c5a82 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command; import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java index 1023f7de3d..582c9e58bb 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionAccountNumberBdfTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionAccountNumberBdfTest.java index 9804fd55b2..0d47b46212 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionAccountNumberBdfTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionAccountNumberBdfTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionCorrelationIdTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionCorrelationIdTest.java index a781af41eb..eacd03f372 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionCorrelationIdTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionCorrelationIdTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java index 4bc179a213..43d553f269 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseApplicationTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseApplicationTest.java index 2b841795a6..542da79476 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseApplicationTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseApplicationTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java index fbf5f7893b..57767bfccc 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java index f51756c4c3..50fc1846ee 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java index 42662fe247..d57dadda06 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java index 20dd26e0b0..e6ca1a9453 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java index 67d33975ec..3e89061bb2 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestDeleteDocsTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestDeleteDocsTest.java index f34ece9bb6..7b19cb6012 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestDeleteDocsTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestDeleteDocsTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestPressTransparencyReportTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestPressTransparencyReportTest.java index b0307efcef..e174db533c 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestPressTransparencyReportTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestPressTransparencyReportTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestTransparencyReportTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestTransparencyReportTest.java index 67ff56a08b..f2c278f4fa 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestTransparencyReportTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestTransparencyReportTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SaveApplicationDecisionTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SaveApplicationDecisionTest.java index cfeee221d6..4c5db96b1e 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SaveApplicationDecisionTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SaveApplicationDecisionTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java index 292ab4b455..ab4ad1889f 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateAllFinancialMeansTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateAllFinancialMeansTest.java index e5bb6fa304..ef9860003f 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateAllFinancialMeansTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateAllFinancialMeansTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java index f37aa00f2a..2310d873bc 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java index abc919a535..fd01a9f74d 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java index 524d71f313..34f078b756 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java index 732891c39e..d14b9769bc 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java @@ -3,7 +3,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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java index 86ff52cafd..0060490bb5 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java index 0f7b201e56..305b11a04b 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java index 15d1506ec3..fd5359ebd8 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java @@ -7,7 +7,7 @@ import static java.time.ZonedDateTime.now; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java index f846d1d922..10dc4b9c75 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.activemq.artemis.utils.JsonLoader.createArrayBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; @@ -22,7 +22,7 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.Envelope; @@ -368,7 +368,7 @@ private JsonEnvelope createReferralSaveDecisionCommand() { } private static JsonArray createOffenceDecision() { - final JsonArrayBuilder offenceDecisionBuilderArray = Json.createArrayBuilder(); + final JsonArrayBuilder offenceDecisionBuilderArray = JsonObjects.createArrayBuilder(); final JsonObjectBuilder offenceBuilder1 = createObjectBuilder(); offenceBuilder1.add("offenceId", randomUUID().toString()); offenceBuilder1.add("type", "WITHDRAWN"); @@ -385,7 +385,7 @@ private static JsonArray createOffenceDecision() { } private static JsonArray createReferToCourtOffenceDecision() { - final JsonArrayBuilder offenceDecisionBuilderArray = Json.createArrayBuilder(); + final JsonArrayBuilder offenceDecisionBuilderArray = JsonObjects.createArrayBuilder(); final JsonObjectBuilder offenceBuilder = createObjectBuilder(); offenceBuilder.add("offenceId", randomUUID().toString()); offenceBuilder.add("type", "REFER_FOR_COURT_HEARING"); diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java index 993dc4bc89..58d8e61c54 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java index 04eacfe4c3..94cea17fd1 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java index 726933f477..8855996cf8 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java @@ -2,9 +2,9 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.hamcrest.MockitoHamcrest.argThat; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java index 198da769fb..db0fc76858 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/pom.xml b/sjp-command/sjp-command-handler/pom.xml index 519a1efe2c..7841b522b2 100644 --- a/sjp-command/sjp-command-handler/pom.xml +++ b/sjp-command/sjp-command-handler/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java index 2f22d57510..97fc032391 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler.service; import static java.util.Optional.of; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import org.slf4j.Logger; @@ -17,7 +17,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -60,7 +60,7 @@ public Optional getProsecutor(final JsonEnvelope event, final UUID i LOGGER.info(" Calling {} to get prosecutors for {} ", REFERENCEDATA_QUERY_PROSECUTOR, id); - final JsonObject payload = Json.createObjectBuilder().add(ID, id.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(ID, id.toString()).build(); final JsonEnvelope requestEnvelope = enveloper.withMetadataFrom(event, REFERENCEDATA_QUERY_PROSECUTOR) .apply(payload); diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java index e8a262c21e..679e51e75f 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.format.DateTimeFormatter.ofPattern; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandlerTest.java index fbfbd08f53..c537ad1ace 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java index e1a8de71c8..d9ff4d528f 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandlerTest.java index 72ca61eb34..d27f41b506 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandlerTest.java index 9d3cf24ec8..834ad0e328 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandlerTest.java @@ -4,8 +4,8 @@ import static java.time.ZoneOffset.UTC; import static java.time.ZonedDateTime.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomUtils.nextInt; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -51,7 +51,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -269,7 +269,7 @@ public void shouldAssignCaseToUser() throws EventStreamException { metadataWithRandomUUID(ASSIGN_CASE_TO_USER_COMMAND), createObjectBuilder() .add("assignCase", caseToBeAssignedId.toString()) - .add("unassignCases", Json.createArrayBuilder() + .add("unassignCases", JsonObjects.createArrayBuilder() .add(caseToBeUnassignedId1.toString()) .add(caseToBeUnassignedId2.toString())) .add("userId", userId.toString()) diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandlerTest.java index ee5517f91d..c049b15aab 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandlerTest.java @@ -5,7 +5,7 @@ import static java.time.ZonedDateTime.now; import static java.time.ZonedDateTime.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandlerTest.java index 46d999a145..a1439e8b06 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandlerTest.java @@ -45,7 +45,7 @@ import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -141,7 +141,7 @@ public void shouldUndoCaseReopenedInLibra() throws EventStreamException { // when JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataOf(CASE_ID, EventNamesHolder.CASE_REOPENED_UNDONE).build(), - Json.createObjectBuilder().add("caseId", CASE_ID.toString()).build()); + JsonObjects.createObjectBuilder().add("caseId", CASE_ID.toString()).build()); caseReopenedHandler.undoCaseReopenedInLibra(jsonEnvelope); diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandlerTest.java index a0b0474c9d..1baca24868 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandlerTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.command.handler; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java index 2a5d6f36b1..6c5f46cb0b 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java @@ -9,7 +9,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.Optional.of; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.is; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java index 5f3e87e832..ded9f3e2bb 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.ZonedDateTime.now; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandlerTest.java index e3d7ac98f0..416af239b7 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.temporal.ChronoUnit.MILLIS; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java index 89d8e7903c..293cb4b996 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java index d5c47b2f19..731721b61c 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandlerTest.java index 0c56ae101d..66e71eb1ba 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java index e2052e19cd..c462b5277c 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java @@ -4,8 +4,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java index 1b0149d35e..37187b274f 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ReserveCaseHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ReserveCaseHandlerTest.java index 2143091e39..a4097b40a7 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ReserveCaseHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ReserveCaseHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java index f8dbcba3d6..a19e71965c 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.empty; import static java.util.Optional.of; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseStatusHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseStatusHandlerTest.java index 4fe73853f4..126d8ed92f 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseStatusHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseStatusHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -34,7 +34,7 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; @ExtendWith(MockitoExtension.class) public class ResolveCaseStatusHandlerTest { diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java index 6989631fff..686621bb60 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java @@ -4,7 +4,7 @@ import static java.time.ZoneOffset.UTC; import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java index 052835585d..35854b9249 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java @@ -4,7 +4,7 @@ import static java.time.ZoneOffset.UTC; import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java index 090d27557e..9d2ea73299 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java @@ -4,8 +4,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.time.ZoneOffset.UTC; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SetDatesToAvoidRequiredHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SetDatesToAvoidRequiredHandlerTest.java index d41978ddd4..908db42350 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SetDatesToAvoidRequiredHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SetDatesToAvoidRequiredHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java index fda4d44d39..164f98a058 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java @@ -6,8 +6,8 @@ import static java.util.Arrays.asList; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java index 1ccf4feac1..56faf6a186 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java @@ -33,7 +33,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandlerTest.java index 4e9bee9564..9493fc30dc 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandlerTest.java index a8ca41037d..78302e4601 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandlerTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.handler; import static java.util.UUID.fromString; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java index e79b471d35..803d9b4635 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.format.DateTimeFormatter.ofPattern; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java index c216d06107..f40818d70d 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java index 276442c951..23b4cf3834 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java index d935905b32..e85dbbd567 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler.builder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataOf; import static uk.gov.moj.cpp.sjp.domain.util.DefaultTestData.CASE_DOCUMENT_ID; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java index c77535ba63..207d256edf 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler.builder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataOf; import static uk.gov.moj.cpp.sjp.domain.util.DefaultTestData.CASE_ID; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java index 10317b76d9..99b81d026a 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java @@ -7,7 +7,7 @@ import java.io.IOException; import java.io.InputStream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -25,7 +25,7 @@ public abstract class BaseConverterTest { protected void givenPayload(String filePath) throws IOException { try (InputStream inputStream = getClass().getResourceAsStream(filePath)) { - JsonReader jsonReader = Json.createReader(inputStream); + JsonReader jsonReader = JsonObjects.createReader(inputStream); payload = jsonReader.readObject(); } when(command.payloadAsJsonObject()).thenReturn(payload); diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java index 1053df456b..8f4ae6087c 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -53,7 +53,7 @@ public class ReferenceDataServiceTest { @InjectMocks private ReferenceDataService referenceDataService; - private final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUIDAndName(), Json.createObjectBuilder().build()); + private final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUIDAndName(), JsonObjects.createObjectBuilder().build()); @Test public void shouldReturnEnforcementAreaByPostcode() { @@ -112,7 +112,7 @@ public void shouldReturnEmptyEnforcementAreaIfNotFoundByLocalJusticeAreaNational @Test public void shouldReturnProsecutor() { final UUID id = randomUUID(); - final JsonObject prosecutorJson = Json.createObjectBuilder() + final JsonObject prosecutorJson = JsonObjects.createObjectBuilder() .add("prosecutorCode", "100") .add("prosecutorName", "test").build(); @@ -139,7 +139,7 @@ private JsonEnvelope enforcementAreaQueryByNationalCourtCode(final String localJ } private static JsonObject newEnforcementArea() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("accountDivisionCode", "100") .add("enforcingCourtCode", "1000") .add("nationalPaymentPhone", "030 0790 9901") diff --git a/sjp-domain/pom.xml b/sjp-domain/pom.xml index 82d98ead41..6bd60d8d50 100644 --- a/sjp-domain/pom.xml +++ b/sjp-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT sjp-domain diff --git a/sjp-domain/sjp-domain-aggregate/pom.xml b/sjp-domain/sjp-domain-aggregate/pom.xml index 562ce48819..01e2357171 100644 --- a/sjp-domain/sjp-domain-aggregate/pom.xml +++ b/sjp-domain/sjp-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT sjp-domain-aggregate diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java index e495e76ef5..ca47a12e1c 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -98,7 +98,7 @@ private static JsonObject getPayload(final String path) { } catch (final Exception e) { fail("Error consuming file from location " + path); } - final JsonReader reader = Json.createReader(new StringReader(request)); + final JsonReader reader = JsonObjects.createReader(new StringReader(request)); return reader.readObject(); } diff --git a/sjp-domain/sjp-domain-common/pom.xml b/sjp-domain/sjp-domain-common/pom.xml index c18ededdeb..5ecc36b3fc 100644 --- a/sjp-domain/sjp-domain-common/pom.xml +++ b/sjp-domain/sjp-domain-common/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT diff --git a/sjp-domain/sjp-domain-event-processor/pom.xml b/sjp-domain/sjp-domain-event-processor/pom.xml index 4d1a284b00..9ee17ad915 100644 --- a/sjp-domain/sjp-domain-event-processor/pom.xml +++ b/sjp-domain/sjp-domain-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-event/pom.xml b/sjp-domain/sjp-domain-event/pom.xml index 55f24fb422..a9cf91ba9c 100644 --- a/sjp-domain/sjp-domain-event/pom.xml +++ b/sjp-domain/sjp-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT sjp-domain-event diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java index 8d6c2ed6f7..ed2a28685f 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.MapperFeature; @@ -35,7 +35,7 @@ public void shouldDeserializeOldCaseAssignedEvent() throws Exception { final UUID assigneeId = randomUUID(); final CaseAssignmentType caseAssignmentType = CaseAssignmentType.MAGISTRATE_DECISION; - final JsonObject oldEventPayload = Json.createObjectBuilder() + final JsonObject oldEventPayload = JsonObjects.createObjectBuilder() .add("assigneeId", assigneeId.toString()) .add("caseAssignmentType", caseAssignmentType.toString()) .add("caseId", caseId.toString()) diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java index d062a9579a..612e941ff6 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java @@ -16,7 +16,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.MapperFeature; @@ -38,8 +38,8 @@ public void shouldDeserializeOldCaseAssignmentRequestedEvent() throws Exception final SessionType sessionType = MAGISTRATE; final String ljaNationalCourtCode = "2577"; - final JsonObject oldEventPayload = Json.createObjectBuilder() - .add("session", Json.createObjectBuilder() + final JsonObject oldEventPayload = JsonObjects.createObjectBuilder() + .add("session", JsonObjects.createObjectBuilder() .add("id", sessionId.toString()) .add("localJusticeAreaNationalCourtCode", ljaNationalCourtCode) .add("type", MAGISTRATE.toString()) diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java index ea64587700..2843d9df21 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java @@ -10,7 +10,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -19,7 +19,7 @@ public class CaseAssignmentCreatedTest { @Test public void shouldDeserializeDecommissionedCaseAssignmentCreatedEvent() throws Exception { - final JsonObject oldEventPayload = Json.createObjectBuilder() + final JsonObject oldEventPayload = JsonObjects.createObjectBuilder() .add("caseId", UUID.randomUUID().toString()) .add("caseAssignmentType", CaseAssignmentType.MAGISTRATE_DECISION.toString()) .build(); diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java index 462dc730d9..c483aab3f6 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java @@ -10,7 +10,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -19,7 +19,7 @@ public class CaseAssignmentDeletedTest { @Test public void shouldDeserializeDecommissionedCaseAssignmentDeletedEvent() throws Exception { - final JsonObject oldEventPayload = Json.createObjectBuilder() + final JsonObject oldEventPayload = JsonObjects.createObjectBuilder() .add("caseId", UUID.randomUUID().toString()) .add("caseAssignmentType", CaseAssignmentType.MAGISTRATE_DECISION.toString()) .build(); diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java index 7d7c34d876..9e80766623 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java @@ -12,7 +12,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ public class CourtReferralActionedTest { @Test public void shouldDeserializeDecommissionedCourtReferralActionedEvent() throws Exception { final DateTimeFormatter dtf = DateTimeFormatter.ISO_DATE_TIME; - final JsonObject oldEventPayload = Json.createObjectBuilder() + final JsonObject oldEventPayload = JsonObjects.createObjectBuilder() .add("caseId", UUID.randomUUID().toString()) .add("actioned", ZonedDateTime.now().format(dtf)) .build(); diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java index 0ef935ea77..1d4d4948cb 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java @@ -13,7 +13,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -23,7 +23,7 @@ public class CourtReferralCreatedTest { @Test public void shouldDeserializeDecommissionedCourtReferralCreatedEvent() throws Exception { final DateTimeFormatter dtf = DateTimeFormatter.ISO_LOCAL_DATE; - final JsonObject oldEventPayload = Json.createObjectBuilder() + final JsonObject oldEventPayload = JsonObjects.createObjectBuilder() .add("caseId", UUID.randomUUID().toString()) .add("hearingDate", LocalDate.now().format(dtf)) .build(); diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java index ef6a9b9b19..06b611c291 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java @@ -10,7 +10,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -19,7 +19,7 @@ public class CourtReferralNotFoundTest { @Test public void shouldDeserializeDecommissionedCourtReferralNotFoundEvent() throws Exception { - final JsonObject oldEventPayload = Json.createObjectBuilder() + final JsonObject oldEventPayload = JsonObjects.createObjectBuilder() .add("caseId", UUID.randomUUID().toString()) .build(); diff --git a/sjp-domain/sjp-domain-prosecution/pom.xml b/sjp-domain/sjp-domain-prosecution/pom.xml index a38398ca56..c6da0c8481 100644 --- a/sjp-domain/sjp-domain-prosecution/pom.xml +++ b/sjp-domain/sjp-domain-prosecution/pom.xml @@ -4,7 +4,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT sjp-domain-prosecution diff --git a/sjp-domain/sjp-domain-transformation/pom.xml b/sjp-domain/sjp-domain-transformation/pom.xml index 4561c86e0e..1933798325 100644 --- a/sjp-domain/sjp-domain-transformation/pom.xml +++ b/sjp-domain/sjp-domain-transformation/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml index 28d7896433..e532265df3 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml @@ -3,7 +3,7 @@ sjp-domain-transformation uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java index e40b8bdfef..e62fdd5980 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java @@ -13,7 +13,7 @@ import java.io.StringReader; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -27,7 +27,7 @@ public class SjpEventTransformationTest { private JsonObject anonymisedJsonObject; private static JsonObject jsonFromString(String jsonObjectStr) { - JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml index 8a17f448a1..1e3025fbbd 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml @@ -3,7 +3,7 @@ sjp-domain-transformation uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java index d9d95c7d47..ed434bffe2 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class EventTransformerTestHelper { @@ -41,7 +41,7 @@ public void transformEventAndAssertPayload(final String inputJsonPayloadResource private JsonEnvelope buildEnvelopeFromJsonResource(final String fileName) { - final JsonObject payload = Json.createReader(CaseReceivedEventTransformerTest.class + final JsonObject payload = JsonObjects.createReader(CaseReceivedEventTransformerTest.class .getResourceAsStream("/events/" + fileName)).readObject(); return envelopeFrom(metadataWithRandomUUID(eventTransformer.getEventName()), payload); } diff --git a/sjp-event-sources/pom.xml b/sjp-event-sources/pom.xml index b804ab88c4..7a308bd37f 100644 --- a/sjp-event-sources/pom.xml +++ b/sjp-event-sources/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT ../pom.xml 4.0.0 diff --git a/sjp-event/pom.xml b/sjp-event/pom.xml index a1f5940fe1..ce38ff28d7 100644 --- a/sjp-event/pom.xml +++ b/sjp-event/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-indexer/pom.xml b/sjp-event/sjp-event-indexer/pom.xml index 03e876fa6c..dad43fc1ea 100644 --- a/sjp-event/sjp-event-indexer/pom.xml +++ b/sjp-event/sjp-event-indexer/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java index 400f35f641..800f6231f4 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java @@ -3,7 +3,7 @@ import static java.nio.file.Files.readAllBytes; import static java.nio.file.Paths.get; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/sjp-event/sjp-event-listener/pom.xml b/sjp-event/sjp-event-listener/pom.xml index f6d5351725..bdaebacaf1 100644 --- a/sjp-event/sjp-event-listener/pom.xml +++ b/sjp-event/sjp-event-listener/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListenerTest.java index fecaaa34c4..b1e58c18af 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListenerTest.java @@ -24,7 +24,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -78,6 +78,6 @@ public void shouldHandleAocpPleasSet() throws JsonProcessingException { private JsonEnvelope createJsonEnvelope(final UUID offenceId) throws JsonProcessingException { final AocpPleasSet pleasSet = new AocpPleasSet(randomUUID(), asList(new Plea(randomUUID(), offenceId, PleaType.GUILTY)), ZonedDateTime.now(), PleaMethod.ONLINE); final String json = objectMapper.writeValueAsString(pleasSet); - return createEnvelope("sjp.events.aocp-pleas-set", Json.createReader(new StringReader(json)).readObject()); + return createEnvelope("sjp.events.aocp-pleas-set", JsonObjects.createReader(new StringReader(json)).readObject()); } } diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java index 68655fc289..d18cd44265 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java @@ -46,7 +46,7 @@ import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationType.STAT_DEC; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java index 4af24e0c73..c84a3de1d3 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.util.Collections.singletonList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java index 12b9540fc2..ae7f424e6f 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java @@ -4,8 +4,8 @@ import static java.lang.Boolean.TRUE; import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java index a314275ed4..f4705abbba 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListenerTest.java index 852ada767b..be7722d51c 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListenerTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java index 9184fced95..bf88e3aae9 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java @@ -2,7 +2,7 @@ import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java index de593a5e59..9d2cb585f3 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java @@ -2,7 +2,7 @@ import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java index 2b6937d27f..aebf053d1d 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.any; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java index 4faa1af45f..0a48bfa9b8 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java index 5e1334709d..4c83e2e449 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListenerTest.java index ee75ef7148..2daccdb4c5 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListenerTest.java index d6f62daad5..468bb4bc2e 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListenerTest.java @@ -28,7 +28,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -87,7 +87,7 @@ private JsonEnvelope commonSetupForInterpreter(final String language, final bool .with(metadataWithRandomUUID("sjp.events.interpreter-for-defendant-updated")) .withPayloadOf(caseId, "caseId") .withPayloadOf(defendantId, "defendantId").withPayloadOf( - Json.createObjectBuilder().add("needed", true) + JsonObjects.createObjectBuilder().add("needed", true) .add("language", language).build(), "interpreter") .build(); diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListenerTest.java index a90737f2c9..019d15e922 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListenerTest.java @@ -2,7 +2,7 @@ import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java index 616fc331da..61cf250931 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java @@ -23,7 +23,7 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.core.JsonProcessingException; @@ -87,7 +87,7 @@ private JsonEnvelope givenPleasSetEventWasRaised() throws JsonProcessingExceptio public JsonObject convertToJsonObject(PleasSet pleasSet) throws JsonProcessingException { String json = objectMapper.writeValueAsString(pleasSet); - return Json.createReader(new StringReader(json)).readObject(); + return JsonObjects.createReader(new StringReader(json)).readObject(); } diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java index b0a86cd42e..e76f94fa63 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java @@ -2,8 +2,8 @@ import static com.google.common.collect.Lists.newArrayList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.isNotNull; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java index 2e14c9b9ea..5fea9d834f 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java @@ -2,7 +2,7 @@ import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.never; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java index 79223de030..6c3b644909 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SessionListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SessionListenerTest.java index b43406f90b..fdd91e3180 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SessionListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SessionListenerTest.java @@ -2,8 +2,8 @@ import static java.time.format.DateTimeFormatter.ISO_DATE_TIME; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java index b736f87127..4b28e0f877 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java index 63c77c8d9f..350e274b33 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java @@ -3,8 +3,8 @@ import static com.google.common.collect.Lists.newArrayList; import static java.lang.Boolean.TRUE; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/pom.xml b/sjp-event/sjp-event-processor/pom.xml index 5f4bd41389..13b1a02d05 100644 --- a/sjp-event/sjp-event-processor/pom.xml +++ b/sjp-event/sjp-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java index 1d356105c6..2faa6fc579 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java @@ -4,7 +4,6 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; -import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -12,9 +11,6 @@ import uk.gov.justice.services.fileservice.api.FileServiceException; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.decision.ApplicationDecisionSetAside; -import uk.gov.moj.cpp.sjp.event.processor.service.SjpService; -import uk.gov.moj.cpp.sjp.event.processor.service.models.CaseDetailsDecorator; -import uk.gov.moj.cpp.sjp.event.processor.service.notification.EndorsementRemovalNotificationService; import javax.inject.Inject; @@ -32,32 +28,14 @@ public class ApplicationSetAsideProcessor { @ServiceComponent(EVENT_PROCESSOR) @Inject private Sender sender; - @Inject - private SjpService sjpService; - @Inject - private EndorsementRemovalNotificationService endorsementRemovalNotificationService; @Handles(ApplicationDecisionSetAside.EVENT_NAME) public void handleApplicationDecisionSetAside(final JsonEnvelope envelope) throws FileServiceException { sendApplicationSetAsidePublicEvent(envelope); - sendNotificationToDvlaToRemoveEndorsements(envelope); } private void sendApplicationSetAsidePublicEvent(final JsonEnvelope envelope) { LOGGER.info("Sending public.sjp.application-decision-set-aside for caseId: {}", envelope.payloadAsJsonObject().getString("caseId")); sender.send(envelopeFrom(metadataFrom(envelope.metadata()).withName(PUBLIC_APPLICATION_SET_ASIDE_EVENT), envelope.payload())); } - - private void sendNotificationToDvlaToRemoveEndorsements(final JsonEnvelope envelope) throws FileServiceException { - final ApplicationDecisionSetAside decision = converter.convert(envelope.payloadAsJsonObject(), ApplicationDecisionSetAside.class); - final CaseDetails caseDetails = sjpService.getCaseDetails(decision.getCaseId(), envelope); - final CaseDetailsDecorator caseDetailsDecorator = new CaseDetailsDecorator(caseDetails); - - if (endorsementRemovalNotificationService.hasEndorsementsToBeRemoved(caseDetailsDecorator)) { - LOGGER.info("Case has endorsements to be removed. Preparing notification to DVLA for caseId: {}", decision.getCaseId()); - endorsementRemovalNotificationService.generateNotification(caseDetailsDecorator, envelope); - } else { - LOGGER.info("Case noes not have endorsements to be removed for caseId: {}", decision.getCaseId()); - } - } } diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java index f0955aa6a2..bac0c7518d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.REASON; @@ -26,7 +26,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -124,7 +124,7 @@ private void emitCaseAssignedPublicEvent(final UUID caseId, final JsonEnvelope e } private void assignCase(final JsonEnvelope envelope, final UUID sessionId, final List assignmentCandidates) { - final JsonArrayBuilder assignmentCandidatesBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder assignmentCandidatesBuilder = JsonObjects.createArrayBuilder(); assignmentCandidates.forEach(assignmentCandidate -> assignmentCandidatesBuilder.add(createObjectBuilder() .add("caseId", assignmentCandidate.getCaseId().toString()) .add("caseStreamVersion", assignmentCandidate.getCaseStreamVersion()))); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java index 737781735e..3c2837953c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java @@ -16,7 +16,7 @@ import uk.gov.moj.cpp.sjp.event.processor.service.enforcementnotification.EnforcementNotificationService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -52,7 +52,7 @@ public void handleCaseApplicationRecorded(final JsonEnvelope jsonEnvelope) { LOGGER.debug("Stat dec application recorded for applicationId : {}", applicationId); } - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId) .add(APPLICATION_REFERENCE, caseApplicationRecorded.getCourtApplication().getApplicationReference()).build(); sender.send(enveloper.withMetadataFrom(jsonEnvelope, CASE_APPLICATION_RECORDED_PUBLIC_EVENT).apply(jsonObject)); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java index 06027f22cd..c901a3f509 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java index 20f2e5586b..e6a8bec775 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java @@ -25,7 +25,7 @@ import uk.gov.moj.cpp.sjp.event.processor.service.SjpService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -45,8 +45,8 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.core.courts.DefendantJudicialResult.defendantJudicialResult; import static uk.gov.justice.hearing.courts.HearingResulted.hearingResulted; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; @@ -305,7 +305,7 @@ protected LocalDate convertToLocalDate(final String value) { } private static JsonObject removeProperty(JsonObject origin, String key) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()) { if (!entry.getKey().equals(key)) { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java index d800388630..8c3691670f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java index 6dd122afe2..4f878dfeec 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java @@ -9,7 +9,7 @@ import uk.gov.moj.cpp.sjp.event.CaseDocumentAdded; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -48,7 +48,7 @@ public void handleDuplicateCaseDocumentAddedEvent(final JsonEnvelope jsonEnvelop } private JsonObject getCaseDocumentPublicEventPayload(String caseId, JsonObject caseDocument) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder() .add(EventProcessorConstants.CASE_ID, caseId) .add(EventProcessorConstants.ID, caseDocument.getString(EventProcessorConstants.ID)) .add(EventProcessorConstants.MATERIAL_ID, caseDocument.getString(EventProcessorConstants.MATERIAL_ID)); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java index a7b7050aa3..6f77aefb53 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java @@ -2,7 +2,7 @@ import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java index 7ab5c53b55..1142c1be51 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java index abd0fc12a1..2dcd433762 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java @@ -37,7 +37,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -101,7 +101,7 @@ public void handleCaseReceivedEvent(final JsonEnvelope event) { private void resolveCaseAOCPEligibility(final JsonEnvelope event, final UUID caseId, final String prosecutingAuthority, final Defendant defendant, final LocalDate postingDate) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder() + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()); final Optional prosecutorDetails = referenceDataService.getProsecutor(prosecutingAuthority, event); @@ -121,7 +121,7 @@ private void raisePublicEvent(final Metadata metadata, final UUID caseId, final .withName(CASE_STARTED_PUBLIC_EVENT_NAME) .build(); - final JsonObject publicEventPayload = Json.createObjectBuilder() + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder() .add("id", caseId.toString()) .add("postingDate", postingDate.toString()) .build(); @@ -131,7 +131,7 @@ private void raisePublicEvent(final Metadata metadata, final UUID caseId, final private void relayCaseToCourtStore(String caseId) { if (!caseId.isEmpty()) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payloadBuilder.add("CaseReference", caseId); try { this.azureFunctionService.relayCaseOnCPP(payloadBuilder.build().toString()); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java index 0b7424c7bd..1a2071cd90 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.REASON; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java index e109267908..f3d64118d4 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import static java.util.Objects.nonNull; @@ -64,7 +64,7 @@ public void courtApplicationCreated(final JsonEnvelope jsonEnvelope) { applicationStatus = ApplicationStatus.APPEAL_PENDING.name(); } if (isNotBlank(applicationStatus)) { - final JsonObject applicationStatusPayload = Json.createObjectBuilder() + final JsonObject applicationStatusPayload = JsonObjects.createObjectBuilder() .add("caseId", sjpCaseId) .add("applicationId", applicationId) .add("applicationStatus", applicationStatus) @@ -77,7 +77,7 @@ public void courtApplicationCreated(final JsonEnvelope jsonEnvelope) { } LOGGER.info("Command Raised to update listedInCriminalCourts for Criminal Court Application with CaseId {} and applicationId {} for sjp case", sjpCaseId, applicationId); - final JsonObject listedInCCPayload = Json.createObjectBuilder() + final JsonObject listedInCCPayload = JsonObjects.createObjectBuilder() .add("caseId", sjpCaseId) .add("listedInCriminalCourts",true) .build(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java index b6c265ec1c..06dc50d761 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java index ad92b99c4a..7f058ab021 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.core.annotation.Handles; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java index d6d6e6c87c..187828876d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java @@ -8,7 +8,7 @@ import javax.inject.Inject; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java index 4c2fb535b2..51f385bdfd 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java index 244184ae3e..2728d07842 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java @@ -2,7 +2,7 @@ import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java index 729fc262c2..811199f11e 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java @@ -3,7 +3,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java index 268f760f8b..6dc7380f65 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.core.annotation.Handles; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java index 4c0231dc56..27f62d17b7 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java @@ -22,7 +22,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -59,18 +59,21 @@ public void hearingResultReceived(final JsonEnvelope jsonEnvelope) { } hearing.getCourtApplications().stream().forEach(courtApplication -> { final String applicationType = courtApplication.getType().getType(); + final String applicationCode = courtApplication.getType().getCode(); final String applicationId = courtApplication.getId().toString(); - courtApplication.getCourtApplicationCases().stream().filter(CourtApplicationCase::getIsSJP).forEach(courtApplicationCase -> { - final String sjpCaseId = courtApplicationCase.getProsecutionCaseId().toString(); - final String applicationStatus = getApplicationStatus(courtApplication, applicationType); - sendMessage(jsonEnvelope, applicationId, sjpCaseId, applicationStatus); - }); + if(courtApplication.getCourtApplicationCases() != null && courtApplication.getJudicialResults() != null) { + courtApplication.getCourtApplicationCases().stream().filter(CourtApplicationCase::getIsSJP).forEach(courtApplicationCase -> { + final String sjpCaseId = courtApplicationCase.getProsecutionCaseId().toString(); + final String applicationStatus = getApplicationStatus(courtApplication, applicationType, applicationCode); + sendMessage(jsonEnvelope, applicationId, sjpCaseId, applicationStatus); + }); + } }); } private void sendMessage(final JsonEnvelope jsonEnvelope, final String applicationId, final String sjpCaseId, final String applicationStatus) { - final JsonObject applicationStatusPayload = Json.createObjectBuilder() + final JsonObject applicationStatusPayload = JsonObjects.createObjectBuilder() .add("caseId", sjpCaseId) .add("applicationId", applicationId) .add("applicationStatus", applicationStatus) @@ -81,13 +84,13 @@ private void sendMessage(final JsonEnvelope jsonEnvelope, final String applicati sender.send(envelopeToSend); } - private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType) { + private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType, final String applicationCode) { final Optional applicationStatus = courtApplication .getJudicialResults() .stream() - .map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId())) + .map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId(), applicationCode)) .filter(Objects::nonNull) .findFirst(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java index 6ed07b592d..135fa3c5c4 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java @@ -22,7 +22,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -65,15 +65,16 @@ public void hearingResultReceived(final JsonEnvelope jsonEnvelope) { hearing.getCourtApplications().stream().forEach(courtApplication -> { final String applicationType = courtApplication.getType().getType(); + final String applicationCode = courtApplication.getType().getCode(); final String applicationId = courtApplication.getId().toString(); - if(courtApplication.getCourtApplicationCases() != null ) { + if(courtApplication.getCourtApplicationCases() != null && courtApplication.getJudicialResults() != null) { courtApplication .getCourtApplicationCases() .stream() .filter(CourtApplicationCase::getIsSJP) .forEach(courtApplicationCase -> { final String sjpCaseId = courtApplicationCase.getProsecutionCaseId().toString(); - final String applicationStatus = getApplicationStatus(courtApplication, applicationType); + final String applicationStatus = getApplicationStatus(courtApplication, applicationType, applicationCode); sendMessage(jsonEnvelope, applicationId, sjpCaseId, applicationStatus); }); } @@ -82,7 +83,7 @@ public void hearingResultReceived(final JsonEnvelope jsonEnvelope) { } private void sendMessage(final JsonEnvelope jsonEnvelope, final String applicationId, final String sjpCaseId, final String applicationStatus) { - final JsonObject applicationStatusPayload = Json.createObjectBuilder() + final JsonObject applicationStatusPayload = JsonObjects.createObjectBuilder() .add("caseId", sjpCaseId) .add("applicationId", applicationId) .add("applicationStatus", applicationStatus) @@ -93,13 +94,13 @@ private void sendMessage(final JsonEnvelope jsonEnvelope, final String applicati sender.send(envelopeToSend); } - private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType) { + private String getApplicationStatus(final CourtApplication courtApplication, final String applicationType, final String applicationCode) { final Optional applicationStatus = courtApplication .getJudicialResults() .stream() - .map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId())) + .map(judicialResult -> ApplicationResultStatusResolver.getApplicationStatus(applicationType, judicialResult.getJudicialResultTypeId(), applicationCode)) .filter(Objects::nonNull) .findFirst(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java index 0c91b749bd..f52baef96b 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java index e659b1b34f..4e243199fb 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.java index 9f02b1c87f..413076ed9b 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.common.configuration.Value; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java index 872d227458..3ac25d8ec7 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java index f49f3f0dc8..22c804481e 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java @@ -36,7 +36,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -208,7 +208,7 @@ private void checkValidationErrors(Map> validationErrors) { } private JsonObject getCaseDetail(final JsonEnvelope envelope) { - final JsonObject queryCasePayload = Json.createObjectBuilder() + final JsonObject queryCasePayload = JsonObjects.createObjectBuilder() .add("caseId", envelope.payloadAsJsonObject().getString("caseId")) .build(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java index 16aa49931f..0252f19319 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java @@ -8,8 +8,8 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.fromString; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; @@ -48,7 +48,7 @@ import java.util.*; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -179,7 +179,7 @@ private void sendPublicEvent(final JsonEnvelope envelope, final JsonObject paylo LOGGER.info("publishing public event for sjp pending cases for public list in english"); final String type = envelope.payloadAsJsonObject().getString(REQUEST_TYPE); final String language = envelope.payloadAsJsonObject().getString(LANGUAGE); - final JsonObjectBuilder pendingListEnglishBuilder = Json.createObjectBuilder() + final JsonObjectBuilder pendingListEnglishBuilder = JsonObjects.createObjectBuilder() .add(LANGUAGE, language) .add(REQUEST_TYPE, type) .add("listPayload", payloadForDocumentGeneration); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java index 6489d44c0b..a6d2cb162c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.core.annotation.Handles; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java index 0d1f7636c1..fedd80dcba 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java @@ -22,7 +22,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) @@ -79,7 +79,7 @@ public void aocpSessionResetRequested(final JsonEnvelope envelope) { } private void endSession(final JsonEnvelope envelope, String sessionId){ - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(SESSION_ID, sessionId).build(); final Metadata metadata = metadataFrom(envelope.metadata()) @@ -91,13 +91,13 @@ private void endSession(final JsonEnvelope envelope, String sessionId){ private void startNewSession(final JsonEnvelope envelope){ - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(SESSION_ID, randomUUID().toString()) .add(COURT_HOUSE_CODE , AOCP_COURT_HOUSE_CODE) .add(COURT_HOUSE_NAME, AOCP_COURT_HOUSE_NAME) .add(LOCAL_JUSTICE_AREA_NATIONAL_COURT_CODE, AOCP_COURT_LJA) .add("isAocpSession", true) - .add("prosecutors", Json.createArrayBuilder().add("TFL").add("TVL").add("DVLA").build()) + .add("prosecutors", JsonObjects.createArrayBuilder().add("TFL").add("TVL").add("DVLA").build()) .build(); final Metadata metadata = metadataFrom(envelope.metadata()) @@ -108,7 +108,7 @@ private void startNewSession(final JsonEnvelope envelope){ } private void emitPublicSessionStartedEvent(final UUID sessionId, final String courtHouseCode, final String courtHouseName, final String localJusticeAreaNationalCourtCode, final SessionType sessionType, final JsonEnvelope event) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(SESSION_ID, sessionId.toString()) .add(COURT_HOUSE_CODE, courtHouseCode) .add(COURT_HOUSE_NAME, courtHouseName) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java index b19d01a05c..d6e394fbe1 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java index 586594c061..c07acdcd47 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java @@ -5,8 +5,8 @@ import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.capitalize; import static org.apache.commons.lang3.StringUtils.length; import static org.apache.commons.lang3.StringUtils.lowerCase; @@ -46,7 +46,7 @@ import java.util.*; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -170,7 +170,7 @@ public void createTransparencyReport(final JsonEnvelope envelope) { if (LOGGER.isInfoEnabled()) { LOGGER.info("publishing Sjp public event for english report {}, {}", PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED, payloadForPublicEventInEnglish); } - final JsonObjectBuilder pendingListEnglishBuilder = Json.createObjectBuilder() + final JsonObjectBuilder pendingListEnglishBuilder = JsonObjects.createObjectBuilder() .add(LANGUAGE, "ENGLISH") .add(LIST_PAYLOAD, payloadForPublicEventInEnglish); sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata()) @@ -186,7 +186,7 @@ public void createTransparencyReport(final JsonEnvelope envelope) { if (LOGGER.isInfoEnabled()) { LOGGER.info("publishing Sjp public event for welsh report {}, {}", PUBLIC_EVENT_SJP_PENDING_CASES_PUBLIC_LIST_GENERATED, payloadForPublicEventInEnglish); } - final JsonObjectBuilder pendingListWelshBuilder = Json.createObjectBuilder() + final JsonObjectBuilder pendingListWelshBuilder = JsonObjects.createObjectBuilder() .add(LANGUAGE, "WELSH") .add(LIST_PAYLOAD, payloadForPublicEventInWelsh); sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata()) @@ -233,7 +233,7 @@ private void sendPublicEvent(final JsonEnvelope envelope, final JsonObject paylo LOGGER.info("publishing public event for sjp pending cases for public list in english"); final String type = envelope.payloadAsJsonObject().getString(REQUEST_TYPE); final String language = envelope.payloadAsJsonObject().getString(LANGUAGE); - final JsonObjectBuilder pendingListEnglishBuilder = Json.createObjectBuilder() + final JsonObjectBuilder pendingListEnglishBuilder = JsonObjects.createObjectBuilder() .add(LANGUAGE, language) .add(REQUEST_TYPE, type) .add(LIST_PAYLOAD, payloadForDocumentGeneration); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java index 1b4abbecc6..02b7d2cbff 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java @@ -13,7 +13,7 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; @@ -52,7 +52,7 @@ public void execute(final DelegateExecution execution) { final Metadata metadata = metadataHelper.metadataFromString(metadataAsString); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("id", documentReference) .add("caseId", caseId) .add("materialId", materialId) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java index 87a094e5b2..4cefd07ef9 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.activiti.delegates; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.DatesToAvoidProcessor.DATES_TO_AVOID_ADDED_PUBLIC_EVENT_NAME; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.DATES_TO_AVOID; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java index a9c46098b0..06c3f18a7b 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java @@ -15,7 +15,7 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; @@ -37,7 +37,7 @@ public void execute(final UUID caseId, final Metadata metadata, final DelegateEx .withName(PLEA_CANCELLED_PUBLIC_EVENT_NAME) .build(); - final JsonObject publicEventPayload = Json.createObjectBuilder() + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId) .build(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java index c0ed77266d..655e60dcd8 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java @@ -17,7 +17,7 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; @@ -43,7 +43,7 @@ public void execute(final UUID caseId, final Metadata metadata, final DelegateEx .withName(PLEA_UPDATED_PUBLIC_EVENT_NAME) .build(); - final JsonObject publicEventPayload = Json.createObjectBuilder() + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId) .add(PLEA, pleaType.name()) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java index 593b7bdadd..d7975ea2bd 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.activiti.delegates; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.MARKED_AT; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java index 624ac6df2c..16b6c8407c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java @@ -15,7 +15,7 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; @@ -52,12 +52,12 @@ public void execute(final DelegateExecution execution) { final Metadata originalMetadata = metadataHelper.metadataFromString(metadataAsString); - final JsonObject fileUploadedEventPayload = Json.createObjectBuilder() + final JsonObject fileUploadedEventPayload = JsonObjects.createObjectBuilder() .add("documentId", documentReference) .add("caseId", caseIdAsString) .build(); - final JsonObject uploadFileCommandPayload = Json.createObjectBuilder() + final JsonObject uploadFileCommandPayload = JsonObjects.createObjectBuilder() .add("materialId", UUID.randomUUID().toString()) .add("fileServiceId", documentReference) .build(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java index 1d2f8ecb28..c3b14157d1 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java @@ -11,7 +11,7 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; @@ -30,7 +30,7 @@ public void execute(final UUID caseId, final Metadata metadata, final DelegateEx .withName(WITHDRAWAL_REQUEST_CANCELLED_PUBLIC_EVENT_NAME) .build(); - final JsonObject publicEventPayload = Json.createObjectBuilder() + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .build(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java index 53e46a75bd..7032f07115 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java @@ -11,7 +11,7 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; @@ -31,7 +31,7 @@ public void execute(final UUID caseId, final Metadata metadata, final DelegateEx .withName(WITHDRAWAL_REQUESTED_PUBLIC_EVENT_NAME) .build(); - final JsonObject publicEventPayload = Json.createObjectBuilder() + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .build(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java index db8597926c..e422e20512 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.activiti.delegates.adjournment; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.activiti.CaseStateService.CASE_ADJOURNED_VARIABLE; import uk.gov.justice.services.messaging.Metadata; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java index 848f4db68e..93ebd83a7a 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.activiti.delegates.timers; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java index 4a19d815f3..b201721ae3 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.helper; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.apache.commons.io.Charsets.UTF_8; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java index aeb1fd71f4..49221fc207 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.results.converter; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java index f9dae7d2d3..e3ea1f830a 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static uk.gov.justice.core.courts.CourtApplicationParty.courtApplicationParty; import static uk.gov.justice.core.courts.HearingLanguage.ENGLISH; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java index 9b891f489b..75203387bc 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java @@ -9,7 +9,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class MaterialService { @@ -22,7 +22,7 @@ public class MaterialService { private Requester requester; public JsonObject getMaterialMetadata(final UUID materialId, final JsonEnvelope envelope) { - final JsonObject payload = Json.createObjectBuilder().add("materialId", materialId.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("materialId", materialId.toString()).build(); final JsonEnvelope request = enveloper.withMetadataFrom(envelope, "material.query.material-metadata").apply(payload); final JsonEnvelope response = requester.requestAsAdmin(request); return response.payloadAsJsonObject(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java index e2e864534b..7aed80b582 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java @@ -2,7 +2,7 @@ import static java.util.Optional.empty; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java index 9a5aa9d278..2e636752d4 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java @@ -3,7 +3,7 @@ import static java.util.UUID.fromString; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java index 2ee88baf02..cb3d7dd346 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java @@ -10,7 +10,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.core.courts.AllocationDecision.allocationDecision; import static uk.gov.justice.core.courts.BailStatus.bailStatus; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; @@ -39,7 +39,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -83,7 +83,7 @@ public Envelope getOffenceByCjsCode(final String cjsOffenceCode, fin public Optional getVerdictTypes(final JsonEnvelope event, final String verdictType) { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final Envelope jsonObjectEnvelope = envelop(payload) .withName("referencedata.query.verdict-types") @@ -99,7 +99,7 @@ public Optional getVerdictTypes(final JsonEnvelope event, public List getAllVerdictTypes(final JsonEnvelope envelope) { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final Envelope jsonObjectEnvelope = envelop(payload) .withName("referencedata.query.verdict-types") @@ -114,7 +114,7 @@ public List getAllVerdictTypes(final JsonEnvelope envelope) { public List getAllVerdictTypesByJurisdiction(final JsonEnvelope envelope, final String jurisdiction) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("jurisdiction", jurisdiction) .build(); @@ -468,7 +468,7 @@ public Optional getResultDefinition(final String shortCode, final Lo } public Optional getDocumentTypeAccessData(final UUID documentTypeId, final JsonEnvelope jsonEnvelope, final Requester requester) { - final JsonObject payload = Json.createObjectBuilder().add(ID, documentTypeId.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(ID, documentTypeId.toString()).build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_GET_DOCUMENT_ACCESS) .withMetadataFrom(jsonEnvelope)); @@ -498,7 +498,7 @@ public Optional getReferralReasonByReferralReasonId(final UUID refer public List getVictimSurcharges(final JsonEnvelope jsonEnvelope, final Requester requester, final String surchargeType, final String surchargeLevel) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(SURCHARGE_TYPE, surchargeType) .add(SURCHARGE_LEVEL, surchargeLevel) .build(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java index 604e04593d..208fc14e78 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java @@ -3,7 +3,7 @@ import static java.util.Optional.empty; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; @@ -31,7 +31,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java index 103b4b57b7..ff785c6200 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java @@ -9,7 +9,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class UsersGroupsService { @@ -22,7 +22,7 @@ public class UsersGroupsService { private Requester requester; public JsonObject getUserDetails(final UUID userId, final JsonEnvelope envelope) { - final JsonObject payload = Json.createObjectBuilder().add("userId", userId.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("userId", userId.toString()).build(); final JsonEnvelope request = enveloper.withMetadataFrom(envelope, "usersgroups.get-user-details").apply(payload); final JsonEnvelope response = requester.requestAsAdmin(request); return response.payloadAsJsonObject(); diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java index 11fd56082b..87a2bee348 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java @@ -4,7 +4,7 @@ import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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.metadataBuilder; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java index 3d4fee388b..9c2cc0005c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java @@ -2,7 +2,7 @@ import static java.lang.String.format; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.json.schemas.domains.sjp.ApplicationType.REOPENING; import static uk.gov.justice.json.schemas.domains.sjp.ApplicationType.STAT_DEC; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java index 9c54d98dcc..edb45a0b4f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service.notification; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.helper.JsonObjectConversionHelper.jsonObjectAsByteArray; import uk.gov.justice.json.schemas.domains.sjp.queries.Offence; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java index 7e4ae865aa..27300a1de0 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.service.notificationnotify; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.services.core.annotation.Component; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java index 2b2c450d5b..46e9a0f827 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; import static java.util.Collections.emptyList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; @SuppressWarnings("squid:S107") public class ProsecutionCasesDataSourcingService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java index 62f052c4c4..a7f787365a 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java @@ -5,7 +5,7 @@ import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.justice.json.schemas.domains.sjp.queries.DecisionType.REFER_FOR_COURT_HEARING; import static uk.gov.moj.cpp.sjp.event.processor.service.referral.helpers.NotifiedPleaViewHelper.createNotifiedPleaView; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java index 3a65a86daa..3aebe0c8b0 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java index a8a3089b44..280832cadf 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java index ea6a2b410b..240cd37bbf 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.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; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java index 599d25f203..4bc8307351 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResult.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResult.java index 0515b408f5..6a86605716 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResult.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResult.java @@ -22,7 +22,9 @@ public enum ApplicationResult { APA("48b8ff83-2d5d-4891-bab1-b0f5edcd3822"), // Appeal withdrawn - AW("453539d1-c1a0-475d-9a02-16a659e6bc34"); + AW("453539d1-c1a0-475d-9a02-16a659e6bc34"), + + DISM("14d66587-8fbe-424f-a369-b1144f1684e3"); private final String resultId; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResultStatusResolver.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResultStatusResolver.java index 499955adf8..ac087e9de4 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResultStatusResolver.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResultStatusResolver.java @@ -1,5 +1,16 @@ package uk.gov.moj.cpp.sjp.event.processor.utils; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_ABANDONED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_ALLOWED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_DISMISSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_REFUSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_WITHDRAWN; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.REOPENING_GRANTED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.REOPENING_REFUSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.REOPENING_WITHDRAWN; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.STATUTORY_DECLARATION_GRANTED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.STATUTORY_DECLARATION_REFUSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.STATUTORY_DECLARATION_WITHDRAWN; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AACA; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AACD; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AASA; @@ -8,14 +19,19 @@ import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.APA; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.ASV; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AW; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.DISM; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.G; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.RFSD; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.ROPENED; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.STDEC; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.WDRN; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_SENTENCE; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_SENTENCE_AND_CONVICTION; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPLICATION_TO_REOPEN_CASE; @@ -23,31 +39,78 @@ import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.UUID; public class ApplicationResultStatusResolver { - + //retaining the existing behaviour of using applicationType to look up the result for backward compatibility. private static final Map resultToActionMap = new HashMap(); - + //using applicationTypeCode to look up the result instead of type where code exists. + private static final Map resultToActionByCodeMap = new ApplicationStatusByCodeMapBuilder() + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACA, APPEAL_ALLOWED) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASA, APPEAL_ALLOWED) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, ACSD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, DISM, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, WDRN, APPEAL_WITHDRAWN) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AW, APPEAL_WITHDRAWN) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, RFSD, APPEAL_REFUSED) + .add(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, APA, APPEAL_ABANDONED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACA, APPEAL_ALLOWED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASA, APPEAL_ALLOWED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, ACSD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, DISM, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, WDRN, APPEAL_WITHDRAWN) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AW, APPEAL_WITHDRAWN) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, RFSD, APPEAL_REFUSED) + .add(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, APA, APPEAL_ABANDONED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AACA, APPEAL_ALLOWED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AASA, APPEAL_ALLOWED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AACD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AASD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, ACSD, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, DISM, APPEAL_DISMISSED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, WDRN, APPEAL_WITHDRAWN) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AW, APPEAL_WITHDRAWN) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, RFSD, APPEAL_REFUSED) + .add(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, APA, APPEAL_ABANDONED) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, G, STATUTORY_DECLARATION_GRANTED) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, STDEC, STATUTORY_DECLARATION_GRANTED) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, RFSD, STATUTORY_DECLARATION_REFUSED) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, WDRN, STATUTORY_DECLARATION_WITHDRAWN) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, G, STATUTORY_DECLARATION_GRANTED) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, STDEC, STATUTORY_DECLARATION_GRANTED) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, RFSD, STATUTORY_DECLARATION_REFUSED) + .add(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, WDRN, STATUTORY_DECLARATION_WITHDRAWN) + .add(APPLICATION_TO_REOPEN_CASE, G, REOPENING_GRANTED) + .add(APPLICATION_TO_REOPEN_CASE, ROPENED, REOPENING_GRANTED) + .add(APPLICATION_TO_REOPEN_CASE, RFSD, REOPENING_REFUSED) + .add(APPLICATION_TO_REOPEN_CASE, WDRN, REOPENING_WITHDRAWN) + .build(); + + // mapping by application type for backward compatibility. static { - resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + G.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); - resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + STDEC.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); - resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + RFSD.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_REFUSED); - resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + WDRN.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_WITHDRAWN); + resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + G.getResultId(), STATUTORY_DECLARATION_GRANTED); + resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + STDEC.getResultId(), STATUTORY_DECLARATION_GRANTED); + resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + RFSD.getResultId(), STATUTORY_DECLARATION_REFUSED); + resultToActionMap.put(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType() + WDRN.getResultId(), STATUTORY_DECLARATION_WITHDRAWN); - resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + G.getResultId(), ApplicationStatus.REOPENING_GRANTED); - resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + ROPENED.getResultId(), ApplicationStatus.REOPENING_GRANTED); - resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + RFSD.getResultId(), ApplicationStatus.REOPENING_REFUSED); - resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + WDRN.getResultId(), ApplicationStatus.REOPENING_WITHDRAWN); + resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + G.getResultId(), REOPENING_GRANTED); + resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + ROPENED.getResultId(), REOPENING_GRANTED); + resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + RFSD.getResultId(), REOPENING_REFUSED); + resultToActionMap.put(APPLICATION_TO_REOPEN_CASE.getApplicationType() + WDRN.getResultId(), REOPENING_WITHDRAWN); // APPEAL_ALLOWED - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AACA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AASA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AACA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AASA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AACA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AASA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AACA.getResultId(), APPEAL_ALLOWED); + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AASA.getResultId(), APPEAL_ALLOWED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AACA.getResultId(), APPEAL_ALLOWED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AASA.getResultId(), APPEAL_ALLOWED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AACA.getResultId(), APPEAL_ALLOWED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AASA.getResultId(), APPEAL_ALLOWED); // APPEAL REFUSED resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + RFSD.getResultId(), ApplicationStatus.APPEAL_REFUSED); @@ -55,42 +118,61 @@ public class ApplicationResultStatusResolver { resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + RFSD.getResultId(), ApplicationStatus.APPEAL_REFUSED); // APPEAL WITHDRAWN - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + WDRN.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AW.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + WDRN.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AW.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + WDRN.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AW.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + WDRN.getResultId(), APPEAL_WITHDRAWN); + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AW.getResultId(), APPEAL_WITHDRAWN); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + WDRN.getResultId(), APPEAL_WITHDRAWN); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AW.getResultId(), APPEAL_WITHDRAWN); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + WDRN.getResultId(), APPEAL_WITHDRAWN); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AW.getResultId(), APPEAL_WITHDRAWN); // APPEAL DISMISSED - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AACD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AASD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + ACSD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AACD.getResultId(), APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + AASD.getResultId(), APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + ACSD.getResultId(), APPEAL_DISMISSED); resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + ASV.getResultId(), ApplicationStatus.APPLICATION_DISMISSED_SENTENCE_VARIED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AACD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AASD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + ACSD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AACD.getResultId(), APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + AASD.getResultId(), APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + ACSD.getResultId(), APPEAL_DISMISSED); resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + ASV.getResultId(), ApplicationStatus.APPLICATION_DISMISSED_SENTENCE_VARIED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AACD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AASD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + ACSD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AACD.getResultId(), APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + AASD.getResultId(), APPEAL_DISMISSED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + ACSD.getResultId(), APPEAL_DISMISSED); resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + ASV.getResultId(), ApplicationStatus.APPLICATION_DISMISSED_SENTENCE_VARIED); // APPEAL ABANDONED - resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + APA.getResultId(), ApplicationStatus.APPEAL_ABANDONED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + APA.getResultId(), ApplicationStatus.APPEAL_ABANDONED); - resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + APA.getResultId(), ApplicationStatus.APPEAL_ABANDONED); - + resultToActionMap.put(APPEAL_AGAINST_CONVICTION.getApplicationType() + APA.getResultId(), APPEAL_ABANDONED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE.getApplicationType() + APA.getResultId(), APPEAL_ABANDONED); + resultToActionMap.put(APPEAL_AGAINST_SENTENCE_AND_CONVICTION.getApplicationType() + APA.getResultId(), APPEAL_ABANDONED); } private ApplicationResultStatusResolver() { } - public static String getApplicationStatus(String courtApplicationType, UUID resultDefinitionId) { + public static String getApplicationStatus(String courtApplicationType, UUID resultDefinitionId, String courtApplicationCode) { - final ApplicationStatus applicationStatus = resultToActionMap.get(courtApplicationType + resultDefinitionId.toString()); + final ApplicationStatus applicationStatus = Optional.ofNullable(resultToActionMap.get(courtApplicationType + resultDefinitionId.toString())). + orElse(resultToActionByCodeMap.get(courtApplicationCode + resultDefinitionId.toString())); return applicationStatus == null ? ApplicationStatus.APPLICATION_STATUS_NOT_KNOWN.toString() : String.valueOf(applicationStatus); } -} + private static final class ApplicationStatusByCodeMapBuilder { + private final Map mappings = new HashMap<>(); + + private ApplicationStatusByCodeMapBuilder add(SjpApplicationTypes courtApplicationType, + ApplicationResult applicationResult, + ApplicationStatus applicationStatus) { + mappings.put(buildCodeKey(courtApplicationType, applicationResult), applicationStatus); + return this; + } + + private String buildCodeKey(SjpApplicationTypes courtApplicationType, ApplicationResult applicationResult) { + return courtApplicationType.getApplicationCode() + applicationResult.getResultId(); + } + + private Map build() { + return mappings; + } + } + +} \ No newline at end of file diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java index b7779366c4..721ce69a3f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonReader; @@ -79,7 +79,7 @@ private JsonObject enrichPayloadWithMetadata(final JsonObject payload, final Met } private static JsonObject readJson(final String json) { - try (final JsonReader jsonReader = Json.createReader(new StringReader(json))) { + try (final JsonReader jsonReader = JsonObjects.createReader(new StringReader(json))) { return jsonReader.readObject(); } } diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/SjpApplicationTypes.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/SjpApplicationTypes.java index 9551c0868c..f7d2d93bf6 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/SjpApplicationTypes.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/SjpApplicationTypes.java @@ -1,20 +1,34 @@ package uk.gov.moj.cpp.sjp.event.processor.utils; +import com.microsoft.applicationinsights.core.dependencies.apachecommons.lang3.StringUtils; + public enum SjpApplicationTypes { - APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP("Appearance to make statutory declaration (SJP case)"), - APPLICATION_TO_REOPEN_CASE("Application to reopen case"), - APPEAL_AGAINST_CONVICTION("Appeal against conviction"), - APPEAL_AGAINST_SENTENCE("Appeal against Sentence"), - APPEAL_AGAINST_SENTENCE_AND_CONVICTION("Appeal against Sentence and Conviction"); + APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP("Appearance to make statutory declaration (SJP case)","MC80528"), + APPLICATION_TO_REOPEN_CASE("Application to reopen case","MC80524"), + APPEAL_AGAINST_CONVICTION("Appeal against conviction", StringUtils.EMPTY), + APPEAL_AGAINST_SENTENCE("Appeal against Sentence", StringUtils.EMPTY), + APPEAL_AGAINST_SENTENCE_AND_CONVICTION("Appeal against Sentence and Conviction", StringUtils.EMPTY), + APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT("Appeal against sentence by a Magistrates' Court to the Crown Court","MC80803"), + APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP("Appearance to make statutory declaration (other than SJP)","MC80527"), + APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT("Appeal against conviction and sentence by a Magistrates' Court to the Crown Court","MC80801"), + APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT("Appeal against conviction by a Magistrates' Court to the Crown Court","MC80802"); + private String applicationType; - private SjpApplicationTypes(final String applicationType) { + private String applicationCode; + + private SjpApplicationTypes(final String applicationType, final String applicationCode) { this.applicationType = applicationType; + this.applicationCode = applicationCode; } public String getApplicationType() { return applicationType; } + + public String getApplicationCode() { + return applicationCode; + } } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java index 1129ca1785..fd8e7250ee 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java index 59f6f342ae..7bee9c4d6e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.java index 0a55148e1a..e5aa933e36 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.java @@ -1,45 +1,16 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static java.time.ZonedDateTime.now; -import static java.util.Arrays.asList; -import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static uk.gov.justice.services.test.utils.core.converter.JsonObjectToObjectConverterFactory.createJsonObjectToObjectConverter; - -import uk.gov.justice.json.schemas.domains.sjp.Address; -import uk.gov.justice.json.schemas.domains.sjp.ApplicationType; -import uk.gov.justice.json.schemas.domains.sjp.Gender; -import uk.gov.justice.json.schemas.domains.sjp.PersonalDetails; -import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDecision; -import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails; -import uk.gov.justice.json.schemas.domains.sjp.queries.DecisionType; -import uk.gov.justice.json.schemas.domains.sjp.queries.Defendant; -import uk.gov.justice.json.schemas.domains.sjp.queries.Offence; -import uk.gov.justice.json.schemas.domains.sjp.queries.QueryApplicationDecision; -import uk.gov.justice.json.schemas.domains.sjp.queries.QueryOffenceDecision; -import uk.gov.justice.json.schemas.domains.sjp.queries.Session; -import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.fileservice.api.FileServiceException; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.decision.ApplicationDecisionSetAside; -import uk.gov.moj.cpp.sjp.event.processor.service.SjpService; -import uk.gov.moj.cpp.sjp.event.processor.service.models.CaseDetailsDecorator; -import uk.gov.moj.cpp.sjp.event.processor.service.notification.EndorsementRemovalNotificationService; import uk.gov.moj.cpp.sjp.event.processor.utils.builders.ApplicationDecisionSetAsideEnvelope; -import java.time.LocalDate; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.List; import java.util.UUID; import javax.json.JsonObject; @@ -51,23 +22,11 @@ import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) public class ApplicationSetAsideProcessorTest { - private static final String OFFENCE_CODE = "OFFENCE_CODE"; - private static final LocalDate OFFENCE_START_DATE = LocalDate.of(2020, 1, 1); - private static final String LOCAL_JUSTICE_AREA_NATIONAL_COURT_CODE = "2577"; - private static final ZonedDateTime ORIGINAL_CONVICTION_DATE = ZonedDateTime.of(2020, 1, 2, 0, 0, 0, 0, ZoneId.systemDefault()); - - @Spy - private JsonObjectToObjectConverter converter = createJsonObjectToObjectConverter(); - @Mock - private EndorsementRemovalNotificationService endorsementRemovalNotificationService; - @Mock - private SjpService sjpService; @Mock private Sender sender; @InjectMocks @@ -77,20 +36,14 @@ public class ApplicationSetAsideProcessorTest { private ArgumentCaptor envelopeCaptor; private UUID caseId; - private UUID sessionId; private UUID applicationId; private UUID applicationDecisionId; - private Session session; private JsonEnvelope envelope; - private ZonedDateTime applicationSavedAt; - private CaseDetails caseDetails; @BeforeEach public void setUp() { caseId = randomUUID(); - sessionId = randomUUID(); applicationId = randomUUID(); - applicationSavedAt = ZonedDateTime.of(LocalDate.of(2020, 11, 20), LocalTime.now(), ZoneId.systemDefault()); applicationDecisionId = randomUUID(); final ApplicationDecisionSetAside applicationDecisionSetAside = new ApplicationDecisionSetAside(applicationId, caseId, "TVLXYZ01"); envelope = ApplicationDecisionSetAsideEnvelope.of(applicationDecisionSetAside); @@ -104,8 +57,6 @@ public void shouldPublishPublicEventOnApplicationSetAside() throws FileServiceEx .add("caseUrn", "TVLXYZ01") .build(); envelope = ApplicationDecisionSetAsideEnvelope.of(payload); - givenCaseWithoutEndorsementsToBeRemoved(); - processor.handleApplicationDecisionSetAside(envelope); verify(sender).send(envelopeCaptor.capture()); @@ -113,120 +64,4 @@ public void shouldPublishPublicEventOnApplicationSetAside() throws FileServiceEx assertThat(envelopeCaptor.getValue().payloadAsJsonObject(), is(payload)); assertThat(envelopeCaptor.getValue().payloadAsJsonObject().getString("caseUrn"), is("TVLXYZ01")); } - - @Test - public void shouldRequestFileGenerationWhenThereAreEndorsementsToBeRemoved() throws FileServiceException { - givenCaseWithEndorsementsToBeRemoved(); - final CaseDetailsDecorator decoratedCaseDetails = new CaseDetailsDecorator(caseDetails); - when(endorsementRemovalNotificationService.hasEndorsementsToBeRemoved(decoratedCaseDetails)).thenReturn(true); - - processor.handleApplicationDecisionSetAside(envelope); - - verify(endorsementRemovalNotificationService).generateNotification(decoratedCaseDetails, envelope); - } - - @Test - public void shouldNotRequestFileGenerationWhenThereAreNoEndorsementsToBeRemoved() throws FileServiceException { - givenCaseWithoutEndorsementsToBeRemoved(); - when(endorsementRemovalNotificationService.hasEndorsementsToBeRemoved(new CaseDetailsDecorator(caseDetails))).thenReturn(false); - - processor.handleApplicationDecisionSetAside(envelope); - - verify(endorsementRemovalNotificationService, never()).generateNotification(new CaseDetailsDecorator(caseDetails), envelope); - } - - private Offence.Builder createOffence() { - return Offence.offence() - .withId(randomUUID()) - .withOffenceCode(OFFENCE_CODE) - .withStartDate(OFFENCE_START_DATE.toString()); - } - - private CaseDecision statDecGrantedDecision(final ZonedDateTime previousFinalDecision) { - return CaseDecision.caseDecision() - .withId(applicationDecisionId) - .withSavedAt(applicationSavedAt) - .withApplicationDecision(applicationDecision(previousFinalDecision).build()) - .withSession(session) - .build(); - } - - private CaseDecision.Builder financialPenaltyDecision(final UUID offenceId) { - return CaseDecision.caseDecision() - .withId(randomUUID()) - .withSavedAt(now()) - .withOffenceDecisions(singletonList( - financialPenaltyWithEndorsements(offenceId, ORIGINAL_CONVICTION_DATE.toLocalDate()))) - .withSession(session); - } - - private QueryOffenceDecision financialPenaltyWithEndorsements(final UUID offenceId, final LocalDate originalConvictionDate) { - return QueryOffenceDecision.queryOffenceDecision() - .withOffenceId(offenceId) - .withDecisionType(DecisionType.FINANCIAL_PENALTY) - .withLicenceEndorsement(true) - .withPenaltyPointsImposed(10) - .withConvictionDate(originalConvictionDate) - .build(); - } - - private void startSession() { - session = Session.session() - .withSessionId(sessionId) - .withCourtHouseCode("Court House Code") - .withCourtHouseName("Court House Name") - .withLocalJusticeAreaNationalCourtCode(LOCAL_JUSTICE_AREA_NATIONAL_COURT_CODE) - .build(); - } - - private QueryApplicationDecision.Builder applicationDecision(final ZonedDateTime previousFinalDecisionSavedAt) { - return QueryApplicationDecision.queryApplicationDecision() - .withApplicationType(ApplicationType.STAT_DEC) - .withOutOfTime(false) - .withGranted(true) - .withPreviousFinalDecision(previousFinalDecisionSavedAt); - } - - - private CaseDetails.Builder createCase(final List offences) { - final CaseDetails.Builder builder = CaseDetails.caseDetails() - .withId(caseId) - .withUrn("Case URN") - .withDefendant(Defendant.defendant() - .withPersonalDetails(PersonalDetails.personalDetails() - .withFirstName("Robert") - .withLastName("Robertson") - .withDateOfBirth(LocalDate.of(1980, 5, 21)) - .withGender(Gender.MALE) - .withDriverNumber("Driver Number") - .withAddress(Address.address() - .withAddress1("line1") - .withAddress2("line2") - .withPostcode("POSTCODE") - .build()) - .build()) - .withOffences(offences) - .build()); - - final CaseDecision caseDecision1 = financialPenaltyDecision(offences.get(0).getId()).build(); - final CaseDecision caseDecision2 = statDecGrantedDecision(caseDecision1.getSavedAt()); - builder.withCaseDecisions(asList(caseDecision1, caseDecision2)); - - return builder; - } - - private void givenCaseWithEndorsementsToBeRemoved() { - startSession(); - - final Offence offence = createOffence().build(); - caseDetails = createCase(singletonList(offence)).build(); - when(sjpService.getCaseDetails(caseId, envelope)).thenReturn(caseDetails); - } - - private void givenCaseWithoutEndorsementsToBeRemoved() { - caseDetails = CaseDetails.caseDetails() - .withCaseDecisions(emptyList()) - .build(); - when(sjpService.getCaseDetails(caseId, envelope)).thenReturn(caseDetails); - } } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java index ee56437b0c..5b79e1882f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.AllOf.allOf; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessorTest.java index a597887970..cdb517c3b8 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessorTest.java @@ -12,7 +12,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,7 +39,7 @@ public class CaseAdjournmentProcessorTest { public void shouldInvokeActivityFlowWhenCaseAdjournmentRecorder() { final JsonEnvelope caseAdjournmentRecordedEvent = EnvelopeFactory .createEnvelope("sjp.events.case-adjourned-to-later-sjp-hearing-recorded", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("caseId", CASE_ID.toString()) .add("adjournedTo", ADJOURNED_TO.toString()) .build()); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java index e884e33700..765cab5272 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java index 7278cad135..dd91c1a2d4 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessorTest.java index 7978d437f9..93364e2d28 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessorTest.java @@ -17,7 +17,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,7 +47,7 @@ public void publish() { final JsonEnvelope privateEvent = EnvelopeFactory .createEnvelope("sjp.events.case-creation-failed-because-case-already-existed", - Json.createObjectBuilder().add("caseId", CASE_ID).add("urn", URN) + JsonObjects.createObjectBuilder().add("caseId", CASE_ID).add("urn", URN) .build()); //when diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java index 22aa88acde..e6b99f3247 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.Is.is; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java index 4ead365e41..2a98262bbe 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -115,7 +115,7 @@ public void shouldRaisePublicEventForCaseDocumentAlreadyAdded() { } private JsonEnvelope buildCaseDocumentAddedEvent(final Optional documentType, String eventName) { - final JsonObjectBuilder documentBuilder = Json.createObjectBuilder() + final JsonObjectBuilder documentBuilder = JsonObjects.createObjectBuilder() .add(ID, VALUE_CASE_DOCUMENT_ID) .add(MATERIAL_ID, VALUE_MATERIAL_ID); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java index cfaf39fdb6..3054694ab7 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java @@ -3,7 +3,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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java index 8c6a35b682..e8df13e64f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java index 0985785ed8..90ecdb0b6b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -29,7 +29,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonValue; @@ -93,7 +93,7 @@ public void shouldHandleCaseListedInCCReferToCourt() { final JsonEnvelope privateEvent = createEnvelope(PRIVATE_CASE_LISTED_IN_REFER_TO_COURT_EVENT, createObjectBuilder() .add(CASE_ID, caseId.toString()) - .add("courtCentre", Json.createObjectBuilder() + .add("courtCentre", JsonObjects.createObjectBuilder() .add("id", "cf73207f-3ced-488a-82a0-3fba79c2ce04") .add("name", "Carmarthen Magistrates' Court") .add("roomId", "d7020fe0-cd97-4ce0-84c2-fd00ff0bc48a") @@ -128,7 +128,7 @@ public void handleCaseListedInCC_shouldInitiatePublicHearingResultedEvent() { final JsonEnvelope privateEvent = createEnvelope(PRIVATE_CASE_LISTED_IN_REFER_TO_COURT_EVENT, createObjectBuilder() .add(CASE_ID, caseId.toString()) - .add("courtCentre", Json.createObjectBuilder() + .add("courtCentre", JsonObjects.createObjectBuilder() .add("id", "cf73207f-3ced-488a-82a0-3fba79c2ce04") .add("name", "Carmarthen Magistrates' Court") .add("roomId", "d7020fe0-cd97-4ce0-84c2-fd00ff0bc48a") diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java index a58e655dff..43cd1b0ad2 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java index c194ddf9d3..3077eb5537 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java @@ -5,7 +5,7 @@ import static java.util.Arrays.asList; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -44,7 +44,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonValue; @@ -158,7 +158,7 @@ public void shouldUpdateCaseStateAndResolveCaseAOCPEligibility() throws IOExcept withJsonPath("$.id", equalTo(caseId.toString())), withJsonPath("$.postingDate", equalTo(postingDate.toString()))))); - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payloadBuilder.add("CaseReference", urn); verify(azureFunctionService).relayCaseOnCPP(payloadBuilder.build().toString()); verify(timerService).startTimerForDefendantResponse(caseId, expectedDateReady, privateEvent.metadata()); @@ -205,7 +205,7 @@ public void shouldUpdateCaseStateAndResolveCaseAOCPEligibilityWhenSurchangeAmoun withJsonPath("$.id", equalTo(caseId.toString())), withJsonPath("$.postingDate", equalTo(postingDate.toString()))))); - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payloadBuilder.add("CaseReference", urn); verify(azureFunctionService).relayCaseOnCPP(payloadBuilder.build().toString()); verify(timerService).startTimerForDefendantResponse(caseId, expectedDateReady, privateEvent.metadata()); @@ -255,7 +255,7 @@ public void shouldUpdateCaseStateAndResolveCaseAOCPEligibilityWhenMinAndMaxVicti withJsonPath("$.id", equalTo(caseId.toString())), withJsonPath("$.postingDate", equalTo(postingDate.toString()))))); - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payloadBuilder.add("CaseReference", urn); verify(azureFunctionService).relayCaseOnCPP(payloadBuilder.build().toString()); verify(timerService).startTimerForDefendantResponse(caseId, expectedDateReady, privateEvent.metadata()); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java index a10dfa812d..cfaa8c95da 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; @@ -73,7 +73,7 @@ private void verifyCaseReopenedEventMessage(String eventName, Consumer consumer) { - JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder().add("caseId", CASE_ID); + JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder().add("caseId", CASE_ID); final JsonEnvelope privateEvent = EnvelopeFactory.createEnvelope(eventName, jsonObjectBuilder.build()); @@ -91,7 +91,7 @@ private void verifyCaseReopenedEventMessage(final String eventName, final String reopenedDate, final String libraCaseNumber, final String reason) { - JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder() .add("caseId", CASE_ID) .add("reopenedDate", reopenedDate) .add("libraCaseNumber", libraCaseNumber) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java index 758793e2ba..cb1ba2f387 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessorTest.java index 9637458b00..3160fd227d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessorTest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,7 +47,7 @@ public class CaseUpdateRejectedProcessorTest { public void caseUpdateRejectedPublicEvent() { final JsonEnvelope privateEvent = createEnvelope("sjp.events.case-update-rejected", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("caseId", CASE_ID) .add("reason", CaseUpdateRejected.RejectReason.CASE_COMPLETED.name()) .build()); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java index ee8826ebdb..39e8fcc702 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java index 798e02a221..06635c38b2 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java index 8a83888604..8ad58f3f06 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java @@ -7,8 +7,8 @@ import static java.util.Collections.emptyList; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java index 43c31cd77d..19a6b99d29 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessorTest.java index 2bf6dd1e0e..068f6d5e66 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.AllOf.allOf; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java index 2104cd8c76..932f7cd090 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java index 6663f9e282..7bf2186149 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java index 8338d9858c..b388bf5801 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java index 6a620d4c08..bca86e6d66 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java index cc8cfd309c..2310ac65da 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java index 544e66efeb..af1679aa2f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java index 5759c45b38..6ae98fbcff 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java index d48ff088da..9147618632 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java index c3e9ae5ced..c9cd856c6c 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java @@ -1,11 +1,43 @@ package uk.gov.moj.cpp.sjp.event.processor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.microsoft.applicationinsights.core.dependencies.apachecommons.lang3.StringUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.justice.core.courts.CourtApplication; +import uk.gov.justice.core.courts.CourtApplicationCase; +import uk.gov.justice.core.courts.CourtApplicationType; +import uk.gov.justice.core.courts.JudicialResult; +import uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus; +import uk.gov.justice.json.schemas.domains.sjp.results.PublicHearingResulted; +import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; +import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; +import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; +import uk.gov.justice.services.core.sender.Sender; +import uk.gov.justice.services.messaging.Envelope; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.sjp.event.CaseReceived; + +import javax.json.Json; +import javax.json.JsonArrayBuilder; +import javax.json.JsonObjectBuilder; +import javax.json.JsonValue; +import java.io.IOException; +import java.util.Arrays; +import java.util.UUID; + import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; @@ -29,50 +61,22 @@ import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.APA; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.ASV; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AW; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.DISM; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.G; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.RFSD; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.ROPENED; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.STDEC; import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.WDRN; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_SENTENCE; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_SENTENCE_AND_CONVICTION; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP; import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPLICATION_TO_REOPEN_CASE; -import uk.gov.justice.core.courts.CourtApplication; -import uk.gov.justice.core.courts.CourtApplicationCase; -import uk.gov.justice.core.courts.CourtApplicationType; -import uk.gov.justice.core.courts.JudicialResult; -import uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus; -import uk.gov.justice.json.schemas.domains.sjp.results.PublicHearingResulted; -import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; -import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; -import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; -import uk.gov.justice.services.core.sender.Sender; -import uk.gov.justice.services.messaging.Envelope; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.sjp.event.CaseReceived; - -import java.io.IOException; -import java.util.Arrays; -import java.util.UUID; - -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - @ExtendWith(MockitoExtension.class) public class HearingResultReceivedProcessorTest { @@ -111,8 +115,8 @@ private JsonEnvelope populateHearing(String applicationType, UUID caseId, boolea .withProsecutionCaseId(caseId) .build(); CourtApplicationType courtApplicationType = new CourtApplicationType.Builder() - .withType(applicationType) - + .withType(applicationType.startsWith("MC80") ? StringUtils.EMPTY : applicationType) + .withCode(applicationType.startsWith("MC80") ? applicationType : StringUtils.EMPTY) .build(); CourtApplication courtApplication = courtApplication() .withId(randomUUID()) @@ -134,7 +138,6 @@ private JsonEnvelope populateHearing(String applicationType, UUID caseId, boolea return hearingJsonEnvelope; } - private void runTest(String applicationType, String resultDefinitionId, ApplicationStatus applicationStatus) { JsonEnvelope hearingJsonEnvelope = populateHearing(applicationType, caseId, true, resultDefinitionId); hearingResultReceivedProcessor.hearingResultReceived(hearingJsonEnvelope); @@ -258,9 +261,9 @@ public void shouldHandleHearingResultReceivedWithApplicationTypeNotInCommonTypes @Test public void shouldHandleHearingResultReceivedWhenCourtApplicationsIsNotPresent() throws IOException { - JsonObjectBuilder hearingJsonBuilder = Json.createObjectBuilder(); + JsonObjectBuilder hearingJsonBuilder = JsonObjects.createObjectBuilder(); hearingJsonBuilder.add("id", randomUUID().toString()); - JsonObjectBuilder hearingEnvelopeJsonBuilder = Json.createObjectBuilder(); + JsonObjectBuilder hearingEnvelopeJsonBuilder = JsonObjects.createObjectBuilder(); hearingEnvelopeJsonBuilder.add("hearing", hearingJsonBuilder); final JsonEnvelope hearingJsonEnvelope = envelopeFrom(metadataWithRandomUUID(HearingResultReceivedProcessor.PUBLIC_HEARING_RESULTED), @@ -272,10 +275,10 @@ public void shouldHandleHearingResultReceivedWhenCourtApplicationsIsNotPresent() @Test public void shouldHandleHearingResultReceivedWhenCourtApplicationIsNotPresent() throws IOException { - JsonObjectBuilder courtApplicationJsonObjectBuilder = Json.createObjectBuilder(); - JsonArrayBuilder courtApplications = Json.createArrayBuilder(); + JsonObjectBuilder courtApplicationJsonObjectBuilder = JsonObjects.createObjectBuilder(); + JsonArrayBuilder courtApplications = JsonObjects.createArrayBuilder(); courtApplicationJsonObjectBuilder.add("courtApplications", courtApplications); - JsonObjectBuilder hearingJsonBuilder = Json.createObjectBuilder(); + JsonObjectBuilder hearingJsonBuilder = JsonObjects.createObjectBuilder(); hearingJsonBuilder.add("hearing", courtApplicationJsonObjectBuilder); final JsonEnvelope hearingJsonEnvelope = envelopeFrom(metadataWithRandomUUID(HearingResultReceivedProcessor.PUBLIC_HEARING_RESULTED), @@ -291,5 +294,63 @@ public void shouldHandleCaseReceivedEvent() { .with(method("handleCaseReceivedEvent").thatHandles(CaseReceived.EVENT_NAME))); } + @Test + public void shouldHandleJudicialResultsMatchingApplicationCodeForStatDecApplication() throws IOException { + + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), G.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), STDEC.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), RFSD.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_REFUSED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), WDRN.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_WITHDRAWN); + + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), G.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), STDEC.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), RFSD.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_REFUSED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationCode(), WDRN.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_WITHDRAWN); + + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP.getApplicationCode(), G.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP.getApplicationCode(), STDEC.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP.getApplicationCode(), RFSD.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_REFUSED); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP.getApplicationCode(), WDRN.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_WITHDRAWN); + } + + @Test + public void shouldHandleJudicialResultsMatchingApplicationCodeForAppealApplication() throws IOException { + + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AACA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AASA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AACD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AASD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), ACSD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), DISM.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), WDRN.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); + runTest(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AW.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); + + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AACA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AASA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AACD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AASD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), ACSD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), DISM.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), WDRN.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); + runTest(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AW.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); + + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AACA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AASA.getResultId(), ApplicationStatus.APPEAL_ALLOWED); + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AACD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AASD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), ACSD.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), DISM.getResultId(), ApplicationStatus.APPEAL_DISMISSED); + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), WDRN.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); + runTest(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT.getApplicationCode(), AW.getResultId(), ApplicationStatus.APPEAL_WITHDRAWN); + } + + @Test + public void shouldHandleJudicialResultsMatchingApplicationCodeForReopenApplication() throws IOException { + + runTest(APPLICATION_TO_REOPEN_CASE.getApplicationCode(), G.getResultId(), ApplicationStatus.REOPENING_GRANTED); + runTest(APPLICATION_TO_REOPEN_CASE.getApplicationCode(), ROPENED.getResultId(), ApplicationStatus.REOPENING_GRANTED); + runTest(APPLICATION_TO_REOPEN_CASE.getApplicationCode(), RFSD.getResultId(), ApplicationStatus.REOPENING_REFUSED); + runTest(APPLICATION_TO_REOPEN_CASE.getApplicationCode(), WDRN.getResultId(), ApplicationStatus.REOPENING_WITHDRAWN); + } } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java index f5e695a150..ee08a14b8d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java @@ -2,6 +2,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; +import org.junit.jupiter.api.Assertions; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static uk.gov.justice.core.courts.CourtApplication.courtApplication; @@ -14,6 +15,7 @@ import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP; import uk.gov.justice.core.courts.CourtApplication; +import uk.gov.justice.core.courts.CourtApplicationCase; import uk.gov.justice.core.courts.CourtApplicationType; import uk.gov.justice.core.courts.Hearing; import uk.gov.justice.core.courts.JudicialResult; @@ -28,6 +30,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; +import java.util.Arrays; import java.util.UUID; import javax.json.JsonValue; @@ -105,6 +108,29 @@ private JsonEnvelope populateHearing(String applicationType, UUID caseId, boolea objectToJsonObjectConverter.convert(publicHearingResulted)); } + private JsonEnvelope populateHearingWithNoJudicialResult(String applicationType, UUID caseId, boolean isSJP, String resultDefinitionId, final boolean hasMigration) { + + CourtApplicationType courtApplicationType = new CourtApplicationType.Builder() + .withType(applicationType) + .build(); + CourtApplicationCase courtApplicationCase = new CourtApplicationCase.Builder() + .withIsSJP(true) + .withProsecutionCaseId(caseId) + .build(); + CourtApplication courtApplication = courtApplication() + .withId(randomUUID()) + .withType(courtApplicationType) + .withCourtApplicationCases(Arrays.asList(courtApplicationCase)) + .build(); + + final PublicHearingResulted publicHearingResulted = publicHearingResulted() + .withHearing(getHearing(isSJP, courtApplication,hasMigration)) + .build(); + + + return envelopeFrom(metadataWithRandomUUID(HearingResultReceivedProcessor.PUBLIC_HEARING_RESULTED), + objectToJsonObjectConverter.convert(publicHearingResulted)); + } private Hearing getHearing(final boolean isSJP, final CourtApplication courtApplication, final boolean hasMigration) { return !hasMigration ? hearing().withCourtApplications(singletonList(courtApplication)).withProsecutionCases(singletonList(ProsecutionCase.prosecutionCase().build())).withIsSJPHearing(isSJP).build() : hearing().withCourtApplications(singletonList(courtApplication)).withProsecutionCases(singletonList(prosecutionCase)).withIsSJPHearing(isSJP).build(); @@ -123,7 +149,7 @@ private void runTest(String applicationType, String resultDefinitionId, Applicat @Test public void shouldNotThrowExceptionForEmptyApplicationCases() { - runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType(), G.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED, true,false); + runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType(), G.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED, true,false); } @Test @@ -131,4 +157,12 @@ public void shouldNotProceedWithMigrationSystem() { runTest(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType(), G.getResultId(), ApplicationStatus.STATUTORY_DECLARATION_GRANTED, false,true); } + + @Test + public void shouldNotProceedWithNoJudicialResults() { + + JsonEnvelope hearingJsonEnvelopeWithNoJudicialResult = populateHearingWithNoJudicialResult(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP.getApplicationType(), caseId, false, G.getResultId(), false); + Assertions.assertDoesNotThrow(() -> hearingResultReceivedProcessor.hearingResultReceived(hearingJsonEnvelopeWithNoJudicialResult)); + verify(sender, never()).send(envelopeCaptor.capture()); + } } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java index a2e9372737..d056b19c39 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java @@ -2,7 +2,7 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.never; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java index 98282dccd1..4b4dc31eb9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java @@ -3,8 +3,8 @@ import static java.time.LocalDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessorTest.java index 883dd784a2..c2471c10c3 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessorTest.java index 46cf7b0697..28808c1e6a 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessorTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.Boolean.TRUE; import static java.util.Collections.emptyList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.AllOf.allOf; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessorTest.java index be100b6cf2..1d5e9e8bab 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessorTest.java @@ -40,7 +40,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -74,7 +74,7 @@ public void shouldUpdateCaseStateWhenPleaUpdated() { final ZonedDateTime pleaUpdatedDate = ZonedDateTime.now(UTC).minusDays(2); final JsonEnvelope privateEvent = createEnvelope(PleaUpdated.EVENT_NAME, - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEA, pleaType.name()) @@ -96,7 +96,7 @@ public void shouldUpdateCaseStateWhenPleaUpdatedWithoutDateWithMetadataCreationD metadataWithRandomUUID(PleaUpdated.EVENT_NAME) .createdAt(metadataCreatedAt) .build(), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEA, pleaType.name()) @@ -123,7 +123,7 @@ public void shouldUpdateCaseStateWhenPleaUpdatedWithoutDateWithoutMetadataCreati final PleaType pleaType = NOT_GUILTY; final JsonEnvelope privateEvent = createEnvelope(PleaUpdated.EVENT_NAME, - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEA, pleaType.name()) @@ -145,7 +145,7 @@ public void shouldUpdateCaseStateWhenPleadedGuilty() { final UUID offenceId = randomUUID(); final JsonEnvelope privateEvent = createEnvelope(PleadedGuilty.EVENT_NAME, - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEAD_DATE, stoppedClock.now().toString()) @@ -162,7 +162,7 @@ public void shouldUpdateCaseStateWhenPleadedGuiltyCourtHearingRequested() { final UUID offenceId = randomUUID(); final JsonEnvelope privateEvent = createEnvelope(PleadedGuiltyCourtHearingRequested.EVENT_NAME, - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEAD_DATE, stoppedClock.now().toString()) @@ -179,7 +179,7 @@ public void shouldUpdateCaseStateWhenPleadedNotGuilty() { final UUID offenceId = randomUUID(); final JsonEnvelope privateEvent = createEnvelope(PleadedNotGuilty.EVENT_NAME, - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEAD_DATE, stoppedClock.now().toString()) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java index bf945db10e..ea53621494 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.Objects.nonNull; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -297,7 +297,7 @@ private JsonObject getCaseDetail(final String plea, final JsonValue completed) { Optional.ofNullable(plea) .ifPresent(value -> offenceObjectBuilder.add("plea", plea)); - final JsonArray offences = Json.createArrayBuilder().add(offenceObjectBuilder.build()).build(); + final JsonArray offences = JsonObjects.createArrayBuilder().add(offenceObjectBuilder.build()).build(); final JsonObject defendant = createObjectBuilder() .add("offences", offences) @@ -320,7 +320,7 @@ private JsonObject getCaseDetailPostConvention( final String adjournedTo, final .ifPresent(value -> offenceObjectBuilder.add("conventionDate", conventionDate)); - final JsonArray offences = Json.createArrayBuilder().add(offenceObjectBuilder.build()).build(); + final JsonArray offences = JsonObjects.createArrayBuilder().add(offenceObjectBuilder.build()).build(); final JsonObject defendant = createObjectBuilder() .add("offences", offences) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java index 58c625c94e..04b1a815d3 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java @@ -22,7 +22,7 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -86,6 +86,6 @@ public void raisesPleasSetPublicEvent() throws JsonProcessingException { public JsonObject convertToJsonObject(PleasSet pleasSet) throws JsonProcessingException { String json = objectMapper.writeValueAsString(pleasSet); - return Json.createReader(new StringReader(json)).readObject(); + return JsonObjects.createReader(new StringReader(json)).readObject(); } } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java index decc215cff..0544c04908 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java @@ -11,8 +11,8 @@ import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; import static java.util.stream.IntStream.range; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java index f9b4c01d73..cd55de9965 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java @@ -2,8 +2,8 @@ import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; @@ -27,7 +27,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import com.google.common.collect.ImmutableMap; @@ -92,7 +92,7 @@ public void shouldSendUpdateCaseListedInCriminalCourtsCommand() { .add(CASE_ID, caseId.toString()) .add(DEFENDANT_ID, defendantId.toString()) .add("defendantOffences", createArrayBuilder().add(offenceId.toString())) - .add("courtCentre", Json.createObjectBuilder() + .add("courtCentre", JsonObjects.createObjectBuilder() .add("id", "cf73207f-3ced-488a-82a0-3fba79c2ce04") .add("name", "Carmarthen Magistrates' Court") .add("roomId", "d7020fe0-cd97-4ce0-84c2-fd00ff0bc48a") diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java index b54ee793dc..9253a82fdd 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java index 4605da3f09..afc7ec12cd 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java @@ -4,8 +4,8 @@ import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; import static java.util.stream.IntStream.range; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.everyItem; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessorTest.java index 885105744e..35b74b642e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessorTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java index fa5385d60c..783cc9ba3f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java @@ -28,7 +28,7 @@ import java.util.Optional; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -103,7 +103,7 @@ public static uk.gov.justice.json.schemas.domains.sjp.Address getAddressWithOpti } public static Optional getJsonAddress() { - return Optional.of(Json.createObjectBuilder() + return Optional.of(JsonObjects.createObjectBuilder() .add(ADDRESS1_KEY, ADDRESS_LINE_1) .add(ADDRESS2_KEY, ADDRESS_LINE_2) .add(ADDRESS3_KEY, ADDRESS_LINE_3) @@ -114,7 +114,7 @@ public static Optional getJsonAddress() { } public static Optional getJsonWelshAddress() { - return Optional.of(Json.createObjectBuilder() + return Optional.of(JsonObjects.createObjectBuilder() .add(WELSH_ADDRESS1_KEY, WELSH_ADDRESS_LINE_1) .add(WELSH_ADDRESS2_KEY, WELSH_ADDRESS_LINE_2) .add(WELSH_ADDRESS3_KEY, WELSH_ADDRESS_LINE_3) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java index 6e667614a6..c36aab51a2 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -70,16 +70,16 @@ public void shouldConvertCourtCentreByOffenceId() { final Address address = Address.address().withAddress1(ADDRESS_LINE_1).build(); final Address welshAddress = Address.address().withAddress1(WELSH_ADDRESS_LINE_1).build(); final UUID offenceId = randomUUID(); - JsonObject jsonObject = Json.createObjectBuilder() + JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("id", UUID.randomUUID().toString()) .add("name", "test") .build(); - final JsonObject sjpSessionPayload = Json.createObjectBuilder() + final JsonObject sjpSessionPayload = JsonObjects.createObjectBuilder() .add("courtHouseCode", UUID.randomUUID().toString()) .build(); - final Optional courtOptional = Optional.of(Json.createObjectBuilder() + final Optional courtOptional = Optional.of(JsonObjects.createObjectBuilder() .add("id", COURT_CENTRE_ID.toString()) .add("isWelsh", true) .add("oucode", COURT_CENTRE_CODE) @@ -119,16 +119,16 @@ public void shouldConvertCourtCentre() { final Address address = Address.address().withAddress1(ADDRESS_LINE_1).build(); final Address welshAddress = Address.address().withAddress1(WELSH_ADDRESS_LINE_1).build(); final UUID sjpSessionId = randomUUID(); - JsonObject jsonObject = Json.createObjectBuilder() + JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("id", UUID.randomUUID().toString()) .add("name", "test") .build(); - final JsonObject sjpSessionPayload = Json.createObjectBuilder() + final JsonObject sjpSessionPayload = JsonObjects.createObjectBuilder() .add("courtHouseCode", UUID.randomUUID().toString()) .build(); - final Optional courtOptional = Optional.of(Json.createObjectBuilder() + final Optional courtOptional = Optional.of(JsonObjects.createObjectBuilder() .add("id", COURT_CENTRE_ID.toString()) .add("isWelsh", true) .add("oucode", COURT_CENTRE_CODE) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java index a15a9a2b01..980492521d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java @@ -2,7 +2,7 @@ import static java.time.ZoneOffset.UTC; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java index bc25251416..ee1014714b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java @@ -13,7 +13,7 @@ import java.util.Optional; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -43,13 +43,13 @@ public void shouldConvertLJADetails() { public static JsonObject getSjpSessionPayload() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(LJA_CODE_KEY, LJA_CODE) .build(); } public static Optional getCourt() { - return Optional.of(Json.createObjectBuilder() + return Optional.of(JsonObjects.createObjectBuilder() .add(LJA_NAME_KEY, LJA_NAME) .add(LJA_WELSH_NAME_KEY, LJA_WELSH_NAME) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java index ce6ccb2f32..eed363f4b8 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java @@ -14,7 +14,7 @@ import uk.gov.justice.core.courts.ProsecutionCaseIdentifier; import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -39,8 +39,8 @@ public class ProsecutionCaseIdentifierConverterTest { public void shouldConvertProsecutionCaseIdentifierWithPoliceFlag() { - JsonArray value = Json.createArrayBuilder() - .add(Json.createObjectBuilder() + JsonArray value = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("policeFlag", true) .add("id", ID_2.toString()) .add("shortName", SHORT_NAME) @@ -49,7 +49,7 @@ public void shouldConvertProsecutionCaseIdentifierWithPoliceFlag() { ) .build(); - JsonObject jsonObject = Json.createObjectBuilder() + JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("prosecutors", value) .build(); @@ -68,8 +68,8 @@ public void shouldConvertProsecutionCaseIdentifierWithPoliceFlag() { public void shouldConvertProsecutionCaseIdentifierWithoutPoliceFlag() { - JsonArray value = Json.createArrayBuilder() - .add(Json.createObjectBuilder() + JsonArray value = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("policeFlag", false) .add("id", ID_2.toString()) .add("shortName", SHORT_NAME) @@ -78,7 +78,7 @@ public void shouldConvertProsecutionCaseIdentifierWithoutPoliceFlag() { ) .build(); - JsonObject jsonObject = Json.createObjectBuilder() + JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("prosecutors", value) .build(); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java index ed1ead4243..6186761b9b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java @@ -4,8 +4,8 @@ import static java.time.ZonedDateTime.now; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.apache.commons.lang3.RandomUtils.nextInt; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -45,7 +45,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonValue; @@ -113,7 +113,7 @@ public class ResultingToResultsConverterHelper { private static final UUID PROMPT2_ID = randomUUID(); private static final UUID PROMPT3_ID = randomUUID(); private static final UUID PROMPT4_ID = randomUUID(); - private static final Envelope emptyEnvelope = createEnvelope("...", Json.createObjectBuilder().build()); + private static final Envelope emptyEnvelope = createEnvelope("...", JsonObjects.createObjectBuilder().build()); public static PersonalDetails buildPersonalDetails() { return PersonalDetails.personalDetails() @@ -188,7 +188,7 @@ public static Envelope getCaseResults(final UUID resultDefinitionId final JsonArrayBuilder promptsBuilder = createArrayBuilder(); for (final Prompt prompt : prompts) { - promptsBuilder.add(Json.createObjectBuilder().add("id", prompt.getPromptDefinitionId().toString()).add("value", prompt.getValue())); + promptsBuilder.add(JsonObjects.createObjectBuilder().add("id", prompt.getPromptDefinitionId().toString()).add("value", prompt.getValue())); } final uk.gov.moj.cpp.sjp.domain.resulting.Offence offence1 = new uk.gov.moj.cpp.sjp.domain.resulting.Offence(OFFENCE_ID_1, null, null, null, asList(new Result(resultDefinitionId1, prompts))); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java index c1eecd8ed1..12aab81824 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java @@ -21,7 +21,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.collect.Lists; @@ -65,28 +65,28 @@ public void shouldConvertCaseDecision() { } private List allVerdictTypes() { - final JsonObject guiltyMagistratesJsonObject = Json.createObjectBuilder() + final JsonObject guiltyMagistratesJsonObject = JsonObjects.createObjectBuilder() .add(ID, ID_1.toString()) .add("verdictCode", "G") .add("category", RANDOM_TEXT_1) .add("categoryType", RANDOM_TEXT_2) .add("cjsVerdictCode", "GM") .add("jurisdiction", "MAGISTRATES").build(); - final JsonObject guiltyCrownJsonObject = Json.createObjectBuilder() + final JsonObject guiltyCrownJsonObject = JsonObjects.createObjectBuilder() .add(ID, UUID.randomUUID().toString()) .add("verdictCode", "G") .add("category", RANDOM_TEXT_1) .add("categoryType", RANDOM_TEXT_2) .add("cjsVerdictCode", "GC") .add("jurisdiction", "CROWN").build(); - final JsonObject nonGuiltyMagistratesJsonObject = Json.createObjectBuilder() + final JsonObject nonGuiltyMagistratesJsonObject = JsonObjects.createObjectBuilder() .add(ID, UUID.randomUUID().toString()) .add("verdictCode", "NG") .add("category", RANDOM_TEXT_1) .add("categoryType", RANDOM_TEXT_2) .add("cjsVerdictCode", "NGM") .add("jurisdiction", "MAGISTRATES").build(); - final JsonObject nonGuiltyCrownJsonObject = Json.createObjectBuilder() + final JsonObject nonGuiltyCrownJsonObject = JsonObjects.createObjectBuilder() .add(ID, UUID.randomUUID().toString()) .add("verdictCode", "NG") .add("category", RANDOM_TEXT_1) @@ -97,14 +97,14 @@ private List allVerdictTypes() { } private List allMagistrateJurisdictionTypeVerdictTypes() { - final JsonObject guiltyMagistratesJsonObject = Json.createObjectBuilder() + final JsonObject guiltyMagistratesJsonObject = JsonObjects.createObjectBuilder() .add(ID, ID_1.toString()) .add("verdictCode", "G") .add("category", RANDOM_TEXT_1) .add("categoryType", RANDOM_TEXT_2) .add("cjsVerdictCode", "GM") .add("jurisdiction", "MAGISTRATES").build(); - final JsonObject nonGuiltyMagistratesJsonObject = Json.createObjectBuilder() + final JsonObject nonGuiltyMagistratesJsonObject = JsonObjects.createObjectBuilder() .add(ID, UUID.randomUUID().toString()) .add("verdictCode", "NG") .add("category", RANDOM_TEXT_1) @@ -115,7 +115,7 @@ private List allMagistrateJurisdictionTypeVerdictTypes() { } public static Optional getVerdict() { - return Optional.of(Json.createObjectBuilder() + return Optional.of(JsonObjects.createObjectBuilder() .add(ID, ID_1.toString()) .add("category", RANDOM_TEXT_1) .add("categoryType", RANDOM_TEXT_2) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/BaseDecisionResultAggregatorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/BaseDecisionResultAggregatorTest.java index e49df2bd09..56400d5bd5 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/BaseDecisionResultAggregatorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/BaseDecisionResultAggregatorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.aggregator; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregatorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregatorTest.java index e5f71b6fdf..d549aca64e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregatorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregatorTest.java @@ -2,8 +2,8 @@ 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java index 75f493d047..a7364eb76a 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java @@ -2,8 +2,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java index d6ea783627..aad294793e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java @@ -3,8 +3,8 @@ 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.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; @@ -36,7 +36,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import com.google.common.collect.ImmutableMap; import org.hamcrest.CustomTypeSafeMatcher; @@ -82,7 +82,7 @@ public void shouldReturnLimitedListOfAssignmentCandidates() { final JsonEnvelope sourceCommand = envelopeFrom(metadataWithRandomUUID(SESSION_STARTED_EVENT), createObjectBuilder().build()); final JsonEnvelope assignmentCandidatesResponse = envelopeFrom(metadataWithRandomUUID(ASSIGNMENT_CANDIDATES_QUERY), createObjectBuilder() - .add("assignmentCandidates", Json.createArrayBuilder() + .add("assignmentCandidates", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("caseId", assignmentCandidate1.getCaseId().toString()) .add("caseStreamVersion", assignmentCandidate1.getCaseStreamVersion()) @@ -123,7 +123,7 @@ public void shouldReturnLimitedListOfAssignmentCandidatesWithoutProsecutors() { final JsonEnvelope sourceCommand = envelopeFrom(metadataWithRandomUUID(SESSION_STARTED_EVENT), createObjectBuilder().build()); final JsonEnvelope assignmentCandidatesResponse = envelopeFrom(metadataWithRandomUUID(ASSIGNMENT_CANDIDATES_QUERY), createObjectBuilder() - .add("assignmentCandidates", Json.createArrayBuilder() + .add("assignmentCandidates", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("caseId", assignmentCandidate1.getCaseId().toString()) .add("caseStreamVersion", assignmentCandidate1.getCaseStreamVersion()) @@ -161,7 +161,7 @@ public void shouldReturnEmptyListOfAssignmentCandidates() { final JsonEnvelope sourceCommand = envelopeFrom(metadataWithRandomUUID(SESSION_STARTED_EVENT), createObjectBuilder().build()); final JsonEnvelope assignmentCandidatesResponse = envelopeFrom(metadataWithRandomUUID(ASSIGNMENT_CANDIDATES_QUERY), createObjectBuilder() - .add("assignmentCandidates", Json.createArrayBuilder()) + .add("assignmentCandidates", JsonObjects.createArrayBuilder()) .build()); when(assignmentConfiguration.getAssignmentCandidatesLimit()).thenReturn(assignmentCandidatesLimit); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java index 5fa82ae1df..fff7447fbd 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java index a01f13687b..37b8ea916f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -47,7 +47,7 @@ public class MaterialServiceTest { @Test public void shouldReturnMaterialMetaData() { - final JsonObject responsePayload = createObjectBuilder().add("materialId", Json.createArrayBuilder()).build(); + final JsonObject responsePayload = createObjectBuilder().add("materialId", JsonObjects.createArrayBuilder()).build(); final JsonEnvelope queryResponse = envelopeFrom( metadataWithRandomUUID("material.query.material-metadata"), responsePayload); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java index 7aeba5b546..d9141660d6 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java @@ -3,8 +3,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java index 24d01835b9..f643e501db 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java index e6ef038894..1c9d7d2f1a 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java @@ -4,8 +4,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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -37,7 +37,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -377,7 +377,7 @@ private JsonEnvelope enforcementAreaQueryByNationalCourtCode(final String localJ } private static JsonObject newEnforcementArea() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(ACCOUNT_DIVISION_CODE, "100") .add(ENFORCING_COURT_CODE, "1000") .add(NATIONAL_PAYMENT_PHONE, "030 0790 9901") diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java index ae3208addd..d5e248b0a4 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java index 7354d4efe4..8319142416 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java index 88b9fff590..20c8881a2e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java @@ -5,7 +5,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java index e5f0107431..4c73349f2b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service.notificationnotify; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java index be879e1ca9..dad0605cad 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java index b11eb0dc86..b30c92193e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java @@ -3,7 +3,7 @@ import static java.time.ZonedDateTime.now; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; @@ -31,7 +31,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -140,7 +140,7 @@ private JsonObject constructReferralReasonObject(){ final String subReason = "No need for defendant to attend"; final String welshSubReason = "Diffynnydd i fynychu"; - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("id", id.toString()) .add("seqId", seqId) .add("hearingCode", hearingCode) diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.java index 698f036242..8b96ad6ba3 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java index 16d3ba16da..c70ce8c9c6 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java @@ -2,7 +2,7 @@ import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java index bf449e6625..d4de6b37c7 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java @@ -2,8 +2,8 @@ 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.moj.cpp.sjp.domain.disability.DisabilityNeeds.disabilityNeedsOf; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java index 29cffc0212..5966cb0e01 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java @@ -7,8 +7,8 @@ import static java.util.Objects.nonNull; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java index afb5efe45f..fe2f382576 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java @@ -3,7 +3,7 @@ import static com.google.common.collect.Lists.newArrayList; import static java.lang.String.format; import static java.util.Collections.singletonList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java index cf84d2973e..09c82ca1db 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResultStatusResolverTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResultStatusResolverTest.java new file mode 100644 index 0000000000..a5d8cbf60a --- /dev/null +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/ApplicationResultStatusResolverTest.java @@ -0,0 +1,117 @@ +package uk.gov.moj.cpp.sjp.event.processor.utils; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus; + +import java.util.UUID; +import java.util.stream.Stream; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_ABANDONED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_ALLOWED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_DISMISSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_REFUSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.APPEAL_WITHDRAWN; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.REOPENING_GRANTED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.REOPENING_REFUSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.REOPENING_WITHDRAWN; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.STATUTORY_DECLARATION_GRANTED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.STATUTORY_DECLARATION_REFUSED; +import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.STATUTORY_DECLARATION_WITHDRAWN; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AACA; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AACD; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AASA; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AASD; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.ACSD; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.APA; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.AW; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.DISM; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.G; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.RFSD; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.ROPENED; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.STDEC; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.WDRN; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP; +import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPLICATION_TO_REOPEN_CASE; + +class ApplicationResultStatusResolverTest { + + private static Stream statdecApplicationTypes() { + return Stream.of(Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, G, STATUTORY_DECLARATION_GRANTED), + Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, STDEC, STATUTORY_DECLARATION_GRANTED), + Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, RFSD, STATUTORY_DECLARATION_REFUSED), + Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP, WDRN, STATUTORY_DECLARATION_WITHDRAWN), + Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, G, STATUTORY_DECLARATION_GRANTED), + Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, STDEC, STATUTORY_DECLARATION_GRANTED), + Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, RFSD, STATUTORY_DECLARATION_REFUSED), + Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_OTHER_THAN_SJP, WDRN, STATUTORY_DECLARATION_WITHDRAWN)); + } + + private static Stream reopenApplicationTypes() { + return Stream.of(Arguments.of(APPLICATION_TO_REOPEN_CASE, G, REOPENING_GRANTED), + Arguments.of(APPLICATION_TO_REOPEN_CASE, ROPENED, REOPENING_GRANTED), + Arguments.of(APPLICATION_TO_REOPEN_CASE, RFSD, REOPENING_REFUSED), + Arguments.of(APPLICATION_TO_REOPEN_CASE, WDRN, REOPENING_WITHDRAWN)); + } + + private static Stream appealApplicationTypes() { + return Stream.of(Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACA, APPEAL_ALLOWED), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASA, APPEAL_ALLOWED), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, ACSD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, DISM, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, WDRN, APPEAL_WITHDRAWN), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AW, APPEAL_WITHDRAWN), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, RFSD, APPEAL_REFUSED), + Arguments.of(APPEAL_AGAINST_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, APA, APPEAL_ABANDONED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACA, APPEAL_ALLOWED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASA, APPEAL_ALLOWED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AACD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AASD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, ACSD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, DISM, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, WDRN, APPEAL_WITHDRAWN), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, AW, APPEAL_WITHDRAWN), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, RFSD, APPEAL_REFUSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_AND_SENTENCE_BY_MAGISTRATE_TO_CROWN_COURT, APA, APPEAL_ABANDONED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AACA, APPEAL_ALLOWED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AASA, APPEAL_ALLOWED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AACD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AASD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, ACSD, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, DISM, APPEAL_DISMISSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, WDRN, APPEAL_WITHDRAWN), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, AW, APPEAL_WITHDRAWN), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, RFSD, APPEAL_REFUSED), + Arguments.of(APPEAL_AGAINST_CONVICTION_BY_MAGISTRATE_TO_CROWN_COURT, APA, APPEAL_ABANDONED)); + } + + @ParameterizedTest() + @MethodSource("statdecApplicationTypes") + void testApplicationStatusForStatDecApplications(SjpApplicationTypes applicationType, ApplicationResult applicationResult, ApplicationStatus expectedApplicationStatus) { + + assertThat(ApplicationResultStatusResolver.getApplicationStatus(applicationType.getApplicationType(), UUID.fromString(applicationResult.getResultId()), applicationType.getApplicationCode()), is(expectedApplicationStatus.toString())); + } + + @ParameterizedTest() + @MethodSource("reopenApplicationTypes") + void testApplicationStatusForReopenApplications(SjpApplicationTypes applicationType, ApplicationResult applicationResult, ApplicationStatus expectedApplicationStatus) { + + assertThat(ApplicationResultStatusResolver.getApplicationStatus(applicationType.getApplicationType(), UUID.fromString(applicationResult.getResultId()), applicationType.getApplicationCode()), is(expectedApplicationStatus.toString())); + } + + @ParameterizedTest() + @MethodSource("appealApplicationTypes") + void testApplicationStatusForAppealApplications(SjpApplicationTypes applicationType, ApplicationResult applicationResult, ApplicationStatus expectedApplicationStatus) { + + assertThat(ApplicationResultStatusResolver.getApplicationStatus(applicationType.getApplicationType(), UUID.fromString(applicationResult.getResultId()), applicationType.getApplicationCode()), is(expectedApplicationStatus.toString())); + } +} diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java index 7c7efe3509..89bec9c34b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java @@ -6,7 +6,7 @@ import java.nio.charset.Charset; import java.util.Map; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -38,7 +38,7 @@ public static String getFileContent(final String path, final Map } public static JsonObject getFileContentAsJson(final String path, final Map namedPlaceholders) { - try (final JsonReader reader = Json.createReader(new StringReader(getFileContent(path, namedPlaceholders)))) { + try (final JsonReader reader = JsonObjects.createReader(new StringReader(getFileContent(path, namedPlaceholders)))) { return reader.readObject(); } } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/Framework5Fix.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/Framework5Fix.java index d7f93115ac..2c1bccddc0 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/Framework5Fix.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/Framework5Fix.java @@ -10,7 +10,7 @@ import java.io.StringReader; import java.util.List; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import com.fasterxml.jackson.core.JsonProcessingException; @@ -40,7 +40,7 @@ public static JsonEnvelope toJsonEnvelope(Object env) { } catch (JsonProcessingException ex) { throw new RuntimeException(ex.getMessage(), ex); } - return defaultJsonEnvelopeProvider.envelopeFrom(e.metadata(), Json.createReader(new StringReader(jsonString)).readObject()); + return defaultJsonEnvelopeProvider.envelopeFrom(e.metadata(), JsonObjects.createReader(new StringReader(jsonString)).readObject()); } else { throw new IllegalArgumentException("don't know how to convert this"); } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java index 77a217a844..014de79161 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.utils; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java index 33f0391d86..16a1a5bdb6 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java @@ -2,7 +2,7 @@ import static java.util.Objects.isNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java index 90a492baf0..223be0985a 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java @@ -2,7 +2,7 @@ import static java.util.Objects.isNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory; diff --git a/sjp-healthchecks/pom.xml b/sjp-healthchecks/pom.xml index 36a7d315d0..28eed83d8e 100644 --- a/sjp-healthchecks/pom.xml +++ b/sjp-healthchecks/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-integration-test/pom.xml b/sjp-integration-test/pom.xml index 3ea5074eb9..ff8ca3ac0b 100644 --- a/sjp-integration-test/pom.xml +++ b/sjp-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java index d80ee7c9a1..dd77690dcf 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java @@ -5,14 +5,14 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; public class AddDatesToAvoid { public static void addDatesToAvoid(final UUID caseId, final String datesToAvoid) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("datesToAvoid", datesToAvoid) .build(); diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java index 17e438bf1d..514283c0e1 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java @@ -27,8 +27,8 @@ import static java.util.Objects.requireNonNull; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static uk.gov.moj.sjp.it.Constants.DEFAULT_OFFENCE_CODE; import static uk.gov.moj.sjp.it.util.HttpClientUtil.getPostCallResponse; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java index b0629603b5..7f26208e89 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java @@ -1,7 +1,7 @@ package uk.gov.moj.sjp.it.command; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.util.HttpClientUtil.getPostCallResponse; import static uk.gov.moj.sjp.it.util.HttpClientUtil.makePostCall; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java index 6436823a9d..a50280e376 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java @@ -3,7 +3,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.awaitility.Awaitility.await; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java index aed3da143f..a4b1155b41 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java @@ -2,7 +2,7 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static uk.gov.moj.sjp.it.util.FileUtil.getFileContentAsJson; import static uk.gov.moj.sjp.it.util.HttpClientUtil.makePostCall; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java index 0305d667d4..74a8c59cd6 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.not; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java index eaffe3546d..64d374b73b 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.sjp.it.helper; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DatesToAvoidHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DatesToAvoidHelper.java index ea04097d1b..fe7290bf04 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DatesToAvoidHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DatesToAvoidHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.sjp.it.helper; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java index f687ce98e3..03796059cd 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java @@ -6,7 +6,7 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java index f7654c14c6..c996f48ee7 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.sjp.it.helper; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.moj.sjp.it.Constants.PUBLIC_EVENT_SELECTOR_DELETE_CASE_DOCUMENT_REQUEST_ACCEPTED; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java index bf1ea7ae8b..74336143c3 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java @@ -6,7 +6,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java index 92b8a3b6dc..164cf4a34b 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.sjp.it.helper; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost; import static uk.gov.moj.sjp.it.util.FileUtil.getPayloadAsInputStream; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java index d1fdac7276..62c0e199ff 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java @@ -5,8 +5,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java index 9f75a2b8ad..59d2a0577c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java @@ -34,7 +34,7 @@ import javax.jms.JMSException; import javax.jms.MessageConsumer; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -145,7 +145,7 @@ public void pleadOnlinePublicEvent(final JsonObject payload){ final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() .getMessageProducerClient(); - final JsonObject publicEvent = Json.createObjectBuilder(payload) + final JsonObject publicEvent = JsonObjects.createObjectBuilder(payload) .add("caseId", caseId.toString()) .add("defendantId", defendantId.toString()) .build(); diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java index 122f340d98..6b3b15fbe9 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java @@ -1,8 +1,8 @@ package uk.gov.moj.sjp.it.helper; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java index 9fd026dbb2..ded56f939c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java @@ -3,8 +3,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; import static java.util.Arrays.stream; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder.withDefaults; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java index 55fdfad55a..d625f3e483 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.sjp.it.helper; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.moj.sjp.it.util.HttpClientUtil; import uk.gov.moj.sjp.it.util.TopicUtil; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java index 45d8361f42..7e00e6082d 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java @@ -13,7 +13,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -27,9 +27,9 @@ public static void stubGetEmptyAssignmentsByDomainObjectId(final UUID caseId) { } public static void stubGetAssignmentsByDomainObjectId(final UUID caseId, final Optional assignmentNature, final UUID... assignees) { - final JsonArrayBuilder assignments = Json.createArrayBuilder(); + final JsonArrayBuilder assignments = JsonObjects.createArrayBuilder(); for (final UUID assignee : assignees) { - final JsonObjectBuilder assignment = Json.createObjectBuilder() + final JsonObjectBuilder assignment = JsonObjects.createObjectBuilder() .add("id", UUID.randomUUID().toString()) .add("version", 2) .add("domainObjectId", caseId.toString()) @@ -38,7 +38,7 @@ public static void stubGetAssignmentsByDomainObjectId(final UUID caseId, final O assignments.add(assignment); } - final JsonObject payload = Json.createObjectBuilder().add("assignments", assignments).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("assignments", assignments).build(); stubFor(get(urlPathEqualTo(ASSIGNMENTS_QUERY_URL)) .withQueryParam("domainObjectId", equalTo(caseId.toString())) diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java index 1adaf2a451..ebbec6b32d 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java @@ -6,13 +6,13 @@ 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.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.OK; import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; @@ -57,7 +57,7 @@ public static void stubForIdMapperSuccess(final Response.Status status) { } public static void stubAddMapping() { - stubFor(post(urlPathMatching("/system-id-mapper-api/rest/systemid/mappings.*")).willReturn(WireMock.aResponse().withStatus(200).withHeader("CPPID", UUID.randomUUID().toString()).withBody(Json.createObjectBuilder().add("id", UUID.randomUUID().toString()).add("code", "OK").build().toString()))); + stubFor(post(urlPathMatching("/system-id-mapper-api/rest/systemid/mappings.*")).willReturn(WireMock.aResponse().withStatus(200).withHeader("CPPID", UUID.randomUUID().toString()).withBody(JsonObjects.createObjectBuilder().add("id", UUID.randomUUID().toString()).add("code", "OK").build().toString()))); } } \ No newline at end of file diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java index a2882ba31e..253f4e5aca 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java @@ -13,7 +13,7 @@ import static java.lang.String.format; import static java.util.Optional.empty; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_ACCEPTED; @@ -36,7 +36,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.github.tomakehurst.wiremock.verification.LoggedRequest; @@ -90,7 +90,7 @@ public static UUID processMaterialAddedCommand(final UUID documentReference) { } public static void stubMaterialMetadata(final UUID materialId, final String fileName, final String mimeType, final ZonedDateTime addedAt) { - final JsonObject metadata = Json.createObjectBuilder() + final JsonObject metadata = JsonObjects.createObjectBuilder() .add("materialId", materialId.toString()) .add("fileName", fileName) .add("mimeType", mimeType) diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java index 32c88e2fe9..5ec95790ff 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java @@ -8,7 +8,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java index 6208b8ffa7..5c999b2845 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java @@ -9,8 +9,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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; @@ -36,7 +36,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -285,7 +285,7 @@ public static void stubWithdrawalReasonsQuery(final UUID withdrawalReasonId, fin public static void stubWithdrawalReasonsQuery(final Map withdrawalReasons) { final JsonArray withdrawalReasonsArray = withdrawalReasons.entrySet().stream() .map(e -> createObjectBuilder().add("id", e.getKey().toString()).add("reasonCodeDescription", e.getValue())) - .reduce(Json.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add).build(); + .reduce(JsonObjects.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add).build(); final JsonObject response = createObjectBuilder().add("offenceWithdrawRequestReasons", withdrawalReasonsArray).build(); diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java index bb53b038df..8af58c7826 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -66,7 +66,7 @@ public static void stubForUserDetails(final User user, final String prosecutingA } public static JsonObject stubForUserDetails(final UUID userId, final String firstName, final String lastName, final String prosecutingAuthority) { - final JsonObjectBuilder userDetailsBuilder = Json.createObjectBuilder() + final JsonObjectBuilder userDetailsBuilder = JsonObjects.createObjectBuilder() .add("userId", userId.toString()) .add("firstName", firstName) .add("lastName", lastName) diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java index c1aae4a0fe..a9d49543a5 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java @@ -5,8 +5,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java index 1fbc73a3ec..dc8ae5b79c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java @@ -10,7 +10,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java index 684edf0aa9..d6fc0c99a4 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java @@ -4,7 +4,7 @@ import static java.time.LocalDate.now; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java index fd42e5edb7..e5187cfe35 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java @@ -3,8 +3,8 @@ import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java index 82e6470e03..5e88c9aff7 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java @@ -10,7 +10,7 @@ import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.of; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static uk.gov.justice.core.courts.CourtCentre.courtCentre; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java index 1a70ccc747..3093a994ff 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java @@ -7,7 +7,7 @@ import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.BAD_REQUEST; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.equalTo; @@ -52,7 +52,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -579,7 +579,7 @@ private CreateCase.CreateCasePayloadBuilder createMultiOffenceCaseWithDvlaAttrib .withDefendantId(randomUUID()); } private JsonObject responseToJsonObject(String response) { - return Json.createReader(new StringReader(response)).readObject(); + return JsonObjects.createReader(new StringReader(response)).readObject(); } private static void verifyOffenceCode(final UUID caseId, final String offenceCode2) { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java index 8c508398fd..607e276163 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java @@ -45,7 +45,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.core.Response; @@ -275,7 +275,7 @@ private JsonObject getUpdatedDefendantDetails(UUID userUid) { userUid); assertThat(response.getStatus(), equalTo(Response.Status.OK.getStatusCode())); - return Json.createReader(new StringReader(response.readEntity(String.class))).readObject(); + return JsonObjects.createReader(new StringReader(response.readEntity(String.class))).readObject(); } private JsonObject getUpdatedDefendantDetails(UUID userUid, String prosecutingAuhority) { @@ -285,10 +285,10 @@ private JsonObject getUpdatedDefendantDetails(UUID userUid, String prosecutingAu userUid); assertThat(response.getStatus(), equalTo(Response.Status.OK.getStatusCode())); - return Json.createReader(new StringReader(response.readEntity(String.class))).readObject(); + return JsonObjects.createReader(new StringReader(response.readEntity(String.class))).readObject(); } private JsonObject responseToJsonObject(String response) { - return Json.createReader(new StringReader(response)).readObject(); + return JsonObjects.createReader(new StringReader(response)).readObject(); } } diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java index 243954fea3..2be6dc1998 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -111,6 +111,6 @@ private CreateCase.CreateCasePayloadBuilder createCase(UUID caseId, } private JsonObject responseToJsonObject(String response) { - return Json.createReader(new StringReader(response)).readObject(); + return JsonObjects.createReader(new StringReader(response)).readObject(); } } diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java index a874ed21d6..85e16489a8 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singleton; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.moj.cpp.sjp.domain.IncomeFrequency.MONTHLY; @@ -37,7 +37,7 @@ import java.util.Set; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import javax.ws.rs.core.Response; @@ -175,7 +175,7 @@ private void defendantRaisesOnlinePlea(final UUID caseId, final String defendant private void verifyEmployerDataExist(final UUID caseId, final String defendantId, final JSONObject pleaPayload) { final JSONObject jsonObject = pleaPayload.getJSONObject("employer"); - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObject.toString()))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObject.toString()))) { JsonObject employer1 = jsonReader.readObject(); EmployerHelper.pollForEmployerForDefendant(defendantId, getEmployerUpdatedPayloadMatcher(employer1)); } diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java index deb0124467..7ca5ebc3c5 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java @@ -74,7 +74,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.ws.rs.core.Response; @@ -331,7 +331,7 @@ private void assertEmailSubject(final JsonObject notification) { } public String addFinancialImposition(final UUID caseId, final UUID defendantId, final Response.Status status) { - final JsonObjectBuilder payload = Json.createObjectBuilder(); + final JsonObjectBuilder payload = JsonObjects.createObjectBuilder(); payload.add("correlationId", caseId.toString()) .add("accountNumber", "12345678"); diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java index 0ec012931f..cb341f1a4c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java @@ -13,7 +13,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeAll; @@ -46,7 +46,7 @@ public static void init() { @Test public void shouldFindCaseByUrnAndPostcode() { - final JsonObject expected = Json.createReader(getClass().getResourceAsStream("/GetCaseByUrnAndPostcodeIT/expected.json")).readObject(); + final JsonObject expected = JsonObjects.createReader(getClass().getResourceAsStream("/GetCaseByUrnAndPostcodeIT/expected.json")).readObject(); citizenHelper.verifyCaseByPersonUrnAndPostcode(expected, urn, POSTCODE); } diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java index 5a1f83a1ef..8a6e0076e0 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java @@ -34,7 +34,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -55,7 +55,7 @@ public class GetCaseDocumentIT extends BaseIntegrationTest { private final String mimeType = "application/json"; private final String documentType = "OTHER-Test"; private final String documentUrl = "http://documentlocation.com/myfile.pdf"; - private final JsonObject expectedResponse = Json.createObjectBuilder().add("url", documentUrl).build(); + private final JsonObject expectedResponse = JsonObjects.createObjectBuilder().add("url", documentUrl).build(); private final ZonedDateTime addedAt = ZonedDateTime.now(); private static final String NATIONAL_COURT_CODE = "1080"; private final StringToJsonObjectConverter stringToJsonObjectConverter = new StringToJsonObjectConverter(); diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java index 2bbf0271c9..f83e1d320e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java @@ -5,6 +5,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; @@ -83,7 +84,6 @@ import com.google.common.collect.Sets; import org.awaitility.Awaitility; import org.hamcrest.Matcher; -import org.json.JSONObject; import org.junit.jupiter.api.Test; public class NotificationToDvlaToRemoveEndorsementsIT extends BaseIntegrationTest { @@ -119,19 +119,8 @@ public void shouldRequestPdfEmailAttachmentGenerationViaSystemDocGeneratorAndSen "CASE_ID", "7242d476-9ca3-454a-93ee-78bf148602bf"); stubAddMapping(); - final JSONObject generationRequests = pollSysDocGenerationRequests(hasSize(1)).get(0); - assertSysDocRequest(applicationDecisionId, generationRequests); - - final UUID documentFileServiceId = randomUUID(); - final UUID sourceCorrelationId = fromString(applicationDecisionId); - sendSysDocGeneratorDocumentAvailablePublicEvent( - sourceCorrelationId, documentFileServiceId - ); - - final JsonObject notification = verifyNotification(sourceCorrelationId, dvlaEmailAddress); - assertEmailSubject(notification); - - assertStatusUpdatedInViewstore(sourceCorrelationId, documentFileServiceId, QUEUED); + // No new ENDORSEMENT_REMOVAL_NOTIFICATION are generated https://tools.hmcts.net/jira/browse/DD-42331 + assertThat(pollSysDocGenerationRequests(hasSize(1)).isEmpty(), is(true)); } @Test @@ -302,14 +291,6 @@ private void pollUntil(final Callable function, final Matcher .until(function, matcher); } - private void assertSysDocRequest(final String applicationDecisionId, final JSONObject generationRequests) { - assertThat(generationRequests.getString("originatingSource"), equalTo("sjp")); - assertThat(generationRequests.getString("sourceCorrelationId"), equalTo(applicationDecisionId)); - assertThat(generationRequests.getString("templateIdentifier"), equalTo(NOTIFICATION_TO_DVLA_TO_REMOVE_ENDORSEMENT.getValue())); - assertThat(generationRequests.getString("conversionFormat"), is("pdf")); - assertThat(generationRequests.has("payloadFileServiceId"), is(true)); - } - private void assertEmailSubject(final JsonObject notification) { final EndorsementRemovalNotificationEmailSubject subject = new EndorsementRemovalNotificationEmailSubject(NATIONAL_COURT_NAME, createCasePayloadBuilder.getDefendantBuilder().getFirstName(), diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java index 9fdf2e0482..bf2fbed8ac 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java @@ -10,8 +10,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.createObjectBuilder; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static javax.ws.rs.core.Response.Status.OK; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.apache.commons.lang3.RandomUtils.nextInt; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java index a119cfa976..26b3b4a5c8 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java @@ -7,7 +7,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java index ed920b060d..0d095d9b13 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java @@ -5,7 +5,7 @@ import static java.time.Month.JULY; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java index 8369978604..654939518e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java @@ -21,7 +21,7 @@ import java.time.ZoneOffset; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -100,7 +100,7 @@ private CreateCase.CreateCasePayloadBuilder createCase() { private static CaseDocumentHelper createResultOrder(final UUID caseId) { CaseDocumentHelper caseDocumentHelper = new CaseDocumentHelper(caseId); caseDocumentHelper.addCaseDocument( - Json.createObjectBuilder().add("id", caseDocumentHelper.getDocumentId()) + JsonObjects.createObjectBuilder().add("id", caseDocumentHelper.getDocumentId()) .add("materialId", UUID.randomUUID().toString()) .add("documentType", "RESULT_ORDER").build().toString()); return caseDocumentHelper; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java index f2bd1f6e4c..f59625d7c2 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java @@ -7,7 +7,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java index 60d777faea..de3b223adb 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java @@ -4,7 +4,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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java index f166ab71bd..ac8c6b2358 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java @@ -5,7 +5,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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java index 23ceb9ffc8..cbba86f392 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.sjp.it.test.ingestor.helper; import static java.util.UUID.randomUUID; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java index fcdd072edc..ab14877186 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java @@ -2,7 +2,7 @@ import static java.util.Optional.empty; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.equalTo; @@ -21,7 +21,7 @@ import java.util.UUID; import java.util.stream.IntStream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; @@ -102,7 +102,7 @@ private static JsonObject getTimerJobs(final String processInstanceId) { private static void executeJob(final String jobId) { final String url = ACTIVITI_BASE_PATH + "management/jobs/" + jobId; - sendPostRequest(url, Json.createObjectBuilder().add("action", "execute").build()); + sendPostRequest(url, JsonObjects.createObjectBuilder().add("action", "execute").build()); } private static Response sendPostRequest(final String url, final JsonObject payload) { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java index c36f0929da..36ebe46f30 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.greaterThan; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java index d74d8e0f6e..aee7041fd2 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java @@ -13,7 +13,7 @@ import java.io.UncheckedIOException; import java.util.List; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -30,7 +30,7 @@ public class JsonHelper { private static final Logger LOGGER = LoggerFactory.getLogger(JsonHelper.class); public static JsonObject getJsonObject(final String json) { - try (final JsonReader reader = Json.createReader(new StringReader(json))) { + try (final JsonReader reader = JsonObjects.createReader(new StringReader(json))) { return reader.readObject(); } } diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java index d4dcb3ee79..8defe3dd30 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.sjp.it.util; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClient; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java index 7490f66121..885b6cf907 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java @@ -23,7 +23,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import io.restassured.path.json.JsonPath; @@ -101,7 +101,7 @@ public static Optional retrieveMessage(final MessageConsumer consumer, public static Optional retrieveMessageAsJsonObject(final MessageConsumer consumer) { return ifPresent(retrieveMessageAsString(consumer, RETRIEVE_TIMEOUT), - (x) -> Optional.of(Json.createReader(new StringReader(x)).readObject()) + (x) -> Optional.of(JsonObjects.createReader(new StringReader(x)).readObject()) ).orElse(Optional::empty); } diff --git a/sjp-json/pom.xml b/sjp-json/pom.xml index 2eb325889e..725e28fa5d 100644 --- a/sjp-json/pom.xml +++ b/sjp-json/pom.xml @@ -2,7 +2,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-query/pom.xml b/sjp-query/pom.xml index 7bbb0ceee2..928ee0f78e 100644 --- a/sjp-query/pom.xml +++ b/sjp-query/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-api/pom.xml b/sjp-query/sjp-query-api/pom.xml index 02637b0dbb..21982fd20d 100644 --- a/sjp-query/sjp-query-api/pom.xml +++ b/sjp-query/sjp-query-api/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java index 2d53d01563..0217ae1ae0 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static javax.ws.rs.core.Response.Status.NOT_FOUND; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java index 4953ba4e1e..8cb3ddbf09 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java @@ -2,7 +2,7 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static javax.ws.rs.core.Response.Status.OK; @@ -23,7 +23,7 @@ import javax.ejb.Stateless; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.WebApplicationException; @@ -87,7 +87,7 @@ private Response getDocumentContent(final JsonEnvelope document) { if (OK.equals(documentContentResponseStatus)) { final String url = documentContentResponse.readEntity(String.class); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("url", url) .build(); diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java index 236b0e6122..30bef7fbf6 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java index c8e2d7bcd0..0337ab9a17 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java index 42d9f2ebc9..1aed894b99 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.api; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.query.api.helper.JsonHelper.getPayload; import uk.gov.justice.services.core.annotation.Component; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java index 7b82a021e3..423d4fa977 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.api; import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java index f7c7c23a61..5224f856e6 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.converter; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -10,7 +10,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonNumber; @@ -51,7 +51,7 @@ private JsonObject buildDefendant(final JsonEnvelope query, final JsonObject cas } private JsonArray buildOffencesArray(final JsonEnvelope query, final JsonArray offences) { - final JsonArrayBuilder builder = Json.createArrayBuilder(); + final JsonArrayBuilder builder = JsonObjects.createArrayBuilder(); offences.getValuesAs(JsonObject.class) .stream() .map(offence -> buildOffenceObject(query, offence)) @@ -69,7 +69,7 @@ private JsonObject buildOffenceObject(final JsonEnvelope query, final JsonObject final JsonNumber aocpStandardPenalty = offence.getJsonNumber("aocpStandardPenalty"); - final JsonObjectBuilder builder = Json.createObjectBuilder() + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder() .add("id", offence.getString("id")) .add("wording", offence.getString("wording")) .add("pendingWithdrawal", offence.getBoolean("pendingWithdrawal", false)) diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java index 91d03a829d..f8e6e75bbf 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java @@ -9,7 +9,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -35,7 +35,7 @@ public JsonObject decorateWithLegalAdviserName(final JsonObject caseView, final private JsonArray decorateDecisions(final JsonArray decisions, final JsonEnvelope envelope) { - final JsonArrayBuilder decisionsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder decisionsBuilder = JsonObjects.createArrayBuilder(); decisions.getValuesAs(JsonObject.class).forEach(decision -> { @@ -59,7 +59,7 @@ private JsonObject decorateSession(final JsonObject session, final JsonEnvelope legalAdviserUserId, envelope); return createObjectBuilder(session) - .add("legalAdviser", Json.createObjectBuilder() + .add("legalAdviser", JsonObjects.createObjectBuilder() .add("id", legalAdviserUserId.toString()) .add("firstName", legalAdviserDetails.getString("firstName")) .add("lastName", legalAdviserDetails.getString("lastName")) diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java index b0fdca48df..96f9a47175 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java @@ -13,7 +13,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -60,7 +60,7 @@ public JsonObject decorateDocumentsForACase(final JsonObject caseJson, final Jso .getValuesAs(JsonObject.class) .stream() .map(caseDocument -> this.decorateDocumentPayload(caseDocument, requestEnvelope)) - .reduce(Json.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add); + .reduce(JsonObjects.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add); objectBuilder.add("caseDocuments", caseDocumentsDecorated); return objectBuilder.build(); diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java index 69b991ae7e..832965116d 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java @@ -12,7 +12,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -33,7 +33,7 @@ public JsonObject decorate(final JsonObject caseView, final JsonEnvelope envelop final JsonArray caseDecisions = originalDecisions.getValuesAs(JsonObject.class).stream() .map(decision -> decorateDecision(decision, envelope, withdrawalReasons)) - .reduce(Json.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add) + .reduce(JsonObjects.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add) .build(); return JsonObjects.createObjectBuilder(caseView).add("caseDecisions", caseDecisions).build(); @@ -44,7 +44,7 @@ private JsonObject decorateDecision(final JsonObject decision, final JsonEnvelop final JsonArray offenceDecisions = decision.getJsonArray("offenceDecisions").getValuesAs(JsonObject.class).stream() .map(offenceDecision -> decorateOffenceDecision(offenceDecision, referralReasons, withdrawalReasons)) - .reduce(Json.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add) + .reduce(JsonObjects.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add) .build(); return JsonObjects.createObjectBuilder(decision).add("offenceDecisions", offenceDecisions).build(); diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java index c008c4f35c..0db66cd4b1 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java index aff03a0ee8..63104195a6 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.api.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.moj.cpp.sjp.query.api.helper.JsonHelper.getPayload; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java index bb5dd0ef3f..c20a181498 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class ReferenceOffencesDataService { @@ -23,7 +23,7 @@ public class ReferenceOffencesDataService { public JsonObject getOffenceReferenceData(final JsonEnvelope envelope, final String offenceCode, final String date) { final JsonEnvelope request = enveloper .withMetadataFrom(envelope, "referencedataoffences.query.offences-list") - .apply(Json.createObjectBuilder() + .apply(JsonObjects.createObjectBuilder() .add("cjsoffencecode", offenceCode) .add("date", date) .build()); @@ -34,7 +34,7 @@ public JsonObject getOffenceReferenceData(final JsonEnvelope envelope, final Str public JsonObject getOffenceReferenceDataByOffenceId(final JsonEnvelope envelope, final String offenceId) { final JsonEnvelope request = enveloper .withMetadataFrom(envelope, "referencedataoffences.query.offence") - .apply(Json.createObjectBuilder() + .apply(JsonObjects.createObjectBuilder() .add("offenceId", offenceId) .build()); final JsonEnvelope response = requester.request(request); diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java index 27f700794c..c412051772 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.service; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.moj.cpp.sjp.domain.decision.DecisionType; import uk.gov.moj.cpp.sjp.domain.plea.PleaType; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java index 3b7c00dccf..da2f4debe8 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java index 90ed2c8e4c..7a1f0ed034 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java @@ -11,7 +11,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -26,7 +26,7 @@ public class UsersGroupsService { public JsonObject getUserDetails(final UUID userId, final JsonEnvelope envelope) { - final JsonObject payload = Json.createObjectBuilder().add("userId", userId.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("userId", userId.toString()).build(); final JsonEnvelope request = enveloper.withMetadataFrom(envelope, "usersgroups.get-user-details").apply(payload); final JsonEnvelope response = requester.requestAsAdmin(request); if (JsonValue.NULL.equals(response.payload())) { diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java index 96202ca4b9..665dfcf882 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java @@ -31,7 +31,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -133,7 +133,7 @@ private void verifyInterceptorChainExecution() { } private Optional buildMockCourtData() { - return Optional.of(Json.createReader(getClass().getClassLoader(). + return Optional.of(JsonObjects.createReader(getClass().getClassLoader(). getResourceAsStream("uk/gov/moj/cpp/sjp/query/court-extract/case-court-extract-data.json")). readObject()); } diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java index ddb70f374a..82bc2a12aa 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_OK; @@ -33,7 +33,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.core.MultivaluedHashMap; @@ -87,7 +87,7 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocument() { final MultivaluedMap headers = new MultivaluedHashMap(ImmutableMap.of(CONTENT_TYPE, JSON_CONTENT_TYPE)); - final JsonObject json = Json.createObjectBuilder() + final JsonObject json = JsonObjects.createObjectBuilder() .add("url", documentUrl) .build(); diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java index 7200fdb09e..61ae5b7310 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java index b7b0a81726..8d0e7b05ee 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.api; import static java.time.ZonedDateTime.now; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java index f65cae92b7..291f4e826d 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java @@ -35,7 +35,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -146,7 +146,7 @@ private JsonEnvelope documentMetadataQuery(final UUID caseId, final UUID documen } private static JsonEnvelope documentDetails(final UUID documentId, final UUID materialId) { - final JsonObject caseDocument = Json.createObjectBuilder() + final JsonObject caseDocument = JsonObjects.createObjectBuilder() .add("id", documentId.toString()) .add("materialId", materialId.toString()) .add("documentType", "OTHER-Travelcard") diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java index 7c10ad4833..e361f6dd0b 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java @@ -22,7 +22,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java index 28fe88f833..c75a774811 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java index 590df1db82..fe004b4dc2 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.api; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java index 79ca163727..0d7f77247a 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.when; @@ -12,7 +12,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -90,7 +90,7 @@ private JsonObject buildLegalAdviserDetails() { private JsonObject buildCaseWithDecisionSession(final JsonObject session) { return createObjectBuilder() .add("id", CASE_ID) - .add("caseDecisions", Json.createArrayBuilder() + .add("caseDecisions", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("id", DECISION_ID) .add("session", session))) @@ -106,7 +106,7 @@ private JsonObject buildCaseWithNoDecisions() { private JsonObject buildCaseWithDecisionNoSession() { return createObjectBuilder() .add("id", CASE_ID) - .add("caseDecisions", Json.createArrayBuilder() + .add("caseDecisions", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("id", DECISION_ID))) .build(); @@ -120,7 +120,7 @@ private JsonObject buildOriginalSession() { private JsonObject buildExpectedSession(final String legalAdviserFirstName, final String legalAdviserLastName) { return JsonObjects.createObjectBuilder(buildOriginalSession()) - .add("legalAdviser", Json.createObjectBuilder() + .add("legalAdviser", JsonObjects.createObjectBuilder() .add("id", LEGAL_ADVISER_USER_ID.toString()) .add("firstName", legalAdviserFirstName) .add("lastName", legalAdviserLastName)) diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java index 7475181e47..317f0f631f 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.jupiter.api.Assertions.assertSame; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java index adaef2a50a..d1ab8f0be4 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java @@ -5,8 +5,8 @@ import static java.util.Collections.singletonList; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java index dec23dc125..5a5a3a18a6 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java @@ -5,8 +5,8 @@ import static java.util.Arrays.stream; import static java.util.Optional.empty; import static java.util.Optional.of; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java index b29d307814..f0ea4d9d75 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java @@ -3,8 +3,8 @@ import static java.lang.String.format; import static java.time.LocalDate.now; import static java.util.Objects.nonNull; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java index 5d46dfec4f..8cc2442f6b 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java index 80a01336da..ecf90c8d77 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java index a918d21a4d..686bcaaa48 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java index 6ad4222411..f0111fd9c3 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java index 8b36e6bd67..a09589e758 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java @@ -9,7 +9,7 @@ import java.nio.charset.Charset; import java.util.Map; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -49,7 +49,7 @@ public static JsonObject getFileContentAsJson(final String path) { } public static JsonObject getJsonObject(final String json) { - try (final JsonReader reader = Json.createReader(new StringReader(json))) { + try (final JsonReader reader = JsonObjects.createReader(new StringReader(json))) { return reader.readObject(); } } diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java index 7f49d8bbeb..1161450ab7 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.converter; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; @@ -14,7 +14,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -177,12 +177,12 @@ public void shouldAddPersonInfoForDefendantWithMatchingPostcode() { private JsonObject buildOffenceReferenceData(final String title, final String legislation, final String titleWelsh, final String legislationWelsh) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("title", title) .add("legislation", legislation) - .add("details", Json.createObjectBuilder() - .add("document", Json.createObjectBuilder() - .add("welsh", Json.createObjectBuilder() + .add("details", JsonObjects.createObjectBuilder() + .add("document", JsonObjects.createObjectBuilder() + .add("welsh", JsonObjects.createObjectBuilder() .add("welshoffencetitle", titleWelsh) .add("welshlegislation", legislationWelsh) ))) diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java index 7d59e42c0f..d7cc1673cb 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.service; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java index e38b0b97d6..a50b55f904 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java index 2bb40d3636..e8263a742c 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -57,8 +57,8 @@ public void shouldGetOffenceReferenceData() { when(requester.request(any(JsonEnvelope.class))).thenReturn(response); - final JsonObject responsePayload = Json.createObjectBuilder() - .add("offences", Json.createArrayBuilder().add(Json.createObjectBuilder())) + final JsonObject responsePayload = JsonObjects.createObjectBuilder() + .add("offences", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder())) .build(); when(response.payloadAsJsonObject()).thenReturn(responsePayload); @@ -81,7 +81,7 @@ public void shouldGetOffenceReferenceDataByOffenceId() { .with(metadataWithRandomUUID("sjp.query.case-by-urn-postcode")).build(); final UUID offenceId = UUID.randomUUID(); - final JsonObject responsePayload = Json.createObjectBuilder().add("offenceId", offenceId.toString()).build(); + final JsonObject responsePayload = JsonObjects.createObjectBuilder().add("offenceId", offenceId.toString()).build(); when(requester.request(any(JsonEnvelope.class))).thenReturn(response); when(response.payloadAsJsonObject()).thenReturn(responsePayload); diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.java index 784f68e300..b1a92b53a1 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java index 4804bfccec..7a2617a5fa 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-view/pom.xml b/sjp-query/sjp-query-view/pom.xml index a826a16857..412ea0df99 100644 --- a/sjp-query/sjp-query-view/pom.xml +++ b/sjp-query/sjp-query-view/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java index cb83b54907..c002a44561 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java index cbcf09e82b..99badf43e4 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java @@ -2,7 +2,7 @@ import static java.util.Arrays.stream; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.Handles; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -84,7 +84,7 @@ public JsonEnvelope findAssignmentCandidates(final JsonEnvelope envelope) { final List assignmentCandidatesList = assignmentService.getAssignmentCandidates(assigneeId, sessionType, prosecutingAuthorities, limit); - final JsonArrayBuilder casesReadyForDecisionBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder casesReadyForDecisionBuilder = JsonObjects.createArrayBuilder(); assignmentCandidatesList.forEach(assignmentCandidate -> casesReadyForDecisionBuilder.add(createObjectBuilder() .add("caseId", assignmentCandidate.getCaseId().toString()) diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java index f9275ec296..ee3ec84073 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; import uk.gov.justice.services.core.annotation.Component; @@ -19,7 +19,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -48,7 +48,7 @@ public JsonEnvelope getCaseAssignmentRestriction(final JsonEnvelope query) { if(!caseAssignmentRestrictionList.isEmpty()) { restriction = Optional.of(caseAssignmentRestrictionList.get(0)) - .map(assignmentRestriction -> Json.createObjectBuilder() + .map(assignmentRestriction -> JsonObjects.createObjectBuilder() .add("prosecutingAuthority", assignmentRestriction.getProsecutingAuthority()) .add("dateTimeCreated", assignmentRestriction.getDateTimeCreated().toString()) .add("exclude", getArrayBuilder(assignmentRestriction.getExclude())) diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java index 3eced6855e..c068f4cc0e 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonObjects.toJsonArray; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java index 2f5bbff2a3..3870a8595e 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java @@ -11,7 +11,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; @ServiceComponent(Component.QUERY_VIEW) @@ -29,8 +29,8 @@ public JsonEnvelope findCaseDocument(final JsonEnvelope envelope) { final UUID documentId = UUID.fromString(envelope.payloadAsJsonObject().getString("documentId")); final Optional caseDocument = caseService.findCaseDocument(caseId, documentId) - .map(document -> Json.createObjectBuilder().add("caseDocument", - Json.createObjectBuilder() + .map(document -> JsonObjects.createObjectBuilder().add("caseDocument", + JsonObjects.createObjectBuilder() .add("id", document.getId().toString()) .add("materialId", document.getMaterialId().toString()) .add("documentType", document.getDocumentType()) diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java index a79c5bd423..ec9a795d88 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java @@ -5,7 +5,7 @@ import static java.util.Objects.nonNull; import static java.util.Optional.empty; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.moj.cpp.sjp.persistence.entity.EmailNotification.NotificationNotifyDocumentType.PARTIAL_AOCP_CRITERIA_NOTIFICATION; @@ -74,7 +74,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.persistence.NoResultException; @@ -560,7 +560,7 @@ public JsonEnvelope getOutstandingFineRequests(final JsonEnvelope envelope) { return enveloper.withMetadataFrom(envelope, "sjp.query.outstanding-fine-requests").apply(result); } catch (final NoResultException nre) { LOGGER.error("### No defendant found "); - return envelopeFrom(envelope.metadata(), Json.createObjectBuilder().build()); + return envelopeFrom(envelope.metadata(), JsonObjects.createObjectBuilder().build()); } } @@ -568,7 +568,7 @@ public JsonEnvelope getOutstandingFineRequests(final JsonEnvelope envelope) { public JsonEnvelope findApplication(final JsonEnvelope envelope) { return caseApplicationService.findApplication(fromString(extract(envelope, FIELD_APPLICATION_ID))) .map(app -> enveloper.withMetadataFrom(envelope, NAME_APPLICATION_RESPONSE_CASE).apply(app)) - .orElse(envelopeFrom(envelope.metadata(), Json.createObjectBuilder().build())); + .orElse(envelopeFrom(envelope.metadata(), JsonObjects.createObjectBuilder().build())); } @@ -645,7 +645,7 @@ public JsonEnvelope getProsecutingAuthorityForLja(final JsonEnvelope envelope) { final Set prosecutingAuthorities = new HashSet<>(assignmentService.getProsecutingAuthorityByLja(ljaCode)); - final JsonArrayBuilder prosecutorsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder prosecutorsBuilder = JsonObjects.createArrayBuilder(); prosecutingAuthorities.forEach(prosecutorsBuilder::add); final JsonObject prosecutingAuthoritiesForLja = createObjectBuilder() diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java index ea749c7302..b8c9451e2c 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.view; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.toJsonArray; import uk.gov.justice.services.core.annotation.Component; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java index 1631c1ce18..4edee75dd1 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.moj.cpp.sjp.query.view.service.CachedReferenceData; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java index f501dd79fb..ece4c80208 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java @@ -2,8 +2,8 @@ import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.ADDITIONAL_POINTS_REASON; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.ADJOURN_TO; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.AMOUNT; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java index 030d18db2f..0b6e58c0d2 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.query.view.converter.ResultCode.D45; import static uk.gov.moj.cpp.sjp.query.view.converter.ResultCode.DPR; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java index fded7d9e07..ea60c78ea3 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java @@ -7,8 +7,8 @@ import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.domain.decision.DecisionType.DecisionName.ADJOURN; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.*; @@ -27,7 +27,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonNumber; @@ -553,7 +553,7 @@ private JsonObjectBuilder fineResult(JsonObject offenceDecision, CachedReference private JsonArray terminalEntries(final JsonObject... terminalEntries) { if (nonNull(terminalEntries)) { - return Arrays.stream(terminalEntries).reduce(Json.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add).build(); + return Arrays.stream(terminalEntries).reduce(JsonObjects.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add).build(); } return createArrayBuilder().build(); } diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java index fc3bae2a8a..11d54f3547 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.prompts; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.PROMPT_DEFINITION_ID; import uk.gov.moj.cpp.sjp.query.view.converter.Prompt; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java index 0a9bbf67d6..ec8857a671 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java @@ -2,8 +2,8 @@ import static com.google.common.collect.ImmutableList.copyOf; import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.DAY; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.DAYS; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java index c6bc56702a..e3d08cb89b 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; import static com.google.common.collect.ImmutableList.copyOf; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import uk.gov.moj.cpp.sjp.query.view.converter.Prompt; import uk.gov.moj.cpp.sjp.query.view.service.OffenceDataSupplier; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java index 5d140aa550..41cd7b4a07 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.INDEX; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.TERMINAL_ENTRIES; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java index ed21422303..39e1aa17ea 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.view.service; import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static uk.gov.moj.cpp.sjp.query.view.service.ApplicationPrompt.DER_DVLA_ENDORSEMENT_CODE; import static uk.gov.moj.cpp.sjp.query.view.service.ApplicationPrompt.DER_DVLA_ENDORSEMENT_CODE2; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java index 42bfd2aff3..4d6992961f 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java @@ -10,8 +10,8 @@ import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.moj.cpp.sjp.query.view.ExportType.PUBLIC; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java index b054edb99c..55ec88c2c8 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java @@ -3,8 +3,8 @@ import static java.lang.String.format; import static java.util.Objects.nonNull; import static java.util.Optional.of; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.moj.cpp.sjp.query.view.converter.ResultCode.RSJP; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.VERDICT; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java index 5857d231a7..5f8b613e0f 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java index 4b050c2d42..163f722f1d 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java @@ -3,7 +3,7 @@ import static java.util.Optional.empty; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java index 19a1f48c04..bfff1749b2 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java @@ -9,7 +9,7 @@ import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.justice.core.courts.ContactNumber.contactNumber; import static uk.gov.justice.core.courts.Defendant.defendant; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java index b6495d81c3..fb0439362b 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java @@ -3,7 +3,7 @@ import static java.util.UUID.randomUUID; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; import uk.gov.justice.services.core.annotation.Component; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java index a2e26f9515..821509e6ba 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java @@ -6,7 +6,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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java index 352329f2a0..b4c8d7dc7f 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java @@ -6,8 +6,8 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.IntStream.range; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.ACCOUNT_DIVISION_CODE; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.java index d75d846e72..4d84e08fa3 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; @@ -24,7 +24,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -108,7 +108,7 @@ public boolean isSjpProsecutorUserGroupOnly(JsonEnvelope originalEnvelope) { return false; } final JsonEnvelope requestEnvelope = enveloper.withMetadataFrom(originalEnvelope, "usersgroups.get-groups-by-user") - .apply(Json.createObjectBuilder().add(USER_ID, userId.get()).build()); + .apply(JsonObjects.createObjectBuilder().add(USER_ID, userId.get()).build()); final JsonEnvelope responseEnvelope = requester.requestAsAdmin(requestEnvelope); diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java index 931edb0277..172f1dd380 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java @@ -6,7 +6,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import java.time.LocalDate; @@ -36,7 +36,7 @@ public DefendantCaseQuery(DefendantDetail defendant) { } private void populateDefendantCriteria() { - final JsonObjectBuilder criteriaBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder criteriaBuilder = JsonObjects.createObjectBuilder(); criteriaBuilder.add(CASES_PAGE_SIZE, CASES_DEFAULT_PAGE_SIZE); final PersonalDetails personalDetails = defendant.getPersonalDetails(); diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java index de599e412b..6726601b3e 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java @@ -18,7 +18,7 @@ import java.util.List; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -51,7 +51,7 @@ public List searchDefendantCases(Envelope envelope, while (true) { - final JsonObjectBuilder criteriaBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder criteriaBuilder = JsonObjects.createObjectBuilder(); defendantQuery.getCriteria().forEach(criteriaBuilder::add); criteriaBuilder.add(CASES_START_FROM, page); diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java index d89bf045d2..18f9929118 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java @@ -3,7 +3,7 @@ import static java.time.ZonedDateTime.now; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.when; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java index dbf6e9fcec..539e3b90c1 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.math.BigDecimal.ROUND_DOWN; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java index 88e2b1341b..24c2b75d9c 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java @@ -34,7 +34,7 @@ import java.util.Set; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; @@ -156,7 +156,7 @@ public void shouldReturnEmptyListOfAssignmentCandidates() { } private JsonEnvelope buildAssignmentQuery(final SessionType sessionType) { - final JsonObjectBuilder assignmentQueryPayloadBuilder = Json.createObjectBuilder() + final JsonObjectBuilder assignmentQueryPayloadBuilder = JsonObjects.createObjectBuilder() .add("assigneeId", assigneeId.toString()) .add("sessionType", sessionType.name()) .add("localJusticeAreaNationalCourtCode", localJusticeAreaNationalCourtCode) @@ -166,7 +166,7 @@ private JsonEnvelope buildAssignmentQuery(final SessionType sessionType) { } private JsonEnvelope buildAssignmentQuery(final SessionType sessionType, final String prosecutingAuthorities) { - final JsonObjectBuilder assignmentQueryPayloadBuilder = Json.createObjectBuilder() + final JsonObjectBuilder assignmentQueryPayloadBuilder = JsonObjects.createObjectBuilder() .add("assigneeId", assigneeId.toString()) .add("sessionType", sessionType.name()) .add("localJusticeAreaNationalCourtCode", localJusticeAreaNationalCourtCode) diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultOrdersTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultOrdersTest.java index 9c30d84e3f..1349dfeb64 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultOrdersTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultOrdersTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.view; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java index 1bdd43bbdb..03aa834368 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.AllOf.allOf; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java index 3998a7d55e..96fbf32ae0 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java @@ -9,8 +9,8 @@ import static java.util.Optional.of; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -110,7 +110,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.persistence.NoResultException; @@ -839,7 +839,7 @@ public void shouldFindDefendantsOnlinePleaWithoutFinancesForProsecutor() { offenceDetail.setCode(offenceCode); when(offenceRepository.findBy(offenceId)).thenReturn(offenceDetail); - final JsonObject offenceData = Json.createObjectBuilder() + final JsonObject offenceData = JsonObjects.createObjectBuilder() .add("title", "Offence title").build(); when(referenceDataService.getOffenceData(offenceCode)).thenReturn(of(offenceData)); diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java index 76cdb1144c..8ae69bdb85 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.view.converter; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import static uk.gov.moj.cpp.sjp.query.view.converter.ResultCode.D45; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java index 048761ca6e..2cb1586ff7 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.sjp.query.view.converter; +import uk.gov.justice.services.messaging.JsonObjects; import com.google.common.collect.ImmutableMap; import org.json.JSONException; import org.junit.jupiter.api.BeforeEach; @@ -393,11 +394,11 @@ private List> toMap(JsonArray jsonArray) { .collect(Collectors.toList()); } private JsonArray removeIdFromJsonObjects(JsonArray jsonArray) { - JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); + JsonArrayBuilder arrayBuilder = JsonObjects.createArrayBuilder(); for (int i = 0; i < jsonArray.size(); i++) { JsonObject originalObject = jsonArray.getJsonObject(i); - JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); + JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder(); for (String key : originalObject.keySet()) { if (!"id".equals(key)) { diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java index 1a4aa73c68..84d6960c6d 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java index 6a99ff4184..b69f8a664f 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java index ead8497205..62d963dbc5 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java index bb00c6a265..f01e6682b3 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java index 54cf1194c8..7af07ad5dd 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java index b4ddd8f6d6..080dd4bf9e 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java index 81f059c894..2a22255cf9 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java index 639568b682..4dfafe1ee4 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java index 42dfb600cf..b1fb8d450c 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; import static java.lang.String.format; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java index 44864fcf1b..6ce202f9d0 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java index 86f834a649..4ebe75322f 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java index 02c3d6b959..48b5b695e6 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java index 9bfb1f9482..2baa764702 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java index c9a766bc6b..7ea7fd5349 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java index 3ebe36f189..03189f7bdd 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java index a02a7aa1bb..55d7ba064f 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java index 7afc121f64..52e7d8cad8 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java index 45aea7530a..5bd5298993 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java index b6a6206dbd..32490a8dae 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java index 3e00e391c9..6c4b7332d5 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java index 5c5b9f0448..2709eef2f7 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java index a4bff9b198..034a706dc3 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java index 4a7a51db19..52783b4d8c 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.Arrays; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java index ed1d5fcac1..5c810d0f1a 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java index baec1fe322..b37e601fc0 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; import static java.lang.String.format; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java index 7f422447ad..e35bcc897d 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; import java.util.stream.Stream; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java index 8bf3a6c462..79ece28985 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java index 92a0420663..241e7b28a7 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java index b106223c4a..8aafb5cb58 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonArray; import javax.json.JsonObject; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java index b017d976d7..d81be74e7f 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java @@ -8,8 +8,8 @@ import static java.util.Collections.singletonList; 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 uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java index afcb9decc9..cfccc9bde4 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java @@ -10,8 +10,8 @@ import static java.util.Collections.singletonList; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.apache.commons.lang3.RandomUtils.nextInt; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantServiceTest.java index a07d946474..b36e358913 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantServiceTest.java @@ -3,7 +3,7 @@ import static com.google.common.collect.Lists.newArrayList; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java index 319f669111..295f0a5475 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java @@ -4,7 +4,7 @@ import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java index be2a84085d..f155755ed8 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.service; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java index 4c8e41c6c3..9e0a8d88e7 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.view.service; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java index 90a0f4d907..e2f52f1d6c 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java @@ -2,9 +2,9 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java index 7b805195d1..b61454d224 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java index ec3b4771d7..fa22e5d31d 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java index 468be53584..2ed9b0b98f 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java @@ -2,8 +2,8 @@ import static com.fasterxml.jackson.annotation.JsonCreator.Mode.PROPERTIES; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java index d40df08d01..d8ae9cd758 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonReader; @@ -40,13 +40,13 @@ public static String getFileContent(final String path, final Map } public static JsonObject getFileContentAsJson(final String path, final Map namedPlaceholders) { - try (final JsonReader reader = Json.createReader(new StringReader(getFileContent(path, namedPlaceholders)))) { + try (final JsonReader reader = JsonObjects.createReader(new StringReader(getFileContent(path, namedPlaceholders)))) { return reader.readObject(); } } public static JsonArray getFileContentAsJsonArray(final String path, final Map namedPlaceholders) { - try (final JsonReader reader = Json.createReader(new StringReader(getFileContent(path, namedPlaceholders)))) { + try (final JsonReader reader = JsonObjects.createReader(new StringReader(getFileContent(path, namedPlaceholders)))) { return reader.readArray(); } } diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java index 16e2483831..57c6b96e8b 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.util; import static com.google.common.io.Resources.getResource; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.apache.commons.io.FileUtils.readFileToString; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java index 0788c06ecc..8149c9db0a 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,13 +17,13 @@ public class JsonUtilityTest { private static final String TO_DATE = "2017-08-15"; private static JsonObject createPayload(final String key, final String value) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(key, value) .build(); } private static JsonObject createEmptyPayload() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .build(); } @@ -48,7 +48,7 @@ public void shouldReturnEmptyStringIfNotFound() throws Exception { @Test public void shouldReturnEmptyStringForJsonNull() throws Exception { - final JsonObject jsonNull = Json.createObjectBuilder().add("id", JsonValue.NULL).build(); + final JsonObject jsonNull = JsonObjects.createObjectBuilder().add("id", JsonValue.NULL).build(); final String result = JsonUtility.getString(jsonNull, "id"); diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java index 6f3f7f0b02..d0afbbdcd5 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java @@ -2,8 +2,8 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.NO_VERDICT; import uk.gov.moj.cpp.sjp.domain.verdict.VerdictType; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java index 959aac1871..205b9fdab6 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view.util.fakes; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.query.view.converter.ResultCode; diff --git a/sjp-service/pom.xml b/sjp-service/pom.xml index f26b49dc30..b1b7fdcca4 100644 --- a/sjp-service/pom.xml +++ b/sjp-service/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT sjp-service war diff --git a/sjp-viewstore/pom.xml b/sjp-viewstore/pom.xml index 458ff6236f..7944e8a035 100644 --- a/sjp-viewstore/pom.xml +++ b/sjp-viewstore/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 sjp-viewstore diff --git a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml index 150feed084..cae85b9e03 100644 --- a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml +++ b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-viewstore - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT sjp-viewstore-liquibase diff --git a/sjp-viewstore/sjp-viewstore-persistence/pom.xml b/sjp-viewstore/sjp-viewstore-persistence/pom.xml index 9b60cf305f..7e7123fb38 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/pom.xml +++ b/sjp-viewstore/sjp-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ sjp-viewstore uk.gov.moj.cpp.sjp - 17.103.172-SNAPSHOT + 17.103.175-SNAPSHOT 4.0.0 diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java index 5f935a7867..219b4b4247 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java @@ -2,7 +2,7 @@ import java.io.StringReader; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import javax.persistence.AttributeConverter; @@ -18,7 +18,7 @@ public String convertToDatabaseColumn(JsonObject jsonObject) { @Override public JsonObject convertToEntityAttribute(String dbData) { - final JsonReader jsonReader = Json.createReader(new StringReader(dbData)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(dbData)); JsonObject jsonObject; try { jsonObject = jsonReader.readObject();