diff --git a/.gitignore b/.gitignore index 6808b2f020..eb78fefc74 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ # Java *.class - # Package Files *.jar *.war diff --git a/pom.xml b/pom.xml index 6f73cafd3f..ccd8195c82 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.9-M2 + 17.104.4-M3 uk.gov.moj.cpp.sjp sjp-parent - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT pom @@ -42,18 +42,18 @@ 4.1.4-ATCM 17.0.57 17.0.1 - 17.103.124 + 17.103.133 17.0.38 17.0.11 0.1.49 - 17.0.41 - 17.0.224 + 17.104.48 + 17.0.262 17.0.66 4.1.4-ATCM true file://${project.build.directory}/site 2.3.0 - 17.103.11 + 17.104.4 ${coredomain.version} 3.0.0 2.10 @@ -66,8 +66,8 @@ -Djava.locale.providers=CLDR 6.13 9.2.2 - 17.103.73 - 17.103.2-DD-41592-SNAPSHOT + 17.104.81 + 17.104.4-DD-41592-SNAPSHOT 1.5.0 4.13.1 2.0.0 @@ -145,7 +145,7 @@ - + site ${mvn.site.url} diff --git a/runIntegrationTests.sh b/runIntegrationTests.sh index 37cbb95417..c9fad01e39 100755 --- a/runIntegrationTests.sh +++ b/runIntegrationTests.sh @@ -12,7 +12,7 @@ DOCKER_CONTAINER_REGISTRY_HOST_NAME=crmdvrepo01 LIQUIBASE_COMMAND=update #LIQUIBASE_COMMAND=dropAll - +# #fail script on error set -e diff --git a/sjp-command/pom.xml b/sjp-command/pom.xml index 62e1fc799b..315899a0a9 100644 --- a/sjp-command/pom.xml +++ b/sjp-command/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-api/pom.xml b/sjp-command/sjp-command-api/pom.xml index 2e3dbf360b..4ccd6f6e87 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..e935c68fa3 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 @@ -1,16 +1,15 @@ package uk.gov.moj.cpp.sjp.command.api; +import static java.util.Objects.nonNull; 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 java.util.Objects.nonNull; - import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; +import static uk.gov.justice.services.messaging.JsonObjects.getBoolean; import static uk.gov.justice.services.messaging.JsonObjects.getLong; import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress; import static uk.gov.moj.cpp.sjp.command.api.service.ContactDetailsService.convertBlankEmailsToNull; -import static uk.gov.justice.services.messaging.JsonObjects.getBoolean; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java index 02356c9e70..9c3fa27506 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java @@ -130,4 +130,16 @@ public void saveApplicationDecision(final JsonEnvelope decisionEnvelope) { .build(), applicationDecision)); } + + + @Handles("sjp.case-complete-bdf") + public void caseCompleteBdf(final JsonEnvelope jsonEnvelope) { + final JsonObject jsonObject = jsonEnvelope.payloadAsJsonObject(); + sender.send( + envelopeFrom( + metadataFrom(jsonEnvelope.metadata()) + .withName("sjp.command.case-complete-bdf") + .build(), + jsonObject)); + } } 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..0c551c1d2e 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 @@ -1,6 +1,8 @@ package uk.gov.moj.cpp.sjp.command.api; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress; import uk.gov.justice.services.core.annotation.Handles; @@ -8,10 +10,8 @@ import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.justice.services.messaging.JsonObjects; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -35,14 +35,14 @@ public class EmployerApi { public void updateEmployer(final JsonEnvelope envelope) { final JsonObject payloadAsJsonObject = envelope.payloadAsJsonObject(); //TODO ATCM-3151: when the UI is adapted remove this code below - final JsonObjectBuilder employerDetails = JsonObjects.createObjectBuilderWithFilter(payloadAsJsonObject, + final JsonObjectBuilder employerDetails = createObjectBuilderWithFilter(payloadAsJsonObject, key -> !(CASE_ID.equals(key) || DEFENDANT_ID.equals(key) || ADDRESS.equals(key))); if (payloadAsJsonObject.containsKey(ADDRESS)) { employerDetails.add(ADDRESS, normalizePostcodeInAddress(payloadAsJsonObject.getJsonObject(ADDRESS))); } - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = 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..b6301868f2 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 @@ -3,7 +3,9 @@ import static java.util.Arrays.asList; 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.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress; import uk.gov.justice.json.schemas.domains.sjp.command.PleadAocpOnline; @@ -19,10 +21,6 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.command.api.validator.PleadOnlineValidator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.StringReader; import java.util.List; @@ -30,11 +28,15 @@ import java.util.Objects; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonReader; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + @ServiceComponent(COMMAND_API) public class PleadOnlineApi { @@ -82,7 +84,7 @@ public void pleadOnline(final Envelope envelope) { checkValidationErrors(validationErrors); final JsonObjectBuilder pleaOnlineObjectBuilder = createObjectBuilderWithFilter(payload, field -> !asList(PERSONAL_DETAILS, EMPLOYER).contains(field)); - if (payload.containsKey(PERSONAL_DETAILS)) { + if (payload.containsKey(PERSONAL_DETAILS)) { pleaOnlineObjectBuilder.add(PERSONAL_DETAILS, replacePostcodeInPayload(payload, PERSONAL_DETAILS)); } @@ -143,7 +145,7 @@ private void checkValidationErrors(Map> validationErrors) { private JsonObject getCaseDetail(final Envelope envelope) { - final JsonObject queryCasePayload = Json.createObjectBuilder() + final JsonObject queryCasePayload = createObjectBuilder() .add("caseId", envelope.payload().getCaseId().toString()) .build(); @@ -166,7 +168,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 = 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..a1704c9dd4 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; 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..80d5fa0549 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 @@ -3,6 +3,7 @@ import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.justice.services.core.annotation.Handles; @@ -16,7 +17,6 @@ import uk.gov.moj.cpp.sjp.domain.SessionCourt; import javax.inject.Inject; -import javax.json.Json; 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 = 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..fb0fc28239 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/accesscontrol/RuleConstants.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/accesscontrol/RuleConstants.java index 1fb923ad91..2efd4c1ea0 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/accesscontrol/RuleConstants.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/accesscontrol/RuleConstants.java @@ -174,4 +174,8 @@ public static List getRejectPendingDefendantChanges() { public static List getDeleteCaseDocumentActionGroups() { return asList(SECOND_LINE_SUPPORT); } + + public static List getCaseCompleteBdfGroups() { + return asList(GROUP_SYSTEM_USERS); + } } 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..def6ce5343 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.api.service; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.requester.Requester; 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..0adb77e7e0 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.command.api.service; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; diff --git a/sjp-command/sjp-command-api/src/main/resources/rules/command-case-complete-bdf-api.drl b/sjp-command/sjp-command-api/src/main/resources/rules/command-case-complete-bdf-api.drl new file mode 100644 index 0000000000..5c40a9ba02 --- /dev/null +++ b/sjp-command/sjp-command-api/src/main/resources/rules/command-case-complete-bdf-api.drl @@ -0,0 +1,18 @@ +package uk.gov.moj.cpp.sjp.command.api.accesscontrol; + +import uk.gov.moj.cpp.accesscontrol.drools.Outcome; +import uk.gov.moj.cpp.accesscontrol.drools.Action; +import java.util.Arrays; +import uk.gov.moj.cpp.sjp.command.api.accesscontrol.RuleConstants; + +global uk.gov.moj.cpp.accesscontrol.common.providers.UserAndGroupProvider userAndGroupProvider; + +rule "Command - Rule for case complete bdf" + when + $outcome: Outcome(); + $action: Action(name == "sjp.case-complete-bdf"); + eval(userAndGroupProvider.isMemberOfAnyOfTheSuppliedGroups($action, RuleConstants.getCaseCompleteBdfGroups())); + then + $outcome.setSuccess(true); +end + diff --git a/sjp-command/sjp-command-api/src/raml/json/schema/sjp.case-complete-bdf.json b/sjp-command/sjp-command-api/src/raml/json/schema/sjp.case-complete-bdf.json new file mode 100644 index 0000000000..b4dd5d8a1b --- /dev/null +++ b/sjp-command/sjp-command-api/src/raml/json/schema/sjp.case-complete-bdf.json @@ -0,0 +1,5 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://justice.gov.uk/json/schemas/domains/sjp/command/sjp.case-complete-bdf.json", + "additionalProperties": false +} diff --git a/sjp-command/sjp-command-api/src/raml/json/sjp.case-complete-bdf.json b/sjp-command/sjp-command-api/src/raml/json/sjp.case-complete-bdf.json new file mode 100644 index 0000000000..0db3279e44 --- /dev/null +++ b/sjp-command/sjp-command-api/src/raml/json/sjp.case-complete-bdf.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/sjp-command/sjp-command-api/src/raml/sjp-command-api.raml b/sjp-command/sjp-command-api/src/raml/sjp-command-api.raml index f2f2fcafd5..6b01825c49 100644 --- a/sjp-command/sjp-command-api/src/raml/sjp-command-api.raml +++ b/sjp-command/sjp-command-api/src/raml/sjp-command-api.raml @@ -983,4 +983,30 @@ baseUri: http://localhost:8080/sjp-command-api/command/api/rest/sjp 202: description: Accepted 500: - description: Internal Server Error \ No newline at end of file + description: Internal Server Error + + +/cases/{caseId}/complete-bdf: + uriParameters: + caseId: + description: Id of the case to complete + type: string + post: + description: | + decision + ... + (mapping): + requestType: application/vnd.sjp.case-complete-bdf+json + name: sjp.case-complete-bdf + ... + body: + application/vnd.sjp.case-complete-bdf+json: + example: + !include json/sjp.case-complete-bdf.json + schema: + !include json/schema/sjp.case-complete-bdf.json + responses: + 500: + description: Internal Server Error + 202: + description: Accepted 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..e97691597d 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,6 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -12,6 +11,7 @@ import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..f84cb78573 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,6 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -12,6 +11,7 @@ import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..3f053e4afd 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,12 +1,12 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; 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..c858f0932b 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,6 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -19,6 +18,7 @@ import static uk.gov.justice.json.schemas.domains.sjp.NoteType.DECISION; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; 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..93451484da 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 @@ -5,6 +5,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import uk.gov.justice.services.adapter.rest.exception.BadRequestException; @@ -18,8 +19,6 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.json.Json; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -75,7 +74,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, createObjectBuilder().build()); caseReopenedApi.undoCaseReopenedInLibra(command); @@ -116,7 +115,7 @@ private void shouldPropagateCommandWhenValidDates(final Consumer f private JsonEnvelope getEnvelope(final String reopenedDate, final String command) { return EnvelopeFactory.createEnvelope(command, - Json.createObjectBuilder() + 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..993a29d2e3 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,24 +1,24 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; +import static java.util.UUID.randomUUID; +import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.any; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildAddressWithPostcode; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddress; +import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddressAndOffences; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddressAndOffencesWithAOCPEligibilityAndStandardPenalty; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithContactDetails; -import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddressAndOffences; -import static java.util.UUID.randomUUID; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.sender.Sender; 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..282f19bbed 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,14 +2,14 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; 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 a027e51a5d..60543bc4ad 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,6 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -20,6 +18,8 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; @@ -425,6 +425,28 @@ public void shouldCaptureCourtScheduleIdInReferForCourtHearingDecision() { )); } + + @Test + void shouldCompleteCaseViaBdf() { + final UUID caseId = randomUUID(); + final JsonEnvelope envelope = createCaseCompleteBdfPayload(caseId); + decisionApi.caseCompleteBdf(envelope); + verify(sender).send(envelopeCaptor.capture()); + final Envelope sentEnvelope = envelopeCaptor.getValue(); + assertThat(sentEnvelope.metadata().name(), is("sjp.command.case-complete-bdf")); + assertThat(sentEnvelope.payload().toString(), isJson( + allOf( + withJsonPath("$.caseId", is(caseId.toString())) + ) + )); + } + + private JsonEnvelope createCaseCompleteBdfPayload(final UUID caseId) { + final JsonObjectBuilder applicationBuilder = createObjectBuilder() + .add("caseId", caseId.toString()); + return envelopeFrom(metadataWithRandomUUID("sjp.command.case-complete-bdf"), applicationBuilder.build()); + } + private JsonEnvelope createApplicationDecisionCommand(final boolean granted, final String rejectionReason, final boolean outOfTime, final String outOfTimeReason) { 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..92cc2dac67 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,13 +1,13 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.Collections.singletonMap; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..857f147bfa 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,13 +2,13 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..61b0305f5e 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 @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.api; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; @@ -12,15 +12,16 @@ import static uk.gov.justice.json.schemas.domains.sjp.command.Plea.NOT_GUILTY; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildAddressObjectWithPostcode; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildEmployerWithAddress; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildPersonalDetailsWithAddress; -import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildPleadOnline; import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildPleadAocpOnline; +import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildPleadOnline; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.NO_PLEA_RECEIVED_READY_FOR_DECISION; -import org.hamcrest.CoreMatchers; import uk.gov.justice.json.schemas.domains.sjp.command.Benefits; import uk.gov.justice.json.schemas.domains.sjp.command.FinancialMeans; import uk.gov.justice.json.schemas.domains.sjp.command.Frequency; @@ -39,16 +40,15 @@ import uk.gov.moj.cpp.sjp.command.api.validator.PleadOnlineValidator; import java.math.BigDecimal; -import java.util.Objects; import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonValue; +import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -224,6 +224,7 @@ public void shouldNotPleadOnlineWhenCaseReviewed() { var e = assertThrows(BadRequestException.class, () -> invokePleadOnlineAndVerify(pleadOnline, caseDetail)); assertThat(e.getMessage(), CoreMatchers.is(CASE_HAS_BEEN_REVIEWED_EXCEPTION_MESSAGE)); } + @Test public void shouldNotPleadOnlineWhenCasePostAdjourned() { final PleadOnline pleadOnline = buildPleadOnline( @@ -294,7 +295,7 @@ private void invokePleadOnlineAndVerify(PleadOnline pleadOnline, JsonObject case metadataWithRandomUUID(PLEAD_ONLINE_COMMAND_NAME), pleadOnline); - if(caseDetail != null) { + if (caseDetail != null) { final JsonEnvelope caseDetailResponseEnvelope = getCaseDetailResponseEnvelope(caseDetail); when(requester.requestAsAdmin(queryEnvelopeCaptor.capture())).thenReturn(caseDetailResponseEnvelope); } @@ -335,21 +336,21 @@ private JsonObject getValidCaseDetail() { } private JsonObject getCaseDetail(final Plea plea, final JsonValue completed) { - final JsonObjectBuilder caseDetailBuilder = Json.createObjectBuilder() + final JsonObjectBuilder caseDetailBuilder = 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 = 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 = createArrayBuilder().add(offenceObjectBuilder.build()).build(); - final JsonObject defendant = Json.createObjectBuilder() + final JsonObject defendant = createObjectBuilder() .add("offences", offences) .build(); @@ -357,22 +358,23 @@ 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() + + private JsonObject getCaseDetailPostConvention(final String adjournedTo, final String convention, final String conventionDate) { + final JsonObjectBuilder caseDetailBuilder = createObjectBuilder() .add("id", caseId.toString()) .add("adjournedTo", adjournedTo); - final JsonObjectBuilder offenceObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceObjectBuilder = createObjectBuilder(); Optional.ofNullable(convention) - .ifPresent(value -> offenceObjectBuilder.add("convention", convention)); + .ifPresent(value -> offenceObjectBuilder.add("convention", convention)); Optional.ofNullable(conventionDate) - .ifPresent(value -> offenceObjectBuilder.add("conventionDate", conventionDate)); + .ifPresent(value -> offenceObjectBuilder.add("conventionDate", conventionDate)); - final JsonArray offences = Json.createArrayBuilder().add(offenceObjectBuilder.build()).build(); + final JsonArray offences = createArrayBuilder().add(offenceObjectBuilder.build()).build(); - final JsonObject defendant = Json.createObjectBuilder() + final JsonObject defendant = 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..b116e756db 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.Collections.singletonMap; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; 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..620748420f 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,13 +2,13 @@ import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; 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..4a0672ddfb 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; @@ -23,9 +23,7 @@ import javax.json.JsonObjectBuilder; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.ExpectedException; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; 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..8fd66ed87b 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; @@ -23,9 +23,7 @@ import javax.json.JsonObjectBuilder; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.ExpectedException; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; 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..9a4d112311 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 @@ -13,6 +13,8 @@ import static org.mockito.Mockito.when; import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -43,7 +45,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import org.hamcrest.CoreMatchers; @@ -136,8 +137,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(createObjectBuilder().add("userId", userId.toString()).build(), "legalAdviser") + .withPayloadOf(createArrayBuilder().add("P1").add("P2").build(), "prosecutors") .build(); final SessionCourt sessionCourt = new SessionCourt("Wimbledon Magistrates' Court", "2577"); @@ -190,7 +191,7 @@ public void shouldRenameEndSessionCommand() { @Test public void endSessionShouldValidateSessionIdIsNotNull() { - final JsonObject payload = Json.createObjectBuilder().addNull("sessionId").build(); + final JsonObject payload = 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..921a94d8cc 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.api; import static java.util.Collections.singletonMap; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; 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..201a5d1f2d 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,10 +1,10 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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..923561636c 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.command.api; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; 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..ee2979a3ec 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,11 +4,11 @@ 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 org.apache.commons.lang3.StringUtils.isNotEmpty; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress; import java.util.List; 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..1fefaacd63 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.api.service; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; import uk.gov.justice.services.core.requester.Requester; 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..f61b42d0d9 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,21 +1,21 @@ 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 java.util.Objects.isNull; +import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; -import static java.util.UUID.randomUUID; -import static java.util.Objects.isNull; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.requester.Requester; 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..9bdecbbc0a 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 @@ -2,25 +2,22 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; -import static java.util.Arrays.asList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.json.schemas.domains.sjp.command.FinancialMeans.financialMeans; import static uk.gov.justice.json.schemas.domains.sjp.command.Plea.GUILTY; import static uk.gov.justice.json.schemas.domains.sjp.command.Plea.NOT_GUILTY; import static uk.gov.justice.json.schemas.domains.sjp.command.PleadOnline.pleadOnline; +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.common.CaseStatus.COMPLETED; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.NO_PLEA_RECEIVED_READY_FOR_DECISION; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.REFERRED_FOR_COURT_HEARING; -import java.util.stream.Stream; -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.command.Benefits; import uk.gov.justice.json.schemas.domains.sjp.command.FinancialMeans; import uk.gov.justice.json.schemas.domains.sjp.command.Frequency; @@ -32,23 +29,21 @@ import uk.gov.moj.cpp.sjp.domain.common.CaseStatus; import java.math.BigDecimal; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.UUID; +import java.util.stream.Stream; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameter; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; public class PleadOnlineValidatorTest { @@ -183,7 +178,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 = createObjectBuilder() .add("id", UUID.randomUUID().toString()); Optional.ofNullable(completed) @@ -195,7 +190,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 = createObjectBuilder(); Optional.ofNullable(pendingWithdrawal) .ifPresent(value -> offenceObjectBuilder.add("pendingWithdrawal", value)); @@ -203,9 +198,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 = createArrayBuilder().add(offenceObjectBuilder.build()).build(); - final JsonObject defendant = Json.createObjectBuilder() + final JsonObject defendant = 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..184d3acca0 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 @@ -1,16 +1,17 @@ package uk.gov.moj.cpp.sjp.command.api.validator.decisionvalidator; -import org.junit.jupiter.api.Test; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.moj.cpp.sjp.command.api.validator.decisionvalidator.DischargeDecisionValidator.validateDischargeDecision; + import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.moj.cpp.sjp.domain.decision.discharge.DischargeType; import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static uk.gov.moj.cpp.sjp.command.api.validator.decisionvalidator.DischargeDecisionValidator.validateDischargeDecision; +import org.junit.jupiter.api.Test; public class DischargeDecisionValidatorTest { 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..0c9188c0ed 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,11 +3,11 @@ 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 org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +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.command.api.validator.decisionvalidator.FinancialImpositionValidator.validateFinancialImposition; import static uk.gov.moj.cpp.sjp.domain.decision.DecisionType.DecisionName.DISCHARGE; import static uk.gov.moj.cpp.sjp.domain.decision.DecisionType.DecisionName.FINANCIAL_PENALTY; @@ -21,9 +21,7 @@ import javax.json.JsonArrayBuilder; import javax.json.JsonObject; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.ExpectedException; public class FinancialImpositionValidatorTest { 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..32567dd88e 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,16 +4,13 @@ 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 org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; -import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.command.api.validator.decisionvalidator.FinancialPenaltyDecisionValidator.validateFinancialPenaltyDecision; import uk.gov.justice.services.adapter.rest.exception.BadRequestException; -import uk.gov.justice.services.messaging.JsonEnvelope; import java.math.BigDecimal; import java.util.Optional; @@ -21,9 +18,7 @@ import javax.json.JsonObject; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.ExpectedException; public class FinancialPenaltyDecisionValidatorTest { 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..e3e1b5387a 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 @@ -1,34 +1,35 @@ package uk.gov.moj.cpp.sjp.command.schema; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assume.assumeThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher; + import java.util.stream.Stream; + +import javax.json.JsonValue; + import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import uk.gov.justice.services.adapter.rest.exception.BadRequestException; -import uk.gov.justice.services.messaging.JsonEnvelope; - -import javax.json.Json; -import javax.json.JsonValue; - -import org.junit.jupiter.api.BeforeAll; -import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher; public class CaseReopenedSchemaTest { /** - * Issue with remote refs, reported to Techpod: https://github.com/CJSCommonPlatform/microservice_framework/issues/648" - * ============ TODO: delete this block of code once the framework gets updated: ============== + * Issue with remote refs, reported to Techpod: + * https://github.com/CJSCommonPlatform/microservice_framework/issues/648" ============ TODO: + * delete this block of code once the framework gets updated: ============== */ @BeforeAll public static void init() { @@ -61,7 +62,7 @@ static Stream data() { public void validEnvelope(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -75,7 +76,7 @@ public void validEnvelope(String schema) { public void invalidEnvelope_reason_notFound(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -90,7 +91,7 @@ public void invalidEnvelope_reason_notFound(String schema) { public void invalidEnvelope_reason_empty(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("reason", "") .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -106,7 +107,7 @@ public void invalidEnvelope_reason_empty(String schema) { public void invalidEnvelope_reason_foundNull(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("reason", JsonValue.NULL) .add("libraCaseNumber", "LIBRA12345") .add("reopenedDate", "2017-01-01").build()); @@ -122,7 +123,7 @@ public void invalidEnvelope_reason_foundNull(String schema) { public void invalidEnvelope_libraCaseNumber_notFound(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("reason", "Reason") .add("reopenedDate", "2017-01-01").build()); @@ -137,7 +138,7 @@ public void invalidEnvelope_libraCaseNumber_notFound(String schema) { public void invalidEnvelope_libraCaseNumber_reason_empty(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", "") .add("reopenedDate", "2017-01-01").build()); @@ -153,7 +154,7 @@ public void invalidEnvelope_libraCaseNumber_reason_empty(String schema) { public void invalidEnvelope_libraCaseNumber_foundNull(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", JsonValue.NULL) .add("reopenedDate", "2017-01-01") @@ -170,7 +171,7 @@ public void invalidEnvelope_libraCaseNumber_foundNull(String schema) { public void invalidEnvelope_reopenedDate_notFound(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + createObjectBuilder() .add("reason", "Reason") .add("libraCaseNumber", "LIBRA12345") .build()); @@ -187,7 +188,7 @@ public void invalidEnvelope_reopenedDate_notFound(String schema) { public void invalidEnvelope_reopenedDate_invalidDate(String schema) { //given JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID(schema), - Json.createObjectBuilder() + 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..2818951f09 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,18 +1,18 @@ package uk.gov.moj.cpp.sjp.command.schema; -import static javax.json.Json.createReader; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import org.junit.jupiter.api.Disabled; import uk.gov.justice.services.messaging.JsonEnvelope; import javax.json.JsonObject; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @Disabled("Those tests can be looked when the JsonSchemaValidationMatcher supports the Json catalogues...") 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..cc2676e263 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,13 +1,13 @@ 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.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; -import static uk.gov.justice.json.schemas.domains.sjp.command.PleadOnline.pleadOnline; import static uk.gov.justice.json.schemas.domains.sjp.command.PleadAocpOnline.pleadAocpOnline; +import static uk.gov.justice.json.schemas.domains.sjp.command.PleadOnline.pleadOnline; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.json.schemas.domains.sjp.Address; import uk.gov.justice.json.schemas.domains.sjp.command.Employer; 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..8afc116d85 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 @@ -1,14 +1,13 @@ package uk.gov.moj.cpp.sjp.command.utils; -import org.junit.jupiter.api.Test; -import uk.gov.justice.services.adapter.rest.exception.BadRequestException; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; public class NullSafeJsonObjectHelperTest { diff --git a/sjp-command/sjp-command-controller/pom.xml b/sjp-command/sjp-command-controller/pom.xml index 1f5ee0dd92..202abec077 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java index b0807224d3..a563cf0af2 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java @@ -12,7 +12,6 @@ import uk.gov.moj.cpp.sjp.command.service.UserService; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -31,14 +30,14 @@ public void saveApplicationDecision(final JsonEnvelope commandEnvelope) { final JsonObject userDetails = userService.getCallingUserDetails(commandEnvelope); final JsonObjectBuilder enrichedPayload = createObjectBuilder(payload) - .add("savedBy", Json.createObjectBuilder() + .add("savedBy", createObjectBuilder() .add("userId", userDetails.getJsonString("userId")) .add("firstName", userDetails.getString("firstName")) .add("lastName", userDetails.getString("lastName"))); sender.send(envelopeFrom( metadataFrom(commandEnvelope.metadata()) - .withName("sjp.command.handler.save-application-decision"), + .withName("sjp.command.handler.save-application-decision"), enrichedPayload.build()) ); } 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..eb0f8023b4 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,10 +1,10 @@ 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.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; 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/controller/CaseAssignmentRestrictionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java index f75d9e4e59..abd48335b9 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,9 +1,9 @@ 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.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.json.schemas.domains.sjp.command.AddCaseAssignmentRestriction; import uk.gov.justice.services.core.annotation.Handles; 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..7d419495a6 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,8 +3,8 @@ 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.core.annotation.Component.COMMAND_CONTROLLER; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.common.util.Clock; import uk.gov.justice.services.core.annotation.Handles; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java index cde8238064..d47ccdadb8 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java @@ -4,9 +4,9 @@ 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 uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; @@ -21,7 +21,6 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -58,7 +57,7 @@ public void saveDecision(final JsonEnvelope caseDecisionCommand) { final JsonObjectBuilder enrichedPayload = createObjectBuilder(payload) .add("decisionId", randomUUID().toString()) - .add("savedBy", Json.createObjectBuilder() + .add("savedBy", createObjectBuilder() .add(USER_ID, userDetails.getJsonString(USER_ID)) .add(FIRST_NAME, userDetails.getString(FIRST_NAME)) .add(LAST_NAME, userDetails.getString(LAST_NAME))); @@ -84,7 +83,7 @@ public void handleAocpAcceptanceResponseTimeExpiredRequested(final JsonEnvelope final JsonObject userDetails = userService.getCallingUserDetails(command); final JsonObjectBuilder enrichedPayload = createObjectBuilder(payload) .add("decisionId", randomUUID().toString()) - .add("savedBy", Json.createObjectBuilder() + .add("savedBy", createObjectBuilder() .add(USER_ID, userDetails.getJsonString(USER_ID)) .add(FIRST_NAME, userDetails.getString(FIRST_NAME)) .add(LAST_NAME, userDetails.getString(LAST_NAME))); @@ -103,13 +102,23 @@ public void handleAocpAcceptanceResponseTimeExpiredRequested(final JsonEnvelope } + + @Handles("sjp.command.case-complete-bdf") + public void caseCompleteBdf(final JsonEnvelope command) { + final JsonObject payload = command.payloadAsJsonObject(); + sender.send(envelop(payload) + .withName("sjp.command.case-complete-bdf") + .withMetadataFrom(command)); + + } + private void addDefendantCourtDetails(final JsonObject payload, final JsonObjectBuilder enrichedPayload) { final JsonObject caseDetails = caseService.getCaseDetails(payload.getString("caseId")); getDefendantPostCode(caseDetails) .map(defendantPostCode -> referenceDataService.getEnforcementArea(defendantPostCode)) .map(this::getDefendantCourtDetails) .ifPresent(defendantCourtDetails -> { - final JsonObjectBuilder defendantDetails = Json.createObjectBuilder(); + final JsonObjectBuilder defendantDetails = createObjectBuilder(); defendantDetails.add("court", defendantCourtDetails); enrichedPayload.add("defendant", defendantDetails); }); @@ -118,7 +127,7 @@ private void addDefendantCourtDetails(final JsonObject payload, final JsonObject private JsonObject getDefendantCourtDetails(final Optional enforcementArea) { return enforcementArea .map(value -> value.getJsonObject("localJusticeArea")) - .map(localJusticeArea -> Json.createObjectBuilder() + .map(localJusticeArea -> createObjectBuilder() .add("nationalCourtCode", localJusticeArea.getString("nationalCourtCode")) .add("nationalCourtName", localJusticeArea.getString("name")) .build()) 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..83f3423ac3 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 @@ -1,5 +1,9 @@ package uk.gov.moj.cpp.sjp.command.service; +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.JsonObjects.createObjectBuilder; + import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -7,10 +11,6 @@ import javax.inject.Inject; import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; -import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; -import static uk.gov.justice.services.messaging.Envelope.metadataFrom; - public class CaseApplicationService { @Inject 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..555cb8be72 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,10 +1,10 @@ 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.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.requester.Requester; 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..77bf6e9832 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.service; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; 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..2d436439b0 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,10 +3,10 @@ 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.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.requester.Requester; 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..29ae5d3d25 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,11 +1,9 @@ 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.core.annotation.Component.COMMAND_CONTROLLER; 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.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.requester.Requester; 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..b538945dc7 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,8 +1,8 @@ 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.core.annotation.Component.COMMAND_CONTROLLER; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; diff --git a/sjp-command/sjp-command-controller/src/main/resources/rules/command-case-complete-bdf-api.drl b/sjp-command/sjp-command-controller/src/main/resources/rules/command-case-complete-bdf-api.drl new file mode 100644 index 0000000000..5d133346de --- /dev/null +++ b/sjp-command/sjp-command-controller/src/main/resources/rules/command-case-complete-bdf-api.drl @@ -0,0 +1,12 @@ +package uk.gov.moj.cpp.sjp.command.controller.accesscontrol; + +import uk.gov.moj.cpp.accesscontrol.drools.Outcome; +import uk.gov.moj.cpp.accesscontrol.drools.Action; + +rule "Command - Rule for case complete bdf" + when + $outcome: Outcome(); + $action: Action(name == "sjp.command.case-complete-bdf"); + then + $outcome.setSuccess(true); +end diff --git a/sjp-command/sjp-command-controller/src/raml/json/schema/sjp.command.case-complete-bdf.json b/sjp-command/sjp-command-controller/src/raml/json/schema/sjp.command.case-complete-bdf.json new file mode 100644 index 0000000000..94d7b39878 --- /dev/null +++ b/sjp-command/sjp-command-controller/src/raml/json/schema/sjp.command.case-complete-bdf.json @@ -0,0 +1,10 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://justice.gov.uk/json/schemas/domains/sjp/command/sjp.command.case-complete-bdf.json", + "type": "object", + "properties": { + "caseId": { + "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" + } + } +} diff --git a/sjp-command/sjp-command-controller/src/raml/json/sjp.command.case-complete-bdf.json b/sjp-command/sjp-command-controller/src/raml/json/sjp.command.case-complete-bdf.json new file mode 100644 index 0000000000..cec0172c72 --- /dev/null +++ b/sjp-command/sjp-command-controller/src/raml/json/sjp.command.case-complete-bdf.json @@ -0,0 +1,3 @@ +{ + "caseId": "6ac98e9c-66b2-4363-8a78-641dbec8bbd2" +} diff --git a/sjp-command/sjp-command-controller/src/raml/sjp-command-controller.messaging.raml b/sjp-command/sjp-command-controller/src/raml/sjp-command-controller.messaging.raml index 3af89cfc6f..b3366901c4 100644 --- a/sjp-command/sjp-command-controller/src/raml/sjp-command-controller.messaging.raml +++ b/sjp-command/sjp-command-controller/src/raml/sjp-command-controller.messaging.raml @@ -185,4 +185,7 @@ version: v1 schema: !include json/schema/sjp.command.reject-pending-defendant-changes.json application/vnd.sjp.command.update-offence-code+json: - schema: !include json/schema/sjp.command.update-offence-code.json \ No newline at end of file + schema: !include json/schema/sjp.command.update-offence-code.json + + application/vnd.sjp.command.case-complete-bdf+json: + schema: !include json/schema/sjp.command.case-complete-bdf.json 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..3412f8390b 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/AddFinancialImpositionAccountNumberBdfTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionAccountNumberBdfTest.java index 9804fd55b2..c9e77c4b03 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/AddFinancialImpositionCorrelationIdTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddFinancialImpositionCorrelationIdTest.java index a781af41eb..56bbe177e8 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/CaseAssignmentRestrictionTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java index 4bc179a213..7a968c9e7b 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +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/CreateCaseApplicationTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseApplicationTest.java index 2b841795a6..9f01b68e36 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/CreateCaseTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java index fbf5f7893b..a0e1954e9a 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/DeleteCaseDocumentTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java index f51756c4c3..744783c74f 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/EmployerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java index 42662fe247..03f5a030dd 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/MarkAsLegalSocCheckedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java index 20dd26e0b0..49da9da866 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/MarkCaseReopenedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java index 67d33975ec..aaa917c9c1 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/RequestDeleteDocsTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestDeleteDocsTest.java index f34ece9bb6..7e864ba1e8 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/RequestPressTransparencyReportTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestPressTransparencyReportTest.java index b0307efcef..c874149190 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/RequestTransparencyReportTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/RequestTransparencyReportTest.java index 67ff56a08b..338b1f1cd3 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/SaveApplicationDecisionTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SaveApplicationDecisionTest.java index cfeee221d6..a2ae3787e3 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/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..a950b000f5 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/UpdateFinancialMeansTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java index abc919a535..e8c1455629 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/UpdateHearingRequirementsTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java index 524d71f313..5780048c0f 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,8 +1,8 @@ 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.JsonEnvelope.envelopeFrom; +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/controller/ApplicationDecisionControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java index 732891c39e..82d72ac04b 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,16 +3,16 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; 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.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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/AssignmentControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java index 86ff52cafd..c69cb483a8 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,16 +2,16 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; 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.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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/CaseCreateControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java index 0f7b201e56..2df98980d9 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,6 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -13,6 +12,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.command.TestFixtures.getAddressPayload; import static uk.gov.moj.cpp.sjp.command.TestFixtures.getEnforcementAreaPayload; 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..b96b2a026a 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,17 +7,17 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; 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.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; 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 5649ebc060..83c0d0b128 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,25 +4,24 @@ 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 org.apache.activemq.artemis.utils.JsonLoader.createArrayBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; 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.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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.core.enveloper.Enveloper; import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.Envelope; @@ -103,12 +102,12 @@ public class DecisionControllerTest { .add("id", caseId.toString()) .add("urn", "TFL6754") .add("defendant", createObjectBuilder() - .add("id", randomUUID().toString()) - .add("personalDetails", createObjectBuilder() - .add("address", createObjectBuilder() - .add("postcode", "SE1 8HA") + .add("id", randomUUID().toString()) + .add("personalDetails", createObjectBuilder() + .add("address", createObjectBuilder() + .add("postcode", "SE1 8HA") + ) ) - ) ).build(); private final JsonObject caseDetailsWithoutPostcode = createObjectBuilder() @@ -127,8 +126,8 @@ public class DecisionControllerTest { .add("enforcingCourtCode", 2222) .add("accountDivisionCode", 1111) .add("localJusticeArea", createObjectBuilder() - .add("nationalCourtCode", "1080") - .add("name", "Bedfordshire Magistrates' Court") + .add("nationalCourtCode", "1080") + .add("name", "Bedfordshire Magistrates' Court") ).build(); private final JsonObjectBuilder referralReasonBuilder = createObjectBuilder() @@ -137,10 +136,10 @@ public class DecisionControllerTest { .add("reason", "Critical") .add("reasonCode", "PLR") .add("welshReason", "Ple amhendant") - .add("welshSubReason","Diffynnydd i fynychu i gadarnhau ple") - .add("hearingCode","CTL") - .add("validFrom","2017-08-01") - .add("validTo","2017-08-01"); + .add("welshSubReason", "Diffynnydd i fynychu i gadarnhau ple") + .add("hearingCode", "CTL") + .add("validFrom", "2017-08-01") + .add("validTo", "2017-08-01"); @Test public void shouldHandleDecisionCommands() { @@ -172,7 +171,7 @@ public void shouldHandleDecisionCommandWhenDefendantWithoutPostcode() { @Test public void shouldEnrichSaveDecisionCommandWithReferralReasonAndSubReason() { final JsonEnvelope saveDecisionCommand = createReferralSaveDecisionCommand(); - referralReasonBuilder.add("subReason","Defendant has to attend"); + referralReasonBuilder.add("subReason", "Defendant has to attend"); when(userService.getCallingUserDetails(saveDecisionCommand)).thenReturn(userDetails); when(caseService.getCaseDetails(caseId.toString())).thenReturn(caseDetails); when(referenceDataService.getReferralReason(REFERRAL_REASON_ID.toString())).thenReturn(of(referralReasonBuilder.build())); @@ -220,6 +219,20 @@ public void shouldHandleAocpAcceptanceResponseTimeExpiredRequestedWithDefendantP } + @Test + public void shouldRaiseCaseCompleteBdfCommand() { + final JsonObjectBuilder builder = createObjectBuilder() + .add("caseId", caseId.toString()); + JsonEnvelope jsonEnvelope = envelopeFrom( + metadataWithRandomUUID("sjp.command.case-complete-bdf") + .withUserId(userId.toString()) + , builder.build()); + decisionController.caseCompleteBdf(jsonEnvelope); + verify(sender).send(envelopeCaptor.capture()); + final Envelope commandSent = envelopeCaptor.getValue(); + assertThat(commandSent.metadata(), withMetadataEnvelopedFrom(jsonEnvelope).withName("sjp.command.case-complete-bdf")); + } + private void verifyReferralSaveDecisionCommand(final JsonEnvelope envelope, final String reasonForReferral) { verify(sender).send(envelopeCaptor.capture()); final Envelope commandSent = envelopeCaptor.getValue(); @@ -243,7 +256,7 @@ private void verifyReferralSaveDecisionCommand(final JsonEnvelope envelope, fina withJsonPath("$.offenceDecisions[0].referralReasonId", equalTo(REFERRAL_REASON_ID.toString())), withJsonPath("$.offenceDecisions[0].referralReason", equalTo(reasonForReferral) - )))); + )))); } private void verifySaveDecisionCommand(final JsonEnvelope envelope) { @@ -354,7 +367,7 @@ private JsonEnvelope createReferralSaveDecisionCommand() { } private static JsonArray createOffenceDecision() { - final JsonArrayBuilder offenceDecisionBuilderArray = Json.createArrayBuilder(); + final JsonArrayBuilder offenceDecisionBuilderArray = createArrayBuilder(); final JsonObjectBuilder offenceBuilder1 = createObjectBuilder(); offenceBuilder1.add("offenceId", randomUUID().toString()); offenceBuilder1.add("type", "WITHDRAWN"); @@ -371,7 +384,7 @@ private static JsonArray createOffenceDecision() { } private static JsonArray createReferToCourtOffenceDecision() { - final JsonArrayBuilder offenceDecisionBuilderArray = Json.createArrayBuilder(); + final JsonArrayBuilder offenceDecisionBuilderArray = 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..f0315e64e9 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,6 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -14,6 +13,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.command.TestFixtures.getEnforcementAreaPayload; import static uk.gov.moj.cpp.sjp.command.TestFixtures.getLocalJusticeAreasPayload; 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..0048675dcf 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,6 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -14,6 +13,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.command.TestFixtures.getEnforcementAreaPayload; import static uk.gov.moj.cpp.sjp.command.TestFixtures.getLocalJusticeAreasPayload; 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..8ee1a4bb46 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,14 +2,14 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static javax.json.JsonValue.NULL; -import static javax.json.Json.createArrayBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..1f2fe7fed0 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,13 +2,13 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; diff --git a/sjp-command/sjp-command-handler/pom.xml b/sjp-command/sjp-command-handler/pom.xml index e76585afb8..8501ae12c5 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java index 3b35fb90ae..92f07b5096 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java @@ -53,7 +53,8 @@ public void acknowledgeDefendantDetailsUpdates( final ProsecutingAuthorityAccess currentUsersProsecutingAuthorityAccess = prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(command); final Stream events = caseAggregate - .acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), currentUsersProsecutingAuthorityAccess.getProsecutingAuthority()); + .acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), currentUsersProsecutingAuthorityAccess.getProsecutingAuthority(), + currentUsersProsecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()); eventStream.append(events.map(enveloper.withMetadataFrom(command))); } diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java index b79beb15be..a5be230319 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java @@ -23,7 +23,8 @@ public void addDatesToAvoid(final JsonEnvelope command) throws EventStreamExcept final JsonObject payload = command.payloadAsJsonObject(); final String datesToAvoid = payload.getString("datesToAvoid"); final ProsecutingAuthorityAccess prosecutingAuthorityAccess = prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(command); - applyToCaseAggregate(command, aggregate -> aggregate.addDatesToAvoid(datesToAvoid, prosecutingAuthorityAccess.getProsecutingAuthority())); + applyToCaseAggregate(command, aggregate -> aggregate.addDatesToAvoid(datesToAvoid, prosecutingAuthorityAccess.getProsecutingAuthority(), + prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess())); } @Handles("sjp.command.expire-dates-to-avoid-timer") diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java index 9cd5f8f094..df384ce2ff 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java @@ -15,7 +15,9 @@ import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cpp.sjp.domain.ApplicationOffencesResults; +import uk.gov.moj.cpp.sjp.domain.CaseCompleteBdf; import uk.gov.moj.cpp.sjp.domain.GrantedApplicationResults; +import uk.gov.moj.cpp.sjp.domain.aggregate.CaseAggregate; import uk.gov.moj.cpp.sjp.domain.aggregate.Session; import uk.gov.moj.cpp.sjp.domain.decision.Decision; @@ -72,4 +74,11 @@ public void saveApplicationOffencesResults(final Envelope command) throws EventStreamException { + final CaseCompleteBdf payload = command.payload(); + applyToCaseAggregate(payload.getCaseId(), command, CaseAggregate::caseCompletedBdf); + } + } diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java index d76214b6e5..0874e4d250 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java @@ -53,7 +53,8 @@ public void setOffencesWithdrawalRequestsStatus(final Envelope 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 = 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/raml/json/schema/sjp.command.case-complete-bdf.json b/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.case-complete-bdf.json new file mode 100644 index 0000000000..951eda1b56 --- /dev/null +++ b/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.case-complete-bdf.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://justice.gov.uk/json/schemas/domains/sjp/command/sjp.command.case-complete-bdf.json", + "type": "object", + "properties": { + "caseId": { + "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" + } + }, + "required": [ + "caseId" + ] +} diff --git a/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.update-defendant-details-from-CC.json b/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.update-defendant-details-from-CC.json index 7002fb46df..6856f2e15d 100644 --- a/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.update-defendant-details-from-CC.json +++ b/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.update-defendant-details-from-CC.json @@ -73,8 +73,7 @@ }, "required": [ "name", - "address", - "contactDetails" + "address" ], "additionalProperties": false } diff --git a/sjp-command/sjp-command-handler/src/raml/json/sjp.command.case-complete-bdf.json b/sjp-command/sjp-command-handler/src/raml/json/sjp.command.case-complete-bdf.json new file mode 100644 index 0000000000..0d6da1ff2e --- /dev/null +++ b/sjp-command/sjp-command-handler/src/raml/json/sjp.command.case-complete-bdf.json @@ -0,0 +1,3 @@ +{ + "caseId": "91dd856f-fc0c-407d-8db6-7139f4e60a12" +} diff --git a/sjp-command/sjp-command-handler/src/raml/sjp-command-handler.messaging.raml b/sjp-command/sjp-command-handler/src/raml/sjp-command-handler.messaging.raml index 6e8659b30c..4423815d7f 100644 --- a/sjp-command/sjp-command-handler/src/raml/sjp-command-handler.messaging.raml +++ b/sjp-command/sjp-command-handler/src/raml/sjp-command-handler.messaging.raml @@ -334,3 +334,6 @@ version: v1 application/vnd.sjp.command.update-offence-code+json: schema: !include json/schema/sjp.command.update-offence-code.json + + application/vnd.sjp.command.case-complete-bdf+json: + schema: !include json/schema/sjp.command.case-complete-bdf.json diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java index 1c8151fc30..70f521235f 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java @@ -3,12 +3,12 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..a04ca89016 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,12 +3,12 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..4a097d05e0 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,12 +2,12 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..88f0bf75da 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,11 +2,11 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..dba17ce148 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,13 +1,13 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; 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.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; @@ -18,28 +18,29 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; +import uk.gov.justice.services.core.aggregate.AggregateService; +import uk.gov.justice.services.core.enveloper.Enveloper; +import uk.gov.justice.services.eventsourcing.source.core.EventSource; +import uk.gov.justice.services.eventsourcing.source.core.EventStream; +import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.sjp.domain.aggregate.AocpAcceptedEmailNotificationAggregate; +import uk.gov.moj.cpp.sjp.event.AocpAcceptedEmailNotificationFailed; +import uk.gov.moj.cpp.sjp.event.AocpAcceptedEmailNotificationQueued; +import uk.gov.moj.cpp.sjp.event.AocpAcceptedEmailNotificationSent; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; import java.util.UUID; import java.util.stream.Stream; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.justice.services.core.aggregate.AggregateService; -import uk.gov.justice.services.core.enveloper.Enveloper; -import uk.gov.justice.services.eventsourcing.source.core.EventSource; -import uk.gov.justice.services.eventsourcing.source.core.EventStream; -import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.sjp.domain.aggregate.AocpAcceptedEmailNotificationAggregate; -import uk.gov.moj.cpp.sjp.event.AocpAcceptedEmailNotificationFailed; -import uk.gov.moj.cpp.sjp.event.AocpAcceptedEmailNotificationQueued; -import uk.gov.moj.cpp.sjp.event.AocpAcceptedEmailNotificationSent; @ExtendWith(MockitoExtension.class) 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..6d9e31190b 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,6 @@ 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 org.apache.commons.lang3.RandomUtils.nextInt; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -16,6 +14,8 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedAfter; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; @@ -51,8 +51,6 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -269,7 +267,7 @@ public void shouldAssignCaseToUser() throws EventStreamException { metadataWithRandomUUID(ASSIGN_CASE_TO_USER_COMMAND), createObjectBuilder() .add("assignCase", caseToBeAssignedId.toString()) - .add("unassignCases", Json.createArrayBuilder() + .add("unassignCases", 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..039a9ef685 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 @@ -2,16 +2,15 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.ZoneOffset.UTC; -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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; @@ -42,7 +41,6 @@ import java.util.UUID; import java.util.stream.Stream; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; 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..4dafb57140 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 @@ -1,14 +1,14 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.AllOf.allOf; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -45,8 +45,6 @@ import java.util.stream.Stream; -import javax.json.Json; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -141,7 +139,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()); + 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..1ad38c6624 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.handler; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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..f2620c0edf 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 @@ -6,18 +6,17 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.Optional.empty; +import static java.util.Optional.of; 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 org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.core.AllOf.allOf; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.AllOf.allOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; @@ -30,6 +29,7 @@ import static uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus.STATUTORY_DECLARATION_PENDING; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -37,15 +37,14 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; +import static uk.gov.justice.services.test.utils.core.random.RandomGenerator.STRING; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import static uk.gov.moj.cpp.sjp.command.handler.common.EventNamesHolder.CASE_APPLICATION_CREATED; import static uk.gov.moj.cpp.sjp.command.handler.common.EventNamesHolder.CASE_MARKED_READY_FOR_DECISION; import static uk.gov.moj.cpp.sjp.command.handler.common.EventNamesHolder.CASE_STAT_DECS; import static uk.gov.moj.cpp.sjp.domain.CaseReadinessReason.APPLICATION_PENDING; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.COMPLETED_APPLICATION_PENDING; -import static uk.gov.justice.services.test.utils.core.random.RandomGenerator.STRING; -import org.hamcrest.Matchers; import uk.gov.justice.core.courts.CourtApplication; import uk.gov.justice.core.courts.CourtApplicationCase; import uk.gov.justice.core.courts.CourtApplicationParty; @@ -81,7 +80,10 @@ import java.util.UUID; import java.util.stream.Stream; +import javax.json.JsonObject; + import org.hamcrest.CoreMatchers; +import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -92,8 +94,6 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import javax.json.JsonObject; - @ExtendWith(MockitoExtension.class) public class CreateCaseApplicationHandlerTest { diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java index e8138fe64c..c959f742e5 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java @@ -7,9 +7,10 @@ import static java.util.UUID.randomUUID; import static javax.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; @@ -24,12 +25,14 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import static uk.gov.moj.cpp.sjp.domain.decision.Discharge.createDischarge; import static uk.gov.moj.cpp.sjp.domain.decision.FinancialPenalty.createFinancialPenalty; import static uk.gov.moj.cpp.sjp.domain.decision.OffenceDecisionInformation.createOffenceDecisionInformation; import static uk.gov.moj.cpp.sjp.domain.decision.discharge.DischargeType.ABSOLUTE; import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.FOUND_GUILTY; +import com.google.common.collect.Sets; import uk.gov.justice.json.schemas.domains.sjp.User; import uk.gov.justice.json.schemas.domains.sjp.commands.SaveApplicationDecision; import uk.gov.justice.json.schemas.domains.sjp.events.ApplicationDecisionRejected; @@ -46,15 +49,17 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.domain.ApplicationOffencesResults; -import uk.gov.moj.cpp.sjp.domain.SessionType; +import uk.gov.moj.cpp.sjp.domain.CaseCompleteBdf; import uk.gov.moj.cpp.sjp.domain.aggregate.CaseAggregate; import uk.gov.moj.cpp.sjp.domain.aggregate.Session; +import uk.gov.moj.cpp.sjp.domain.aggregate.state.CaseAggregateState; import uk.gov.moj.cpp.sjp.domain.decision.Decision; import uk.gov.moj.cpp.sjp.domain.decision.Dismiss; import uk.gov.moj.cpp.sjp.domain.decision.OffenceDecision; import uk.gov.moj.cpp.sjp.domain.decision.Withdraw; import uk.gov.moj.cpp.sjp.domain.verdict.VerdictType; import uk.gov.moj.cpp.sjp.event.ApplicationOffenceResultsSaved; +import uk.gov.moj.cpp.sjp.event.CaseCompleted; import uk.gov.moj.cpp.sjp.event.decision.DecisionSaved; import java.math.BigDecimal; @@ -106,7 +111,8 @@ public class DecisionHandlerTest { DecisionSaved.class, ApplicationDecisionSaved.class, ApplicationDecisionRejected.class, - ApplicationOffenceResultsSaved.class); + ApplicationOffenceResultsSaved.class, + CaseCompleted.class); @InjectMocks private DecisionHandler decisionHandler; @@ -385,6 +391,32 @@ public void shouldSaveApplicationOffencesResults() throws EventStreamException { } + @Test + void shouldCompleteCaseViaBdfRaiseCaseCompletedEvent() throws EventStreamException { + final UUID sessionId = randomUUID(); + final UUID caseId = fromString("d8158346-54a6-439b-add3-91778b2027ac"); + mockCalls(caseId, sessionId); + + final CaseCompleteBdf caseCompleteBdf = new CaseCompleteBdf(caseId); + final Envelope envelope = envelopeFrom( + metadataWithRandomUUID("sjp.command.case-complete-bdf"), + caseCompleteBdf); + CaseAggregateState caseAggregateState = new CaseAggregateState(); + caseAggregateState.setCaseId(caseId); + setField(caseAggregate,"state", caseAggregateState); + CaseCompleted caseCompleted = new CaseCompleted(caseId, Sets.newHashSet(sessionId)); + when(caseAggregate.caseCompletedBdf()).thenReturn(Stream.of(caseCompleted)); + decisionHandler.caseCompleteBdf(envelope); + verify(eventStream).append(argumentCaptor.capture()); + assertThat(argumentCaptor.getValue(), is(streamContaining( + jsonEnvelope( + withMetadataEnvelopedFrom(JsonEnvelope.envelopeFrom(envelope.metadata(), NULL)) + .withName("sjp.events.case-completed"), + payloadIsJson(anyOf( + withJsonPath("$.caseId", is(caseId.toString())) + )))))); + } + private static JsonObject getJsonPayload(final String fileName) { return new StringToJsonObjectConverter().convert(getFileContent(fileName)); } 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..3bc9f2131e 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,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.ZonedDateTime.now; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -11,6 +10,7 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..66a05c65ce 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 @@ -1,14 +1,13 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static java.time.temporal.ChronoUnit.MILLIS; -import static javax.json.Json.createObjectBuilder; 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.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; 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..ce8c26b7c9 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,13 +2,13 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamWithEmptyStream; @@ -31,7 +31,6 @@ import uk.gov.moj.cpp.sjp.event.FinancialImpositionCorrelationIdAdded; import java.util.UUID; -import java.util.stream.Stream; import javax.json.JsonObject; 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..59024d36ed 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,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -11,6 +10,7 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java index a60bb6abe1..8d75cf2897 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java @@ -116,6 +116,7 @@ public void shouldHandleOffenceWithdrawalRequestCorrectly() throws EventStreamEx final UUID offenceId_2 = randomUUID(); final ZonedDateTime setAt = clock.now(); final String prosecutionAuthority = "ALL"; + final List agentProsecutorAuthorityAccess = List.of("TFL", "TVL"); final SetOffencesWithdrawalRequestsStatus requestsStatus = new SetOffencesWithdrawalRequestsStatus(caseId, requestPayload(offenceId_1, offenceId_2)); final UUID userId = randomUUID(); @@ -125,6 +126,7 @@ public void shouldHandleOffenceWithdrawalRequestCorrectly() throws EventStreamEx when(aggregateService.get(eventStream, CaseAggregate.class)).thenReturn(caseAggregate); when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(any())).thenReturn(prosecutingAuthorityAccess); when(prosecutingAuthorityAccess.getProsecutingAuthority()).thenReturn(prosecutionAuthority); + when(prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()).thenReturn(agentProsecutorAuthorityAccess); final List offenceWithdrawalRequestsStatus = requestsStatus.getWithdrawalRequestsStatus().stream() @@ -134,7 +136,7 @@ public void shouldHandleOffenceWithdrawalRequestCorrectly() throws EventStreamEx ) .collect(Collectors.toList()); - when(caseAggregate.requestForOffenceWithdrawal(eq(requestsStatus.getCaseId()), eq(userId), eq(setAt), eq(offenceWithdrawalRequestsStatus), eq(prosecutionAuthority))) + when(caseAggregate.requestForOffenceWithdrawal(eq(requestsStatus.getCaseId()), eq(userId), eq(setAt), eq(offenceWithdrawalRequestsStatus), eq(prosecutionAuthority), eq(agentProsecutorAuthorityAccess))) .thenReturn(Stream.of(new OffencesWithdrawalRequestsStatusSet(caseId, setAt, userId, requestPayload(offenceId_1, offenceId_2)), new OffenceWithdrawalRequested(caseId, offenceId_1, withdrawalRequestReasonId, userId, setAt), new OffenceWithdrawalRequested(caseId, offenceId_2, withdrawalRequestReasonId, userId, setAt))); 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..21012b6289 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,13 +1,13 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; 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.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; @@ -18,7 +18,6 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import java.time.temporal.ChronoUnit; import uk.gov.justice.services.core.aggregate.AggregateService; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.eventsourcing.source.core.EventSource; @@ -32,6 +31,7 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; import java.util.UUID; import java.util.stream.Stream; 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..e1cf973ec6 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -14,6 +12,8 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; @@ -47,7 +47,6 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.List; -import java.util.TimeZone; import java.util.UUID; import java.util.stream.Stream; 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..c81bc0736a 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,12 +2,12 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..9315add9e9 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,12 +1,12 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; 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.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -14,16 +14,6 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; - -import java.time.ZonedDateTime; -import java.util.UUID; -import java.util.stream.Stream; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.justice.services.core.aggregate.AggregateService; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.eventsourcing.source.core.EventSource; @@ -35,6 +25,17 @@ import uk.gov.moj.cpp.sjp.event.CaseReserved; import uk.gov.moj.cpp.sjp.event.CaseUnReserved; +import java.time.ZonedDateTime; +import java.util.UUID; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + @ExtendWith(MockitoExtension.class) public class ReserveCaseHandlerTest { 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..91ffcbccb3 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 @@ -1,15 +1,17 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; +import static java.math.BigDecimal.valueOf; import static java.util.Optional.empty; import static java.util.Optional.of; -import static javax.json.Json.createObjectBuilder; +import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; @@ -19,8 +21,6 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import static java.util.UUID.randomUUID; -import static java.math.BigDecimal.valueOf; import uk.gov.justice.services.core.aggregate.AggregateService; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -34,6 +34,7 @@ import java.math.BigDecimal; import java.util.UUID; import java.util.stream.Stream; + import javax.json.JsonValue; import org.junit.jupiter.api.Test; 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..3880a9b6c1 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -34,8 +34,6 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import javax.json.Json; - @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..60d14ed52e 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,16 +4,16 @@ 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 javax.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; @@ -36,8 +36,8 @@ import uk.gov.moj.cpp.sjp.domain.aggregate.Session; import uk.gov.moj.cpp.sjp.domain.aggregate.casestatus.OffenceInformation; import uk.gov.moj.cpp.sjp.domain.aggregate.state.CaseAggregateState; -import uk.gov.moj.cpp.sjp.domain.decision.SessionCourt; import uk.gov.moj.cpp.sjp.domain.decision.ConvictingInformation; +import uk.gov.moj.cpp.sjp.domain.decision.SessionCourt; import uk.gov.moj.cpp.sjp.event.decision.ConvictionCourtResolved; import java.time.ZonedDateTime; 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..820ba399a2 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,16 +4,16 @@ 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 javax.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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..235f2a3be6 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,6 @@ 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 org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -15,6 +13,8 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; @@ -26,9 +26,6 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeStreamMatcher.streamContaining; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; - -import java.time.temporal.ChronoUnit; -import java.util.Arrays; import uk.gov.justice.core.courts.DelegatedPowers; import uk.gov.justice.domain.annotation.Event; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; @@ -52,6 +49,8 @@ import uk.gov.moj.cpp.sjp.event.session.SessionEnded; import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; +import java.util.Arrays; import java.util.Optional; import java.util.UUID; import java.util.stream.Stream; 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..8565d044fc 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.command.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; 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..35a838d609 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -17,6 +15,8 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; 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..790d1067c6 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 @@ -1,39 +1,7 @@ package uk.gov.moj.cpp.sjp.command.handler; -import org.hamcrest.Matchers; -import org.hamcrest.core.AllOf; -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.Spy; -import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus; -import uk.gov.justice.services.common.util.Clock; -import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.core.aggregate.AggregateService; -import uk.gov.justice.services.core.enveloper.Enveloper; -import uk.gov.justice.services.eventsourcing.source.core.EventSource; -import uk.gov.justice.services.eventsourcing.source.core.EventStream; -import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; -import uk.gov.moj.cpp.sjp.command.handler.common.EventNamesHolder; -import uk.gov.moj.cpp.sjp.domain.aggregate.CaseAggregate; -import uk.gov.moj.cpp.sjp.event.CCApplicationStatusCreated; -import uk.gov.moj.cpp.sjp.event.CCApplicationStatusUpdated; -import uk.gov.moj.cpp.sjp.event.CaseStatusChanged; - -import javax.json.JsonObjectBuilder; -import java.util.UUID; -import java.util.stream.Stream; - import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -42,6 +10,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; @@ -52,6 +21,39 @@ import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.RELISTED; import static uk.gov.moj.cpp.sjp.domain.util.DefaultTestData.CASE_ID; +import uk.gov.justice.json.schemas.domains.sjp.ApplicationStatus; +import uk.gov.justice.services.common.util.Clock; +import uk.gov.justice.services.common.util.UtcClock; +import uk.gov.justice.services.core.aggregate.AggregateService; +import uk.gov.justice.services.core.enveloper.Enveloper; +import uk.gov.justice.services.eventsourcing.source.core.EventSource; +import uk.gov.justice.services.eventsourcing.source.core.EventStream; +import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; +import uk.gov.moj.cpp.sjp.command.handler.common.EventNamesHolder; +import uk.gov.moj.cpp.sjp.domain.aggregate.CaseAggregate; +import uk.gov.moj.cpp.sjp.event.CCApplicationStatusCreated; +import uk.gov.moj.cpp.sjp.event.CCApplicationStatusUpdated; +import uk.gov.moj.cpp.sjp.event.CaseStatusChanged; + +import java.util.UUID; +import java.util.stream.Stream; + +import javax.json.JsonObjectBuilder; + +import org.hamcrest.Matchers; +import org.hamcrest.core.AllOf; +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.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + @ExtendWith(MockitoExtension.class) public class UpdateCaseApplicationHandlerTest { 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..af946b409c 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,13 +2,13 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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..0420e90edc 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,13 +1,13 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMatcher.isHandler; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java index 7f2db8cb3a..e13ac612a4 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java @@ -3,13 +3,13 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; @@ -30,7 +30,12 @@ import uk.gov.moj.cpp.sjp.domain.Defendant; import uk.gov.moj.cpp.sjp.domain.aggregate.CaseAggregate; import uk.gov.moj.cpp.sjp.domain.aggregate.CaseAggregateBaseTest; -import uk.gov.moj.cpp.sjp.event.*; +import uk.gov.moj.cpp.sjp.event.DefendantAddressUpdateRequested; +import uk.gov.moj.cpp.sjp.event.DefendantDateOfBirthUpdateRequested; +import uk.gov.moj.cpp.sjp.event.DefendantDetailUpdateRequested; +import uk.gov.moj.cpp.sjp.event.DefendantDetailsUpdateRequestAccepted; +import uk.gov.moj.cpp.sjp.event.DefendantDetailsUpdated; +import uk.gov.moj.cpp.sjp.event.DefendantNameUpdateRequested; import java.util.UUID; 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..f75d16ec88 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,13 +3,13 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..ec183a53a2 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,12 +2,12 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..27764e1eec 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,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -10,6 +9,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.EventStreamMatcher.eventStreamAppendedWith; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..84a718a290 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.handler.builder; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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; import static uk.gov.moj.cpp.sjp.domain.util.DefaultTestData.CASE_DOCUMENT_MATERIAL_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..68bb239cbe 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.command.handler.builder; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataOf; import static uk.gov.moj.cpp.sjp.domain.util.DefaultTestData.CASE_ID; import static uk.gov.moj.cpp.sjp.domain.util.DefaultTestData.REOPEN_DATE; 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..ee9499b172 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 @@ -1,13 +1,13 @@ package uk.gov.moj.cpp.sjp.command.handler.converter; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.services.messaging.JsonEnvelope; import java.io.IOException; import java.io.InputStream; -import javax.json.Json; 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 = 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..b28a1062f7 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 @@ -8,6 +8,7 @@ import static org.mockito.Mockito.when; import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -23,7 +24,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; 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(), 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 = 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 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 e4b60523a3..9bf8181efc 100644 --- a/sjp-domain/pom.xml +++ b/sjp-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT sjp-domain diff --git a/sjp-domain/sjp-domain-aggregate/pom.xml b/sjp-domain/sjp-domain-aggregate/pom.xml index 67a4257a28..ba2d2f3280 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT sjp-domain-aggregate diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java index 3f9acb8d8c..fe938520dc 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java @@ -62,6 +62,7 @@ import uk.gov.moj.cpp.sjp.domain.aggregate.state.WithdrawalRequestsStatus; import uk.gov.moj.cpp.sjp.domain.common.CaseManagementStatus; import uk.gov.moj.cpp.sjp.domain.common.CaseState; +import uk.gov.moj.cpp.sjp.domain.common.CaseStatus; import uk.gov.moj.cpp.sjp.domain.decision.AocpDecision; import uk.gov.moj.cpp.sjp.domain.decision.Decision; import uk.gov.moj.cpp.sjp.domain.onlineplea.PleadAocpOnline; @@ -71,6 +72,8 @@ import uk.gov.moj.cpp.sjp.domain.plea.SetPleas; import uk.gov.moj.cpp.sjp.event.ApplicationResultsRecorded; import uk.gov.moj.cpp.sjp.event.CCApplicationStatusCreated; +import uk.gov.moj.cpp.sjp.event.CaseCompleted; +import uk.gov.moj.cpp.sjp.event.CaseStatusChanged; import uk.gov.moj.cpp.sjp.event.CaseListedInCriminalCourtsUpdated; import javax.json.JsonObject; @@ -82,7 +85,6 @@ import java.util.Optional; import java.util.UUID; import java.util.function.Supplier; -import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -224,8 +226,8 @@ public Stream updateHearingRequirements(final UUID userId, return apply(CaseLanguageHandler.INSTANCE.updateHearingRequirements(userId, defendantId, interpreterLanguage, speakWelsh, state, pleaMethod, createdOn)); } - public Stream addDatesToAvoid(final String datesToAvoid, final String userProsecutingAuthority) { - return applyAndResolveCaseReadiness(() -> CaseCoreHandler.INSTANCE.addDatesToAvoid(datesToAvoid, state, userProsecutingAuthority)); + public Stream addDatesToAvoid(final String datesToAvoid, final String userProsecutingAuthority, final List agentProsecutorAuthorityAccess) { + return applyAndResolveCaseReadiness(() -> CaseCoreHandler.INSTANCE.addDatesToAvoid(datesToAvoid, state, userProsecutingAuthority, agentProsecutorAuthorityAccess)); } public Stream expireDefendantResponseTimer() { @@ -259,9 +261,10 @@ public Stream markAsLegalSocChecked(final UUID caseId, final UUID checke public Stream acknowledgeDefendantDetailsUpdates( final UUID defendantId, final ZonedDateTime acknowledgedAt, - final String userProsecutingAuthority) { + final String userProsecutingAuthority, + final List agentProsecutorAuthorityAccess) { - return apply(CaseDefendantHandler.INSTANCE.acknowledgeDefendantDetailsUpdates(defendantId, acknowledgedAt, state, userProsecutingAuthority)); + return apply(CaseDefendantHandler.INSTANCE.acknowledgeDefendantDetailsUpdates(defendantId, acknowledgedAt, state, userProsecutingAuthority, agentProsecutorAuthorityAccess)); } public Stream updateDefendantDetails(final UUID userId, @@ -369,8 +372,10 @@ public Stream addCaseNote(final UUID caseId, final Note note, final User state)); } - public Stream requestForOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List withdrawalRequestsStatus, final String prosecutionAuthority) { - return applyAndResolveCaseReadiness(() -> OffenceWithdrawalHandler.INSTANCE.requestOffenceWithdrawal(caseId, setBy, setAt, withdrawalRequestsStatus, state, prosecutionAuthority)); + public Stream requestForOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List withdrawalRequestsStatus, + final String prosecutionAuthority, final List agentProsecutorAuthorityAccess) { + return applyAndResolveCaseReadiness(() -> OffenceWithdrawalHandler.INSTANCE.requestOffenceWithdrawal(caseId, setBy, setAt, withdrawalRequestsStatus, state, + prosecutionAuthority, agentProsecutorAuthorityAccess)); } public Stream setPleas(final UUID caseId, final SetPleas pleas, final UUID userId, final ZonedDateTime pleadAt) { @@ -562,4 +567,11 @@ private ApplicationOffencesResults enrichApplicationAggregateResultsWithApplicat public Stream updateOffenceCode(final UUID caseId, final String offenceCode) { return UpdateOffenceCodeHandler.INSTANCE.updateOffenceCode(getState(), caseId, offenceCode); } + + public Stream caseCompletedBdf() { + final Stream.Builder streamBuilder = Stream.builder(); + return apply(streamBuilder.add(new CaseCompleted(state.getCaseId(), state.getSessionIds())) + .add(new CaseStatusChanged(state.getCaseId(), CaseStatus.COMPLETED)) + .build()); + } } diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseCoreHandler.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseCoreHandler.java index be3d27c7bb..a932cc56d9 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseCoreHandler.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseCoreHandler.java @@ -135,14 +135,16 @@ public Stream updateCaseListedInCcForReferToCourt(final List addDatesToAvoid(final String datesToAvoid, - final CaseAggregateState state, final String userProsecutingAuthority) { + final CaseAggregateState state, final String userProsecutingAuthority, + final List agentProsecutorAuthorityAccess) { return createRejectionEvents( null, "Add dates to avoid", null, state, - userProsecutingAuthority + userProsecutingAuthority, + agentProsecutorAuthorityAccess ).orElse(Stream.of(state.getDatesToAvoid() == null ? new DatesToAvoidAdded(state.getCaseId(), datesToAvoid) : new DatesToAvoidUpdated(state.getCaseId(), datesToAvoid))); diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandler.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandler.java index 2da5b3abff..4111b32da0 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandler.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandler.java @@ -31,6 +31,7 @@ import java.time.LocalDate; import java.time.ZonedDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -66,7 +67,8 @@ public Stream acknowledgeDefendantDetailsUpdates( final UUID defendantId, final ZonedDateTime acknowledgedAt, final CaseAggregateState state, - final String userProsecutingAuthority) { + final String userProsecutingAuthority, + final List agentProsecutorAuthorityAccess) { Object event; if (state.getCaseId() == null) { @@ -75,8 +77,19 @@ public Stream acknowledgeDefendantDetailsUpdates( } else if (defendantId != null && !state.hasDefendant(defendantId)) { LOGGER.warn("Defendant not found: {}", defendantId); event = new DefendantNotFound(defendantId, "Acknowledge defendant details updates"); - } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) || "ALL".equalsIgnoreCase(userProsecutingAuthority))) { - event = new ProsecutionAuthorityAccessDenied(userProsecutingAuthority, state.getProsecutingAuthority()); + } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) || + "ALL".equalsIgnoreCase(userProsecutingAuthority) || + (agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.stream().anyMatch(s-> s.equalsIgnoreCase(state.getProsecutingAuthority()))))) { + + final List prosecutorAuthorityAccess = new ArrayList<>(); + + if(agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.size() > 1) { + prosecutorAuthorityAccess.addAll(agentProsecutorAuthorityAccess); + } else { + prosecutorAuthorityAccess.add(userProsecutingAuthority); + } + + event = new ProsecutionAuthorityAccessDenied(state.getProsecutingAuthority(), prosecutorAuthorityAccess); } else { event = new DefendantDetailsUpdatesAcknowledged(state.getCaseId(), defendantId, acknowledgedAt); } diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtils.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtils.java index 5d21542f27..1af2d33d96 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtils.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtils.java @@ -12,6 +12,7 @@ import uk.gov.moj.cpp.sjp.event.DefendantNotFound; import uk.gov.moj.cpp.sjp.event.OffenceNotFound; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -35,7 +36,8 @@ public static Optional> createRejectionEvents(final UUID userId, final String action, final UUID defendantId, final CaseAggregateState state, - final String userProsecutingAuthority) { + final String userProsecutingAuthority, // initial + final List agentProsecutorAuthorityAccess) { // new Object event = null; if (isNull(state.getCaseId())) { LOGGER.warn("Case not found: {}", action); @@ -52,8 +54,19 @@ public static Optional> createRejectionEvents(final UUID userId, } else if (state.isCaseReferredForCourtHearing()) { LOGGER.warn("Update rejected because case is referred to court for hearing: {}", action); event = new CaseUpdateRejected(state.getCaseId(), CaseUpdateRejected.RejectReason.CASE_REFERRED_FOR_COURT_HEARING); - } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) || "ALL".equalsIgnoreCase(userProsecutingAuthority))) { - event = new ProsecutionAuthorityAccessDenied(userProsecutingAuthority, state.getProsecutingAuthority()); + } else if (!(state.getProsecutingAuthority().toUpperCase().startsWith(userProsecutingAuthority) || + "ALL".equalsIgnoreCase(userProsecutingAuthority) || + (agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.stream().anyMatch(s-> s.equalsIgnoreCase(state.getProsecutingAuthority()))))) { + + final List prosecutorAuthorityAccess = new ArrayList<>(); + + if(agentProsecutorAuthorityAccess != null && agentProsecutorAuthorityAccess.size() > 1) { + prosecutorAuthorityAccess.addAll(agentProsecutorAuthorityAccess); + } else { + prosecutorAuthorityAccess.add(userProsecutingAuthority); + } + + event = new ProsecutionAuthorityAccessDenied(state.getProsecutingAuthority(), prosecutorAuthorityAccess); } return Optional.ofNullable(event).map(Stream::of); diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandler.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandler.java index 54880515b5..6b39cd0ec8 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandler.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandler.java @@ -24,10 +24,11 @@ public class OffenceWithdrawalHandler { private OffenceWithdrawalHandler() { } - public Stream requestOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List withdrawalRequestsStatus, final CaseAggregateState state, final String prosecutionAuthority) { + public Stream requestOffenceWithdrawal(final UUID caseId, final UUID setBy, final ZonedDateTime setAt, final List withdrawalRequestsStatus, + final CaseAggregateState state, final String prosecutionAuthority, final List agentProsecutorAuthorityAccess) { return HandlerUtils. - createRejectionEvents(null, "Request Offence Withdrawal", null, state, prosecutionAuthority). + createRejectionEvents(null, "Request Offence Withdrawal", null, state, prosecutionAuthority, agentProsecutorAuthorityAccess). orElse(createWithdrawalEvents(caseId, setBy, setAt, withdrawalRequestsStatus, state)); } diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/AddDatesToAvoidTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/AddDatesToAvoidTest.java index 646326a0f5..c66cb101fc 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/AddDatesToAvoidTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/AddDatesToAvoidTest.java @@ -15,7 +15,9 @@ import uk.gov.moj.cpp.sjp.event.CaseUpdateRejected; import uk.gov.moj.cpp.sjp.event.DatesToAvoidAdded; import uk.gov.moj.cpp.sjp.event.DatesToAvoidUpdated; +import uk.gov.moj.cpp.sjp.event.ProsecutionAuthorityAccessDenied; +import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; @@ -32,7 +34,7 @@ public class AddDatesToAvoidTest extends CaseAggregateBaseTest { @Test public void datesToAvoidAddedEvent() { //when - final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, ALL).collect(toList()); + final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, ALL, null).collect(toList()); final DatesToAvoidAdded datesToAvoidAdded = (DatesToAvoidAdded) events.get(0); //then @@ -45,7 +47,7 @@ public void raiseDatesToAvoidUpdatedEvent() { datesToAvoidAddedEvent(DATES_TO_AVOID); //when - final List datesToAvoidUpdatedEvents = caseAggregate.addDatesToAvoid(DATES_TO_AVOID_UPDATED, ALL).collect(toList()); + final List datesToAvoidUpdatedEvents = caseAggregate.addDatesToAvoid(DATES_TO_AVOID_UPDATED, ALL, null).collect(toList()); final DatesToAvoidUpdated datesToAvoidUpdated = (DatesToAvoidUpdated) datesToAvoidUpdatedEvents.get(0); //then @@ -65,7 +67,7 @@ private void assertThatDatesToAvoidUpdatedEventWasRaised(List datesToAvo } private DatesToAvoidAdded datesToAvoidAddedEvent(final String datesToAvoid) { - final List datesToAvoidAddedEvents = caseAggregate.addDatesToAvoid(datesToAvoid, ALL).collect(toList()); + final List datesToAvoidAddedEvents = caseAggregate.addDatesToAvoid(datesToAvoid, ALL, null).collect(toList()); return (DatesToAvoidAdded) datesToAvoidAddedEvents.get(0); } @@ -76,7 +78,7 @@ public void caseCompletedDoesNotAcceptDatesToAvoid() { AggregateHelper.saveDecision(caseAggregate, aCase, session, VerdictType.FOUND_NOT_GUILTY); //when - final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, ALL).collect(toList()); + final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, ALL, null).collect(toList()); //then assertThat(events, hasSize(1)); @@ -91,7 +93,7 @@ public void caseAssignedDoesNotAcceptDatesToAvoid() { caseAggregate.assignCase(randomUUID(), clock.now(), CaseAssignmentType.DELEGATED_POWERS_DECISION); //when - final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, ALL).collect(toList()); + final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, ALL, null).collect(toList()); //then assertThat(events, hasSize(1)); @@ -103,7 +105,7 @@ public void caseAssignedDoesNotAcceptDatesToAvoid() { @Test public void caseNotFound() { //when - final List events = new CaseAggregate().addDatesToAvoid(DATES_TO_AVOID, ALL).collect(toList()); + final List events = new CaseAggregate().addDatesToAvoid(DATES_TO_AVOID, ALL, null).collect(toList()); //then assertThat(events, hasSize(1)); @@ -112,4 +114,38 @@ public void caseNotFound() { assertThat(datesToAvoidReceived.getDescription(), equalTo("Add dates to avoid")); } + @Test + public void prosecutionAuthorityAccessAllowedForAgent() { + //given an assigned case + caseAggregate.assignCase(randomUUID(), clock.now(), CaseAssignmentType.DELEGATED_POWERS_DECISION); + caseAggregate.getState().setAssigneeId(null); + + //when + final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, "TVL", Arrays.asList("TFL")).collect(toList()); + + //then + assertThat(events, hasSize(1)); + final DatesToAvoidAdded datesToAvoidAdded = (DatesToAvoidAdded) events.get(0); + assertThat(datesToAvoidAdded.getCaseId(), equalTo(caseId)); + assertThat(datesToAvoidAdded.getDatesToAvoid(), equalTo(DATES_TO_AVOID)); + } + + @Test + public void prosecutionAuthorityAccessDenied() { + //given an assigned case + caseAggregate.assignCase(randomUUID(), clock.now(), CaseAssignmentType.DELEGATED_POWERS_DECISION); + caseAggregate.getState().setAssigneeId(null); + + //when + final List events = caseAggregate.addDatesToAvoid(DATES_TO_AVOID, "TVL", Arrays.asList("XYZ", "TVL")).collect(toList()); + + //then + assertThat(events, hasSize(1)); + final ProsecutionAuthorityAccessDenied prosecutionAuthorityAccessDenied = (ProsecutionAuthorityAccessDenied) events.get(0); + + assertThat(prosecutionAuthorityAccessDenied.getCaseAuthority(), equalTo("TFL")); + assertThat(prosecutionAuthorityAccessDenied.getProsecutorAuthorityAccess().size(), equalTo(2)); + assertThat(prosecutionAuthorityAccessDenied.getProsecutorAuthorityAccess().get(0), equalTo("XYZ")); + assertThat(prosecutionAuthorityAccessDenied.getProsecutorAuthorityAccess().get(1), equalTo("TVL")); + } } diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAcknowledgeDefendantDetailsUpdatesTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAcknowledgeDefendantDetailsUpdatesTest.java index 8fd0326c1e..4a226db439 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAcknowledgeDefendantDetailsUpdatesTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAcknowledgeDefendantDetailsUpdatesTest.java @@ -20,14 +20,14 @@ public class CaseAcknowledgeDefendantDetailsUpdatesTest extends CaseAggregateBas @Test public void shouldAcknowledgeDefendantDetailsUpdates() { - when(caseAggregate.acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), ALL)) + when(caseAggregate.acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), ALL, null)) .thenExpect(new DefendantDetailsUpdatesAcknowledged(caseId, defendantId, clock.now())); } @Test public void shouldNotAcknowledgeDefendantDetailsUpdatesWhenDefendantNotFound() { final UUID anotherDefendantId = randomUUID(); - when(caseAggregate.acknowledgeDefendantDetailsUpdates(anotherDefendantId, clock.now(), ALL)) + when(caseAggregate.acknowledgeDefendantDetailsUpdates(anotherDefendantId, clock.now(), ALL, null)) .thenExpect(new DefendantNotFound(anotherDefendantId, "Acknowledge defendant details updates")); } @@ -37,7 +37,7 @@ public void shouldNotAcknowledgeDefendantDetailsUpdateWhenNoCaseReceived() { defendantId = randomUUID(); - when(caseAggregate.acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), ALL)) + when(caseAggregate.acknowledgeDefendantDetailsUpdates(defendantId, clock.now(), ALL, null)) .thenExpect(new CaseNotFound(caseId, "Acknowledge defendant details updates")); } 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..6e18e113a0 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 @@ -7,6 +7,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.fail; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import uk.gov.justice.core.courts.Hearing; @@ -22,7 +23,6 @@ import java.util.List; import java.util.stream.Stream; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonReader; @@ -43,6 +43,7 @@ public class CaseApplicationOffenceResultsTest extends CaseAggregateBaseTest { @InjectMocks private CaseAggregate caseAggregate; private CaseAggregateState caseAggregateState; + @BeforeEach @Override public void setUp() { @@ -51,12 +52,12 @@ public void setUp() { final JsonObject hearingPayload = getPayload(TEMPLATE_PAYLOAD_APPLICATION_HEARING_IN_AGGREGATE); final Hearing hearingObject = jsonObjectToObjectConverter.convert((JsonObject) hearingPayload.get("hearing"), Hearing.class); caseAggregateState.setApplicationResults(new ApplicationResultsRecorded(hearingObject, "2024-09-27", false, null, now())); - setField(caseAggregate,"state", caseAggregateState); + setField(caseAggregate, "state", caseAggregateState); super.setUp(); } @Test - public void saveApplicationOffencesResults(){ + public void saveApplicationOffencesResults() { final JsonObject hearingPayload = getPayload(TEMPLATE_PAYLOAD_HEARING); final Hearing hearingObject = jsonObjectToObjectConverter.convert((JsonObject) hearingPayload.get("hearing"), Hearing.class); final ApplicationOffencesResults applicationOffencesResults = @@ -77,8 +78,8 @@ public void saveApplicationOffencesResults(){ } @Test - public void shouldNotSaveApplicationOffencesResults_applicationResultsEmptyInState(){ - setField(caseAggregate,"state", new CaseAggregateState()); + public void shouldNotSaveApplicationOffencesResults_applicationResultsEmptyInState() { + setField(caseAggregate, "state", new CaseAggregateState()); final JsonObject hearingPayload = getPayload(TEMPLATE_PAYLOAD_HEARING); final Hearing hearingObject = jsonObjectToObjectConverter.convert((JsonObject) hearingPayload.get("hearing"), Hearing.class); final ApplicationOffencesResults applicationOffencesResults = @@ -98,7 +99,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 = createReader(new StringReader(request)); return reader.readObject(); } diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseListedInCriminalCourtsTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseListedInCriminalCourtsTest.java index fead389cf7..df24947a12 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseListedInCriminalCourtsTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseListedInCriminalCourtsTest.java @@ -24,6 +24,7 @@ import uk.gov.moj.cpp.sjp.domain.decision.OffenceDecisionInformation; import uk.gov.moj.cpp.sjp.domain.decision.ReferForCourtHearing; import uk.gov.moj.cpp.sjp.domain.verdict.VerdictType; +import uk.gov.moj.cpp.sjp.event.CaseCompleted; import uk.gov.moj.cpp.sjp.event.CaseListedInCriminalCourtsV2; import uk.gov.moj.cpp.sjp.event.CaseOffenceListedInCriminalCourts; import uk.gov.moj.cpp.sjp.event.CaseReceived; @@ -137,6 +138,14 @@ public void shouldNotCreateCaseListingInCriminalCourtsEvent() { assertThat(events, hasSize(0)); } + @Test + void caseCompletedBdfRaiseCorrectEvent() { + Stream caseCompletedBdf = caseAggregate.caseCompletedBdf(); + final List events = caseCompletedBdf.toList(); + assertThat(events, hasSize(2)); + assertThat(events.get(0), instanceOf(CaseCompleted.class)); + } + private CourtCentre createCourtCenter() { return CourtCentre.courtCentre() diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseReadinessTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseReadinessTest.java index 8af0936b1e..13ec0aa7a8 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseReadinessTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseReadinessTest.java @@ -50,7 +50,7 @@ public void shouldChangeStatusAfterPleadingGuiltyOnNotGuiltyOffences() { aCase.receiveCase(caseBuilder.build(), ZonedDateTime.now()); aCase.setPleas(CASE_ID, prepareSetPleas(offences, PleaType.GUILTY), randomUUID(), ZonedDateTime.now()); aCase.setPleas(CASE_ID, prepareSetPleas(offences, PleaType.NOT_GUILTY), randomUUID(), ZonedDateTime.now()); - aCase.addDatesToAvoid("not today", "ALL"); + aCase.addDatesToAvoid("not today", "ALL", null); final Stream eventsAfterGuiltYPlea = aCase.setPleas(CASE_ID, prepareSetPleas(offences, PleaType.GUILTY), randomUUID(), ZonedDateTime.now()); final List listOfEventsAfterGuiltyPlea = eventsAfterGuiltYPlea diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/PleadOnlineTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/PleadOnlineTest.java index 09e1f8ba9e..c974a52df9 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/PleadOnlineTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/PleadOnlineTest.java @@ -348,7 +348,7 @@ public void shouldStoreOnlinePleaWhenWithdrawalOffencesRequested() { final UUID userId = randomUUID(); final UUID withdrawalRequestReasonId = randomUUID(); caseAggregate.requestForOffenceWithdrawal(caseId, userId, ZonedDateTime.now(), - singletonList(new WithdrawalRequestsStatus(offenceId, withdrawalRequestReasonId)), "ALL"); + singletonList(new WithdrawalRequestsStatus(offenceId, withdrawalRequestReasonId)), "ALL", null); //when final PleadOnline pleadOnline = StoreOnlinePleaBuilder.defaultStoreOnlinePleaWithGuiltyPlea(offenceId, defendantId, null, null); @@ -375,9 +375,9 @@ public void shouldStoreOnlinePleaWhenWithdrawalOffencesRequestCancelled() { final UUID userId = randomUUID(); final UUID withdrawalRandomId = randomUUID(); caseAggregate.requestForOffenceWithdrawal(caseId, userId, ZonedDateTime.now(), - singletonList(new WithdrawalRequestsStatus(offenceId, withdrawalRandomId)), "ALL"); + singletonList(new WithdrawalRequestsStatus(offenceId, withdrawalRandomId)), "ALL", null); //cancel withdrawal request - caseAggregate.requestForOffenceWithdrawal(caseId, userId, ZonedDateTime.now(), emptyList(), "ALL"); + caseAggregate.requestForOffenceWithdrawal(caseId, userId, ZonedDateTime.now(), emptyList(), "ALL", null); //when final PleadOnline pleadOnline = StoreOnlinePleaBuilder.defaultStoreOnlinePleaWithGuiltyPlea(offenceId, defendantId, null, null); diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandlerComprehensiveTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandlerComprehensiveTest.java index c3af3ebd43..91af0d65ac 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandlerComprehensiveTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/CaseDefendantHandlerComprehensiveTest.java @@ -131,7 +131,7 @@ void shouldAcknowledgeDefendantDetailsUpdatesSuccessfully() { // when final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( - defendantId, acknowledgedAt, state, userProsecutingAuthority); + defendantId, acknowledgedAt, state, userProsecutingAuthority, null); // then final List eventList = eventStream.toList(); @@ -153,7 +153,7 @@ void shouldReturnCaseNotFoundWhenAcknowledgingDefendantDetailsUpdatesCaseNotFoun // when final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( - defendantId, acknowledgedAt, state, userProsecutingAuthority); + defendantId, acknowledgedAt, state, userProsecutingAuthority, null); // then final List eventList = eventStream.toList(); @@ -173,7 +173,7 @@ void shouldReturnDefendantNotFoundWhenAcknowledgingDefendantDetailsUpdatesDefend // when final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( - defendantId, acknowledgedAt, state, userProsecutingAuthority); + defendantId, acknowledgedAt, state, userProsecutingAuthority, null); // then final List eventList = eventStream.toList(); @@ -194,7 +194,49 @@ void shouldReturnProsecutionAuthorityAccessDeniedWhenAcknowledgingWithWrongAutho // when final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( - defendantId, acknowledgedAt, state, userProsecutingAuthority); + defendantId, acknowledgedAt, state, userProsecutingAuthority, null); + + // then + final List eventList = eventStream.toList(); + assertThat(eventList.size(), is(1)); + assertThat(eventList.get(0), instanceOf(ProsecutionAuthorityAccessDenied.class)); + } + + @Test + void shouldReturnProsecutionAuthorityAccessDeniedWhenAgentWithMultipleProsecutorsIsAcknowledgingWithWrongAuthority() { + // given + final UUID defendantId = UUID.randomUUID(); + final UUID caseId = UUID.randomUUID(); + final ZonedDateTime acknowledgedAt = ZonedDateTime.now(); + final String userProsecutingAuthority = "TFL"; + when(state.getCaseId()).thenReturn(caseId); + when(state.hasDefendant(defendantId)).thenReturn(true); + when(state.getProsecutingAuthority()).thenReturn("POLICE"); + + // when + final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( + defendantId, acknowledgedAt, state, userProsecutingAuthority, List.of("TFL", "XYZ")); + + // then + final List eventList = eventStream.toList(); + assertThat(eventList.size(), is(1)); + assertThat(eventList.get(0), instanceOf(ProsecutionAuthorityAccessDenied.class)); + } + + @Test + void shouldReturnProsecutionAuthorityAccessDeniedWhenAgentIsAcknowledgingWithWrongAuthority() { + // given + final UUID defendantId = UUID.randomUUID(); + final UUID caseId = UUID.randomUUID(); + final ZonedDateTime acknowledgedAt = ZonedDateTime.now(); + final String userProsecutingAuthority = "TFL"; + when(state.getCaseId()).thenReturn(caseId); + when(state.hasDefendant(defendantId)).thenReturn(true); + when(state.getProsecutingAuthority()).thenReturn("POLICE"); + + // when + final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( + defendantId, acknowledgedAt, state, userProsecutingAuthority, List.of("TFL")); // then final List eventList = eventStream.toList(); @@ -215,7 +257,7 @@ void shouldAcknowledgeDefendantDetailsUpdatesWithAllAuthority() { // when final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( - defendantId, acknowledgedAt, state, userProsecutingAuthority); + defendantId, acknowledgedAt, state, userProsecutingAuthority, null); // then final List eventList = eventStream.toList(); @@ -234,7 +276,7 @@ void shouldAcknowledgeDefendantDetailsUpdatesWithNullDefendantId() { // when final Stream eventStream = caseDefendantHandler.acknowledgeDefendantDetailsUpdates( - null, acknowledgedAt, state, userProsecutingAuthority); + null, acknowledgedAt, state, userProsecutingAuthority, null); // then final List eventList = eventStream.toList(); diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtilsTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtilsTest.java index 7efdee8233..9557add4eb 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtilsTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/HandlerUtilsTest.java @@ -20,6 +20,7 @@ import uk.gov.moj.cpp.sjp.domain.verdict.VerdictType; import uk.gov.moj.cpp.sjp.event.CaseUpdateRejected; import uk.gov.moj.cpp.sjp.event.CaseUpdateRejected.RejectReason; +import uk.gov.moj.cpp.sjp.event.ProsecutionAuthorityAccessDenied; import java.time.LocalDate; import java.time.ZonedDateTime; @@ -67,6 +68,49 @@ public void updateShouldBeRejectedWhenPleaIsForPostConvictionAdjournment() { assertEquals(expected, results); } + @Test + void updateShouldBeRejectedWhenTheAgenWithMultipleProsecutorsIsNotAuthorised() { + + final List offenceDecisions = Arrays.asList( + adjournOffenceDecision(OFFENCE_ID_1, PROVED_SJP), + withdrawOffenceDecision(OFFENCE_ID_2), + withdrawOffenceDecision(OFFENCE_ID_3) + ); + final List pleas = singletonList(new Plea(DEFENDANT_ID, OFFENCE_ID_1, PleaType.GUILTY)); + caseAggregateState.setPleas(pleas); + caseAggregateState.updateOffenceDecisions(offenceDecisions, randomUUID()); + caseAggregateState.updateOffenceConvictionDetails(ZonedDateTime.now().plusDays(7), offenceDecisions, null); + caseAggregateState.setProsecutingAuthority("XYZ"); + + final List results = HandlerUtils.createRejectionEvents(USER_ID, "action", DEFENDANT_ID, caseAggregateState, "TFL", List.of("TFL", "TVL")).get().toList(); + + final ProsecutionAuthorityAccessDenied prosecutionAuthorityAccessDenied = (ProsecutionAuthorityAccessDenied) results.get(0); + assertEquals("XYZ", prosecutionAuthorityAccessDenied.getCaseAuthority()); + assertEquals("TFL", prosecutionAuthorityAccessDenied.getProsecutorAuthorityAccess().get(0)); + assertEquals("TVL", prosecutionAuthorityAccessDenied.getProsecutorAuthorityAccess().get(1)); + } + + @Test + void updateShouldBeRejectedWhenTheAgentIsNotAuthorised() { + + final List offenceDecisions = Arrays.asList( + adjournOffenceDecision(OFFENCE_ID_1, PROVED_SJP), + withdrawOffenceDecision(OFFENCE_ID_2), + withdrawOffenceDecision(OFFENCE_ID_3) + ); + final List pleas = singletonList(new Plea(DEFENDANT_ID, OFFENCE_ID_1, PleaType.GUILTY)); + caseAggregateState.setPleas(pleas); + caseAggregateState.updateOffenceDecisions(offenceDecisions, randomUUID()); + caseAggregateState.updateOffenceConvictionDetails(ZonedDateTime.now().plusDays(7), offenceDecisions, null); + caseAggregateState.setProsecutingAuthority("XYZ"); + + final List results = HandlerUtils.createRejectionEvents(USER_ID, "action", DEFENDANT_ID, caseAggregateState, "TFL", List.of("TFL")).get().toList(); + + final ProsecutionAuthorityAccessDenied prosecutionAuthorityAccessDenied = (ProsecutionAuthorityAccessDenied) results.get(0); + assertEquals("XYZ", prosecutionAuthorityAccessDenied.getCaseAuthority()); + assertEquals("TFL", prosecutionAuthorityAccessDenied.getProsecutorAuthorityAccess().get(0)); + } + @Test public void updateShouldBeAllowedWhenPleaIsForPreConvictionAdjournment() { diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandlerTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandlerTest.java index 0830370abe..f23497cda4 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandlerTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/OffenceWithdrawalHandlerTest.java @@ -49,7 +49,8 @@ public void requestForOffenceWithdrawal() { final UUID offenceId = randomUUID(); offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId, withdrawalRequestReasonId)); final ZonedDateTime now = ZonedDateTime.now(); - final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); final List offenceWithdrawalList = convertWtihdrawalRequestsStatus(offenceWithdrawalDetails); assertThat(eventList, containsInAnyOrder(new OffencesWithdrawalRequestsStatusSet(caseID, now, user.getUserId(), offenceWithdrawalList), new OffenceWithdrawalRequested(caseID, offenceId, withdrawalRequestReasonId, user.getUserId(), now))); @@ -61,7 +62,8 @@ public void requestForOffenceWithdrawalOnACompletedCaseShouldBeRejected(){ final UUID offenceId = randomUUID(); final List offenceWithdrawalDetails = newArrayList(new WithdrawalRequestsStatus(offenceId, withdrawalRequestReasonId)); final ZonedDateTime now = ZonedDateTime.now(); - final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); assertThat(eventList, containsInAnyOrder( new CaseUpdateRejected(caseID, CaseUpdateRejected.RejectReason.CASE_COMPLETED) )); @@ -73,7 +75,8 @@ public void requestForOffenceWithdrawalOnAnAssignedCaseShouldBeRejected(){ final UUID offenceId = randomUUID(); final List offenceWithdrawalDetails = newArrayList(new WithdrawalRequestsStatus(offenceId, withdrawalRequestReasonId)); final ZonedDateTime now = ZonedDateTime.now(); - final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); assertThat(eventList, containsInAnyOrder( new CaseUpdateRejected(caseID, CaseUpdateRejected.RejectReason.CASE_ASSIGNED) )); @@ -89,7 +92,8 @@ public void requestForMultipleOffenceWithdrawal() { final UUID offenceId_2 = randomUUID(); offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId_2, withdrawalRequestReasonId)); final ZonedDateTime now = ZonedDateTime.now(); - final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), now, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); final List offenceWithdrawalList = convertWtihdrawalRequestsStatus(offenceWithdrawalDetails); assertThat(eventList, containsInAnyOrder(new OffencesWithdrawalRequestsStatusSet(caseID, now, user.getUserId(), offenceWithdrawalList), @@ -105,7 +109,8 @@ public void cancelOffenceWithdrawalRequest() { final List offenceWithdrawalDetails = new ArrayList<>(); final ZonedDateTime after2Days = ZonedDateTime.now().plusDays(2); - final List cancelEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List cancelEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); final List offenceWithdrawalList = convertWtihdrawalRequestsStatus(offenceWithdrawalDetails); @@ -128,7 +133,8 @@ public void cancelMultipleOffenceWithdrawalRequests() { offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId, withdrawalRequestReasonId)); offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId_1, withdrawalRequestReasonId)); final ZonedDateTime after2Days = ZonedDateTime.now().plusDays(2); - final List cancelEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List cancelEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); final List offenceWithdrawalList = convertWtihdrawalRequestsStatus(offenceWithdrawalDetails); assertThat(cancelEventList, containsInAnyOrder(new OffencesWithdrawalRequestsStatusSet(caseID, after2Days, user.getUserId(), offenceWithdrawalList), @@ -145,7 +151,8 @@ public void requestForOffenceWithdrawalWithDifferentReason() { final List offenceWithdrawalDetails = new ArrayList<>(); offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId, offenceNewWithdrawalRequestReasonId)); final ZonedDateTime after2Days = ZonedDateTime.now().plusDays(2); - final List reasonChangedEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List reasonChangedEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); final List offenceWithdrawalList = convertWtihdrawalRequestsStatus(offenceWithdrawalDetails); assertThat(reasonChangedEventList, containsInAnyOrder(new OffencesWithdrawalRequestsStatusSet(caseID, after2Days, user.getUserId(), offenceWithdrawalList), @@ -164,7 +171,8 @@ public void requestForMultipleOffenceWithdrawalWithDifferentReason() { offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId, offenceNewWithdrawalRequestReasonId)); offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId_1, offenceNewWithdrawalRequestReasonId)); final ZonedDateTime after2Days = ZonedDateTime.now().plusDays(2); - final List reasonChangedEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List reasonChangedEventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); final List offenceWithdrawalList = convertWtihdrawalRequestsStatus(offenceWithdrawalDetails); assertThat(reasonChangedEventList, containsInAnyOrder(new OffencesWithdrawalRequestsStatusSet(caseID, after2Days, user.getUserId(), offenceWithdrawalList), @@ -189,7 +197,8 @@ public void requestCancelAndReasonChangedForMultipleOffences() { offenceWithdrawalDetails.add(new WithdrawalRequestsStatus(offenceId_1, offenceNewWithdrawalRequestReasonId)); final ZonedDateTime after2Days = ZonedDateTime.now().plusDays(2); - final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, "ALL").collect(toList()); + final List eventList = offenceWithdrawalHandler.requestOffenceWithdrawal(caseID, user.getUserId(), after2Days, offenceWithdrawalDetails, caseAggregateState, + "ALL", new ArrayList<>()).collect(toList()); final List offenceWithdrawalList = convertWtihdrawalRequestsStatus(offenceWithdrawalDetails); assertThat(eventList, containsInAnyOrder(new OffencesWithdrawalRequestsStatusSet(caseID, after2Days, user.getUserId(), offenceWithdrawalList), diff --git a/sjp-domain/sjp-domain-common/pom.xml b/sjp-domain/sjp-domain-common/pom.xml index 2b80186f10..59730bbe27 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT diff --git a/sjp-domain/sjp-domain-event-processor/pom.xml b/sjp-domain/sjp-domain-event-processor/pom.xml index 4385a1774d..88e2d657d1 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-event/pom.xml b/sjp-domain/sjp-domain-event/pom.xml index 3b8a498e54..2470da3386 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT sjp-domain-event diff --git a/sjp-domain/sjp-domain-event/src/main/java/uk/gov/moj/cpp/sjp/domain/CaseCompleteBdf.java b/sjp-domain/sjp-domain-event/src/main/java/uk/gov/moj/cpp/sjp/domain/CaseCompleteBdf.java new file mode 100644 index 0000000000..a56defdbac --- /dev/null +++ b/sjp-domain/sjp-domain-event/src/main/java/uk/gov/moj/cpp/sjp/domain/CaseCompleteBdf.java @@ -0,0 +1,36 @@ +package uk.gov.moj.cpp.sjp.domain; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; +import java.util.UUID; + +import static org.apache.commons.lang3.builder.EqualsBuilder.reflectionEquals; +import static org.apache.commons.lang3.builder.HashCodeBuilder.reflectionHashCode; + +@SuppressWarnings("squid:S2384") +public class CaseCompleteBdf implements Serializable { + private static final long serialVersionUID = 1L; + + private UUID caseId; + + @JsonCreator + public CaseCompleteBdf(@JsonProperty("caseId") final UUID caseId) { + this.caseId = caseId; + } + + public UUID getCaseId() { + return caseId; + } + + @Override + public boolean equals(Object o) { + return reflectionEquals(this, o); + } + + @Override + public int hashCode() { + return reflectionHashCode(this); + } +} diff --git a/sjp-domain/sjp-domain-event/src/main/java/uk/gov/moj/cpp/sjp/event/ProsecutionAuthorityAccessDenied.java b/sjp-domain/sjp-domain-event/src/main/java/uk/gov/moj/cpp/sjp/event/ProsecutionAuthorityAccessDenied.java index 2ef6b8b741..1556bd1722 100644 --- a/sjp-domain/sjp-domain-event/src/main/java/uk/gov/moj/cpp/sjp/event/ProsecutionAuthorityAccessDenied.java +++ b/sjp-domain/sjp-domain-event/src/main/java/uk/gov/moj/cpp/sjp/event/ProsecutionAuthorityAccessDenied.java @@ -2,25 +2,30 @@ import uk.gov.justice.domain.annotation.Event; +import java.io.Serializable; +import java.util.List; + @Event(ProsecutionAuthorityAccessDenied.EVENT_NAME) -public class ProsecutionAuthorityAccessDenied { +public class ProsecutionAuthorityAccessDenied implements Serializable { + private static final long serialVersionUID = 1L; - private final String userAuthority; private final String caseAuthority; + private final List prosecutorAuthorityAccess; public static final String EVENT_NAME = "sjp.events.prosecution-authority-access-denied"; - public ProsecutionAuthorityAccessDenied(final String userAuthority, final String caseAuthority) { - this.userAuthority = userAuthority; + public ProsecutionAuthorityAccessDenied(final String caseAuthority, + final List prosecutorAuthorityAccess) { this.caseAuthority = caseAuthority; - } - - public String getUserAuthority() { - return userAuthority; + this.prosecutorAuthorityAccess = prosecutorAuthorityAccess; } public String getCaseAuthority() { return caseAuthority; } + + public List getProsecutorAuthorityAccess() { + return prosecutorAuthorityAccess; + } } 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..b52de100c5 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 @@ -1,10 +1,11 @@ package uk.gov.moj.cpp.sjp.event; import static java.util.UUID.randomUUID; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; import uk.gov.justice.domain.annotation.Event; @@ -14,7 +15,6 @@ import java.util.UUID; -import javax.json.Json; 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 = 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..eafdc75811 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 @@ -1,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event; import static java.util.UUID.randomUUID; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.fail; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; -import static uk.gov.justice.services.test.utils.core.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; import uk.gov.justice.domain.annotation.Event; @@ -16,7 +16,6 @@ import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import com.fasterxml.jackson.databind.MapperFeature; @@ -38,8 +37,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 = createObjectBuilder() + .add("session", 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..6aa9ff22b4 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 @@ -3,6 +3,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.domain.annotation.Event; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; @@ -10,7 +11,6 @@ import java.util.UUID; -import javax.json.Json; 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 = 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..e7826ea9b5 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 @@ -3,6 +3,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.domain.annotation.Event; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; @@ -10,7 +11,6 @@ import java.util.UUID; -import javax.json.Json; 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 = 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..1a70e2a6ac 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 @@ -3,6 +3,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.domain.annotation.Event; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; @@ -12,7 +13,6 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.Json; 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 = 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..83228045d3 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 @@ -3,17 +3,16 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.domain.annotation.Event; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; -import uk.gov.moj.cpp.sjp.domain.CaseAssignmentType; import uk.gov.moj.cpp.sjp.event.CourtReferralCreated; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -23,7 +22,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 = 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..f2a74a7f1e 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 @@ -3,6 +3,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.domain.annotation.Event; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; @@ -10,7 +11,6 @@ import java.util.UUID; -import javax.json.Json; 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 = 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 bf03d242be..21920da112 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT sjp-domain-prosecution diff --git a/sjp-domain/sjp-domain-transformation/pom.xml b/sjp-domain/sjp-domain-transformation/pom.xml index 1914d1a23d..99b4b3e1f2 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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 2b4026545c..f9e71f62f4 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..b956c166f1 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 @@ -5,6 +5,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory; @@ -13,7 +14,6 @@ import java.io.StringReader; import java.util.stream.Stream; -import javax.json.Json; 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 = createReader(new StringReader(jsonObjectStr)); JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; @@ -45,13 +45,13 @@ public void sjp_events_case_received() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.enterpriseId", is(inputJsonPath.getString("enterpriseId"))), - withJsonPath("$.prosecutingAuthority", is(inputJsonPath.getString("prosecutingAuthority"))), - withJsonPath("$.defendant.offences[*].libraOffenceCode", is(inputJsonPath.getList("defendant.offences.libraOffenceCode"))), - withJsonPath("$.defendant.gender", is(inputJsonPath.getString("defendant.gender"))), - withJsonPath("$.defendant.title", is(inputJsonPath.getString("defendant.title"))), - withJsonPath("$.defendant.hearingLanguage", is(inputJsonPath.getString("defendant.hearingLanguage"))) + withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), + withJsonPath("$.enterpriseId", is(inputJsonPath.getString("enterpriseId"))), + withJsonPath("$.prosecutingAuthority", is(inputJsonPath.getString("prosecutingAuthority"))), + withJsonPath("$.defendant.offences[*].libraOffenceCode", is(inputJsonPath.getList("defendant.offences.libraOffenceCode"))), + withJsonPath("$.defendant.gender", is(inputJsonPath.getString("defendant.gender"))), + withJsonPath("$.defendant.title", is(inputJsonPath.getString("defendant.title"))), + withJsonPath("$.defendant.hearingLanguage", is(inputJsonPath.getString("defendant.hearingLanguage"))) ) )); } @@ -62,8 +62,8 @@ public void sjp_events_defendant_details_moved_from_people() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.gender", is(inputJsonPath.getString("gender"))), - withJsonPath("$.title", is(inputJsonPath.getString("title"))) + withJsonPath("$.gender", is(inputJsonPath.getString("gender"))), + withJsonPath("$.title", is(inputJsonPath.getString("title"))) ) )); } @@ -74,9 +74,9 @@ public void sjp_events_financial_means_updated() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.income.frequency", is(inputJsonPath.getString("income.frequency"))), - withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))), - withJsonPath("$.outgoings[*].description", is(inputJsonPath.getList("outgoings.description"))) + withJsonPath("$.income.frequency", is(inputJsonPath.getString("income.frequency"))), + withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))), + withJsonPath("$.outgoings[*].description", is(inputJsonPath.getList("outgoings.description"))) ) )); } @@ -87,11 +87,11 @@ public void sjp_events_sjp_case_created() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.prosecutingAuthority", is(inputJsonPath.getString("prosecutingAuthority"))), - withJsonPath("$.initiationCode", is(inputJsonPath.getString("initiationCode"))), - withJsonPath("$.ptiUrn", is(inputJsonPath.getString("ptiUrn"))), - withJsonPath("$.summonsCode", is(inputJsonPath.getString("summonsCode"))) + withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), + withJsonPath("$.prosecutingAuthority", is(inputJsonPath.getString("prosecutingAuthority"))), + withJsonPath("$.initiationCode", is(inputJsonPath.getString("initiationCode"))), + withJsonPath("$.ptiUrn", is(inputJsonPath.getString("ptiUrn"))), + withJsonPath("$.summonsCode", is(inputJsonPath.getString("summonsCode"))) ) )); } @@ -102,11 +102,11 @@ public void sjp_events_online_plea_received() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.interpreterLanguage", is(inputJsonPath.getString("interpreterLanguage"))), - withJsonPath("$.outgoings[*].description", is(inputJsonPath.getList("outgoings.description"))), - withJsonPath("$.financialMeans.employmentStatus", is(inputJsonPath.getString("financialMeans.employmentStatus"))), - withJsonPath("$.financialMeans.income.frequency", is(inputJsonPath.getString("financialMeans.income.frequency"))) + withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), + withJsonPath("$.interpreterLanguage", is(inputJsonPath.getString("interpreterLanguage"))), + withJsonPath("$.outgoings[*].description", is(inputJsonPath.getList("outgoings.description"))), + withJsonPath("$.financialMeans.employmentStatus", is(inputJsonPath.getString("financialMeans.employmentStatus"))), + withJsonPath("$.financialMeans.income.frequency", is(inputJsonPath.getString("financialMeans.income.frequency"))) ) )); } @@ -117,10 +117,10 @@ public void sjp_events_case_marked_ready_for_decision() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))), - withJsonPath("$.markedAt", is(inputJsonPath.getString("markedAt"))), - withJsonPath("$.sessionType", is(inputJsonPath.getString("sessionType"))), - withJsonPath("$.priority", is(inputJsonPath.getString("priority"))) + withJsonPath("$.reason", is(inputJsonPath.getString("reason"))), + withJsonPath("$.markedAt", is(inputJsonPath.getString("markedAt"))), + withJsonPath("$.sessionType", is(inputJsonPath.getString("sessionType"))), + withJsonPath("$.priority", is(inputJsonPath.getString("priority"))) ) )); } @@ -131,14 +131,14 @@ public void sjp_events_decision_saved() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.offenceDecisions[*].type", is(inputJsonPath.getList("offenceDecisions.type"))), - withJsonPath("$.offenceDecisions[*].dischargedFor.unit", is(inputJsonPath.getList("offenceDecisions.dischargedFor.unit"))), - withJsonPath("$.financialImposition.payment.paymentType", is(inputJsonPath.getString("financialImposition.payment.paymentType"))), - withJsonPath("$.financialImposition.payment.reasonWhyNotAttachedOrDeducted", is(inputJsonPath.getString("financialImposition.payment.reasonWhyNotAttachedOrDeducted"))), - withJsonPath("$.financialImposition.payment.reasonForDeductingFromBenefits", is(inputJsonPath.getString("financialImposition.payment.reasonForDeductingFromBenefits"))), - withJsonPath("$.financialImposition.payment.fineTransferredTo.nationalCourtCode", is(inputJsonPath.getString("financialImposition.payment.fineTransferredTo.nationalCourtCode"))), - withJsonPath("$.financialImposition.payment.fineTransferredTo.nationalCourtName", is(inputJsonPath.getString("financialImposition.payment.fineTransferredTo.nationalCourtName"))), - withJsonPath("$.financialImposition.payment.paymentTerms.installments.period", is(inputJsonPath.getString("financialImposition.payment.paymentTerms.installments.period"))) + withJsonPath("$.offenceDecisions[*].type", is(inputJsonPath.getList("offenceDecisions.type"))), + withJsonPath("$.offenceDecisions[*].dischargedFor.unit", is(inputJsonPath.getList("offenceDecisions.dischargedFor.unit"))), + withJsonPath("$.financialImposition.payment.paymentType", is(inputJsonPath.getString("financialImposition.payment.paymentType"))), + withJsonPath("$.financialImposition.payment.reasonWhyNotAttachedOrDeducted", is(inputJsonPath.getString("financialImposition.payment.reasonWhyNotAttachedOrDeducted"))), + withJsonPath("$.financialImposition.payment.reasonForDeductingFromBenefits", is(inputJsonPath.getString("financialImposition.payment.reasonForDeductingFromBenefits"))), + withJsonPath("$.financialImposition.payment.fineTransferredTo.nationalCourtCode", is(inputJsonPath.getString("financialImposition.payment.fineTransferredTo.nationalCourtCode"))), + withJsonPath("$.financialImposition.payment.fineTransferredTo.nationalCourtName", is(inputJsonPath.getString("financialImposition.payment.fineTransferredTo.nationalCourtName"))), + withJsonPath("$.financialImposition.payment.paymentTerms.installments.period", is(inputJsonPath.getString("financialImposition.payment.paymentTerms.installments.period"))) ) )); } @@ -149,7 +149,7 @@ public void sjp_events_case_status_changed() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.caseStatus", is(inputJsonPath.getString("caseStatus"))) + withJsonPath("$.caseStatus", is(inputJsonPath.getString("caseStatus"))) ) )); } @@ -160,8 +160,8 @@ public void sjp_events_all_financial_means_updated() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.income.frequency", is(inputJsonPath.getString("income.frequency"))), - withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))) + withJsonPath("$.income.frequency", is(inputJsonPath.getString("income.frequency"))), + withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))) ) )); } @@ -172,7 +172,7 @@ public void sjp_events_case_assignment_requested() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.session.type", is(inputJsonPath.getString("session.type"))) + withJsonPath("$.session.type", is(inputJsonPath.getString("session.type"))) ) )); } @@ -183,7 +183,7 @@ public void sjp_events_case_document_uploaded() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.documentType", is(inputJsonPath.getString("documentType"))) + withJsonPath("$.documentType", is(inputJsonPath.getString("documentType"))) ) )); } @@ -194,8 +194,8 @@ public void sjp_events_case_referred_for_court_hearing() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.referredOffences[*].verdict", is(inputJsonPath.getList("referredOffences.verdict"))) + withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), + withJsonPath("$.referredOffences[*].verdict", is(inputJsonPath.getList("referredOffences.verdict"))) ) )); } @@ -206,7 +206,7 @@ public void sjp_events_employment_status_updated() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))) + withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))) ) )); } @@ -217,7 +217,7 @@ public void sjp_events_interpreter_for_defendant_updated() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.interpreter.language", is(inputJsonPath.getString("interpreter.language"))) + withJsonPath("$.interpreter.language", is(inputJsonPath.getString("interpreter.language"))) ) )); } @@ -228,9 +228,9 @@ public void sjp_events_magistrate_session_started() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.courtHouseCode", is(inputJsonPath.getString("courtHouseCode"))), - withJsonPath("$.courtHouseName", is(inputJsonPath.getString("courtHouseName"))), - withJsonPath("$.localJusticeAreaNationalCourtCode", is(inputJsonPath.getString("localJusticeAreaNationalCourtCode"))) + withJsonPath("$.courtHouseCode", is(inputJsonPath.getString("courtHouseCode"))), + withJsonPath("$.courtHouseName", is(inputJsonPath.getString("courtHouseName"))), + withJsonPath("$.localJusticeAreaNationalCourtCode", is(inputJsonPath.getString("localJusticeAreaNationalCourtCode"))) ) )); } @@ -241,7 +241,7 @@ public void sjp_events_pleaded_guilty() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.method", is(inputJsonPath.getString("method"))) + withJsonPath("$.method", is(inputJsonPath.getString("method"))) ) )); } @@ -252,7 +252,7 @@ public void sjp_events_pleaded_guilty_court_hearing_requested() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.method", is(inputJsonPath.getString("method"))) + withJsonPath("$.method", is(inputJsonPath.getString("method"))) ) )); } @@ -263,7 +263,7 @@ public void sjp_events_pleaded_not_guilty() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.method", is(inputJsonPath.getString("method"))) + withJsonPath("$.method", is(inputJsonPath.getString("method"))) ) )); } @@ -274,8 +274,8 @@ public void sjp_events_pleas_set() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.defendantCourtOptions.interpreter.language", is(inputJsonPath.getString("defendantCourtOptions.interpreter.language"))), - withJsonPath("$.pleas[*].pleaType", is(inputJsonPath.getList("pleas.pleaType"))) + withJsonPath("$.defendantCourtOptions.interpreter.language", is(inputJsonPath.getString("defendantCourtOptions.interpreter.language"))), + withJsonPath("$.pleas[*].pleaType", is(inputJsonPath.getList("pleas.pleaType"))) ) )); } @@ -286,7 +286,7 @@ public void sjp_events_case_assignment_created() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.caseAssignmentType", is(inputJsonPath.getString("caseAssignmentType"))) + withJsonPath("$.caseAssignmentType", is(inputJsonPath.getString("caseAssignmentType"))) ) )); } @@ -297,7 +297,7 @@ public void sjp_events_case_creation_failed_because_case_already_existed() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))) + withJsonPath("$.urn", is(inputJsonPath.getString("urn"))) ) )); } @@ -308,8 +308,8 @@ public void sjp_events_case_reopened_in_libra() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.libraCaseNumber", is(inputJsonPath.getString("libraCaseNumber"))), - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) + withJsonPath("$.libraCaseNumber", is(inputJsonPath.getString("libraCaseNumber"))), + withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) ) )); } @@ -320,8 +320,8 @@ public void sjp_events_case_reopened_in_libra_updated() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.libraCaseNumber", is(inputJsonPath.getString("libraCaseNumber"))), - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) + withJsonPath("$.libraCaseNumber", is(inputJsonPath.getString("libraCaseNumber"))), + withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) ) )); } @@ -332,7 +332,7 @@ public void sjp_events_case_update_rejected() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) + withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) ) )); } @@ -343,7 +343,7 @@ public void sjp_events_plea_update_denied() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.denialReason", is(inputJsonPath.getString("denialReason"))) + withJsonPath("$.denialReason", is(inputJsonPath.getString("denialReason"))) ) )); } @@ -354,8 +354,8 @@ public void sjp_events_decision_rejected() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.decision.offenceDecisions[*].type", is(inputJsonPath.getList("decision.offenceDecisions.type"))), - withJsonPath("$.decision.offenceDecisions[*].offenceDecisionInformation.verdict", is(inputJsonPath.getList("decision.offenceDecisions.offenceDecisionInformation.verdict"))) + withJsonPath("$.decision.offenceDecisions[*].type", is(inputJsonPath.getList("decision.offenceDecisions.type"))), + withJsonPath("$.decision.offenceDecisions[*].offenceDecisionInformation.verdict", is(inputJsonPath.getList("decision.offenceDecisions.offenceDecisionInformation.verdict"))) ) )); } @@ -366,7 +366,7 @@ public void sjp_events_case_document_added() { assertThat(anonymisedJsonObject.toString(), isJson(allOf( - withJsonPath("$.caseDocument.documentType", is(inputJsonPath.getString("caseDocument.documentType"))) + withJsonPath("$.caseDocument.documentType", is(inputJsonPath.getString("caseDocument.documentType"))) ) )); } 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 4a365f16af..392ca4fa48 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..7a985659fc 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 @@ -1,9 +1,11 @@ package uk.gov.moj.cpp; + import static org.hamcrest.CoreMatchers.everyItem; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.isIn; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.justice.tools.eventsourcing.transformation.api.Action.NO_ACTION; import static uk.gov.justice.tools.eventsourcing.transformation.api.Action.TRANSFORM; @@ -11,11 +13,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.BaseEventTransformer; -import java.io.StringReader; import java.util.Map; import java.util.stream.Stream; -import javax.json.Json; import javax.json.JsonObject; public class EventTransformerTestHelper { @@ -35,13 +35,13 @@ public void transformEventAndAssertPayload(final String inputJsonPayloadResource final Stream transformedJsonEnvelopeStream = eventTransformer.apply(eventEnvelope); assertPayloadEquals(expectedJsonObject, transformedJsonEnvelopeStream.findFirst().get().payloadAsJsonObject()); - assertThat(TRANSFORM,equalTo(eventTransformer.actionFor(eventEnvelope))); - assertThat(NO_ACTION,equalTo(eventTransformer.actionFor(expectedEnvelope))); + assertThat(TRANSFORM, equalTo(eventTransformer.actionFor(eventEnvelope))); + assertThat(NO_ACTION, equalTo(eventTransformer.actionFor(expectedEnvelope))); } private JsonEnvelope buildEnvelopeFromJsonResource(final String fileName) { - final JsonObject payload = Json.createReader(CaseReceivedEventTransformerTest.class + final JsonObject payload = 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 c55dab41b4..93222a7747 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT ../pom.xml 4.0.0 diff --git a/sjp-event/pom.xml b/sjp-event/pom.xml index c56fa97bb4..e0f57bb5bb 100644 --- a/sjp-event/pom.xml +++ b/sjp-event/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-indexer/pom.xml b/sjp-event/sjp-event-indexer/pom.xml index 482039748f..b97bb64bef 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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 47c8cce844..c5b854c9c0 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..7cbfb8b037 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 @@ -5,6 +5,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; @@ -24,8 +25,6 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; @@ -62,7 +61,7 @@ public void shouldHandleAocpPleasSet() throws JsonProcessingException { offenceDetail.setId(offenceId); offenceDetail.setSequenceNumber(1); - final DefendantDetail defendantDetail =new DefendantDetail(); + final DefendantDetail defendantDetail = new DefendantDetail(); defendantDetail.setOffences(asList(offenceDetail)); final CaseDetail caseDetail = new CaseDetail(); @@ -78,6 +77,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", 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..6c7b7ebdac 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 @@ -1,13 +1,23 @@ package uk.gov.moj.cpp.sjp.event.listener; -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 static java.util.UUID.fromString; +import static java.util.UUID.randomUUID; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; +import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; +import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; +import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; +import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; +import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationStatus.REOPENING_PENDING; +import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationType.REOPENING; +import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationType.STAT_DEC; + import uk.gov.justice.core.courts.ApplicationStatus; import uk.gov.justice.core.courts.CourtApplication; import uk.gov.justice.core.courts.CourtApplicationParty; @@ -27,28 +37,17 @@ import java.time.LocalDate; import java.util.UUID; -import static java.util.UUID.fromString; -import static java.util.UUID.randomUUID; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; -import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; -import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; -import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; -import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationStatus.*; -import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationType.REOPENING; -import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationType.STAT_DEC; - -import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; +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 CaseApplicationListenerTest { 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..b56e4fa753 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,16 +1,13 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import org.junit.jupiter.api.BeforeEach; import uk.gov.justice.json.schemas.domains.sjp.Gender; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.LocalDates; @@ -44,8 +41,8 @@ import javax.json.JsonObject; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.RandomStringUtils; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; 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..2fd9c47e85 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,15 +4,15 @@ 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 org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.CaseReadinessReason.PIA; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; @@ -41,7 +41,6 @@ import javax.json.JsonObject; -import com.google.common.collect.Sets; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; 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..ed45557eac 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.common.converter.JsonObjectToObjectConverter; 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..3b45ca6725 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createObjectBuilder; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; 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..c8b0597c60 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,13 +2,13 @@ import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.common.converter.JsonObjectToObjectConverter; 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..2e5b47497d 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,13 +2,13 @@ import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.common.converter.JsonObjectToObjectConverter; 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..3ced4183ee 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,17 +1,17 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.any; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; 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..f7eeaaf18f 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,13 +1,13 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataOf; import uk.gov.justice.services.messaging.JsonEnvelope; 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..700bd482e6 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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-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..91271925ca 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,14 +1,14 @@ package uk.gov.moj.cpp.sjp.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.util.Clock; 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..2fffe8b0dc 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 @@ -8,6 +8,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +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.common.converter.JsonObjectToObjectConverter; @@ -15,7 +16,6 @@ import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder; -import uk.gov.moj.cpp.sjp.domain.Interpreter; import uk.gov.moj.cpp.sjp.event.InterpreterCancelledForDefendant; import uk.gov.moj.cpp.sjp.event.InterpreterUpdatedForDefendant; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; @@ -28,8 +28,6 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -87,7 +85,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) + 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..77abe599cd 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,20 +2,16 @@ import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.sjp.domain.Address; -import uk.gov.moj.cpp.sjp.domain.ContactDetails; -import uk.gov.moj.cpp.sjp.domain.legalentity.LegalEntityDefendant; -import uk.gov.moj.cpp.sjp.domain.onlineplea.PleadOnline; import uk.gov.moj.cpp.sjp.event.listener.converter.DefendantToDefendantDetails; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.OnlinePlea; 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..63435d467a 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 @@ -2,11 +2,12 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.moj.cpp.sjp.domain.disability.DisabilityNeeds.disabilityNeedsOf; @@ -23,7 +24,6 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import com.fasterxml.jackson.core.JsonProcessingException; @@ -78,7 +78,7 @@ private void whenItIsPickedUpByListener(final JsonEnvelope envelope) { private JsonEnvelope givenPleasSetEventWasRaised() throws JsonProcessingException { final PleasSet pleasSet = new PleasSet(randomUUID(), - new DefendantCourtOptions(null,false, disabilityNeedsOf(DISABILITY_NEEDS)), + new DefendantCourtOptions(null, false, disabilityNeedsOf(DISABILITY_NEEDS)), singletonList(new Plea(randomUUID(), randomUUID(), PleaType.GUILTY))); return createEnvelope("sjp.events.pleas-set", convertToJsonObject(pleasSet)); @@ -87,9 +87,8 @@ 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 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..2332d0d73a 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,15 +2,13 @@ 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 org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.ArgumentMatchers.isNotNull; -import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; import static uk.gov.moj.cpp.sjp.domain.DocumentLanguage.ENGLISH; 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..fc462957be 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,13 +2,13 @@ import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; 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.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.CaseReadinessReason.PIA; import static uk.gov.moj.cpp.sjp.domain.CaseReadinessReason.PLEADED_GUILTY; 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..0fb0c42e12 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,14 +1,14 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static java.math.BigDecimal.valueOf; +import static java.util.Arrays.asList; +import static java.util.UUID.randomUUID; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static java.util.UUID.randomUUID; -import static java.util.Arrays.asList; -import static java.math.BigDecimal.valueOf; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; @@ -21,7 +21,6 @@ import uk.gov.moj.cpp.sjp.persistence.entity.OffenceDetail; import uk.gov.moj.cpp.sjp.persistence.repository.OffenceRepository; -import java.math.BigDecimal; import java.util.UUID; import javax.json.JsonObject; 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..30a87121a0 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,14 +2,14 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; 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..a8a500a754 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.listener; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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..31c5c3f51c 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,6 @@ 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 org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -14,6 +12,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.DELTA; diff --git a/sjp-event/sjp-event-processor/pom.xml b/sjp-event/sjp-event-processor/pom.xml index 3c3609119f..6d04227f95 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..5817bc73ec 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,8 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +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.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.REASON; @@ -26,7 +27,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; 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 = 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..d786a600bf 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 @@ -3,6 +3,7 @@ import static java.util.Objects.nonNull; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.APPLICATION_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.APPLICATION_REFERENCE; @@ -16,7 +17,6 @@ import uk.gov.moj.cpp.sjp.event.processor.service.enforcementnotification.EnforcementNotificationService; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import org.slf4j.Logger; @@ -46,13 +46,13 @@ public class CaseApplicationRecordedProcessor { public void handleCaseApplicationRecorded(final JsonEnvelope jsonEnvelope) { final JsonObject payload = jsonEnvelope.payloadAsJsonObject(); final CaseApplicationRecorded caseApplicationRecorded = jsonObjectToObjectConverter.convert(payload, CaseApplicationRecorded.class); - if(nonNull(caseApplicationRecorded.getCourtApplication()) && nonNull(caseApplicationRecorded.getCourtApplication().getApplicationReference())) { + if (nonNull(caseApplicationRecorded.getCourtApplication()) && nonNull(caseApplicationRecorded.getCourtApplication().getApplicationReference())) { final String applicationId = caseApplicationRecorded.getCourtApplication().getId().toString(); if (LOGGER.isDebugEnabled()) { LOGGER.debug("Stat dec application recorded for applicationId : {}", applicationId); } - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = 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..14b3a76520 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,10 +1,10 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; 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/CaseDecisionProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java index 20f2e5586b..cf7dd3dbaa 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 @@ -1,7 +1,20 @@ package uk.gov.moj.cpp.sjp.event.processor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static java.time.temporal.ChronoUnit.DAYS; +import static java.util.Objects.isNull; +import static java.util.Objects.nonNull; +import static java.util.Optional.ofNullable; +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; +import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.event.processor.results.converter.judicialresult.JCaseResultsConstants.DATE_FORMAT; +import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JPrompt.LSUM_DATE; +import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JResultCode.LSUM; +import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JudicialResultHelper.getResultText; +import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.aggregator.DecisionResultAggregator.OUTGOING_PROMPT_DATE_FORMAT; import uk.gov.justice.core.courts.DefendantJudicialResult; import uk.gov.justice.core.courts.JudicialResult; @@ -24,13 +37,6 @@ import uk.gov.moj.cpp.sjp.event.processor.results.converter.SjpToHearingConverter; import uk.gov.moj.cpp.sjp.event.processor.service.SjpService; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; - import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; @@ -41,21 +47,14 @@ import java.util.UUID; import java.util.stream.Collectors; -import static java.time.temporal.ChronoUnit.DAYS; -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.core.courts.DefendantJudicialResult.defendantJudicialResult; -import static uk.gov.justice.hearing.courts.HearingResulted.hearingResulted; -import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; -import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; -import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCaseResultsConstants.DATE_FORMAT; -import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JPrompt.LSUM_DATE; -import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JResultCode.LSUM; -import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JudicialResultHelper.getResultText; -import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.aggregator.DecisionResultAggregator.OUTGOING_PROMPT_DATE_FORMAT; +import javax.inject.Inject; +import javax.json.JsonArrayBuilder; +import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; +import javax.json.JsonValue; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServiceComponent(Component.EVENT_PROCESSOR) public class CaseDecisionProcessor { @@ -305,7 +304,7 @@ protected LocalDate convertToLocalDate(final String value) { } private static JsonObject removeProperty(JsonObject origin, String key) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = 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..2f9df8917d 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,9 +1,9 @@ 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.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +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.DOCUMENT_REFERENCE; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.DOCUMENT_TYPE; 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..de81dce659 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 @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; +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; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -9,7 +11,6 @@ import uk.gov.moj.cpp.sjp.event.CaseDocumentAdded; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -48,7 +49,7 @@ public void handleDuplicateCaseDocumentAddedEvent(final JsonEnvelope jsonEnvelop } private JsonObject getCaseDocumentPublicEventPayload(String caseId, JsonObject caseDocument) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + final JsonObjectBuilder jsonObjectBuilder = 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..a99fea2f1a 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,11 +2,11 @@ import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import uk.gov.justice.json.schemas.domains.sjp.NoteType; 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..935a1ac823 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import uk.gov.justice.services.core.annotation.FrameworkComponent; 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..1defd0ef31 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 @@ -5,14 +5,15 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.getBoolean; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.DEFENDANT; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.EXPECTED_DATE_READY; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.POSTING_DATE; -import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.URN; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.PROSECUTING_AUTHORITY; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.PROSECUTOR_AOCP_APPROVED; +import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.URN; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.core.annotation.Component; @@ -37,7 +38,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -87,7 +87,7 @@ public void handleCaseReceivedEvent(final JsonEnvelope event) { final LocalDate postingDate = LocalDate.parse(event.payloadAsJsonObject().getString(POSTING_DATE)); final LocalDate expectedDateReady = LocalDate.parse(event.payloadAsJsonObject().getString(EXPECTED_DATE_READY)); final String prosecutingAuthority = event.payloadAsJsonObject().getString(PROSECUTING_AUTHORITY); - final Defendant defendant = jsonObjectConverter.convert(event.payloadAsJsonObject().getJsonObject(DEFENDANT), Defendant.class); + final Defendant defendant = jsonObjectConverter.convert(event.payloadAsJsonObject().getJsonObject(DEFENDANT), Defendant.class); resolveCaseAOCPEligibility(event, caseId, prosecutingAuthority, defendant, postingDate); @@ -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 = 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 = createObjectBuilder() .add("id", caseId.toString()) .add("postingDate", postingDate.toString()) .build(); @@ -131,13 +131,13 @@ 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 = createObjectBuilder(); payloadBuilder.add("CaseReference", caseId); try { this.azureFunctionService.relayCaseOnCPP(payloadBuilder.build().toString()); } catch (IOException ex) { - LOGGER.error("Error relaying case to court store.",ex); - } + LOGGER.error("Error relaying case to court store.", ex); + } } } 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..caf5eaac6c 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 @@ -1,7 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static java.util.Objects.nonNull; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; + import uk.gov.justice.core.courts.CourtApplication; import uk.gov.justice.core.courts.CourtApplicationCase; import uk.gov.justice.core.courts.LinkType; @@ -13,16 +18,12 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; -import static java.util.Objects.nonNull; -import static org.apache.commons.lang3.StringUtils.isNotBlank; -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; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -@SuppressWarnings({"squid:S1188","squid:S3776"}) +@SuppressWarnings({"squid:S1188", "squid:S3776"}) @ServiceComponent(EVENT_PROCESSOR) public class CourtApplicationCreatedProcessor { @@ -64,7 +65,7 @@ public void courtApplicationCreated(final JsonEnvelope jsonEnvelope) { applicationStatus = ApplicationStatus.APPEAL_PENDING.name(); } if (isNotBlank(applicationStatus)) { - final JsonObject applicationStatusPayload = Json.createObjectBuilder() + final JsonObject applicationStatusPayload = createObjectBuilder() .add("caseId", sjpCaseId) .add("applicationId", applicationId) .add("applicationStatus", applicationStatus) @@ -77,9 +78,9 @@ 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 = createObjectBuilder() .add("caseId", sjpCaseId) - .add("listedInCriminalCourts",true) + .add("listedInCriminalCourts", true) .build(); final JsonEnvelope envelopeToSend = envelopeFrom( metadataFrom(jsonEnvelope.metadata()).withName("sjp.command.update-case-listed-in-cc"), @@ -88,5 +89,5 @@ public void courtApplicationCreated(final JsonEnvelope jsonEnvelope) { }); } - } + } } 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..a026882a64 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,17 +1,13 @@ package uk.gov.moj.cpp.sjp.event.processor; +import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.AOCP_ACCEPTED_EMAIL_NOTIFICATION; -import static java.time.LocalDate.now; -import java.time.LocalDate; -import java.time.ZonedDateTime; -import javax.inject.Inject; -import javax.json.JsonObject; import uk.gov.justice.services.common.configuration.Value; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.core.annotation.Handles; @@ -26,6 +22,12 @@ import uk.gov.moj.cpp.sjp.event.processor.service.SystemIdMapperService; import uk.gov.moj.cpp.sjp.event.processor.service.timers.TimerService; +import java.time.LocalDate; +import java.time.ZonedDateTime; + +import javax.inject.Inject; +import javax.json.JsonObject; + @ServiceComponent(EVENT_PROCESSOR) public class DefendantAcceptedAocpProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java index 4378bb3acd..87f353e0d5 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java @@ -1,8 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor; 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.Envelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -10,7 +11,6 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -67,7 +67,7 @@ public void handleDefendantDetailsUpdateRequestAccepted(final JsonEnvelope envel } private JsonObject buildCommandPayload(final JsonObject eventPayload) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder() + final JsonObjectBuilder payloadBuilder = createObjectBuilder() .add(CASE_ID, eventPayload.getString(CASE_ID)) .add(DEFENDANT_ID, eventPayload.getString(DEFENDANT_ID)); @@ -125,7 +125,7 @@ private boolean isPresentAndNotNull(final JsonObject jsonObject, final String ke } private void addIfPresent(final JsonObjectBuilder builder, final JsonObject source, - final String sourceKey, final String targetKey) { + final String sourceKey, final String targetKey) { if (source.containsKey(sourceKey) && !source.isNull(sourceKey)) { try { final String value = source.getString(sourceKey, null); 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..07004d98ef 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; 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/DeleteCaseDocumentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java index d6d6e6c87c..6d6c2b07fd 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 @@ -1,5 +1,10 @@ package uk.gov.moj.cpp.sjp.event.processor; +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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; + import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -8,11 +13,6 @@ import javax.inject.Inject; -import static javax.json.Json.createObjectBuilder; -import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; -import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; -import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; - @ServiceComponent(EVENT_PROCESSOR) public class DeleteCaseDocumentProcessor { 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..5a1cec5d78 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.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.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.DEFENDANT_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..c5d3d8e63c 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,10 +2,10 @@ import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.ENDORSEMENT_REMOVAL_NOTIFICATION; 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/EnforcementPendingApplicationNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java index 729fc262c2..3f51aadabb 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,10 +3,10 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.ENFORCEMENT_PENDING_APPLICATION_NOTIFICATION; import uk.gov.justice.json.schemas.domains.sjp.ApplicationType; 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..40646b282d 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; 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/HearingResultReceivedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java index 4c0231dc56..7c6f428096 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 @@ -5,6 +5,7 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.core.courts.CourtApplication; import uk.gov.justice.core.courts.CourtApplicationCase; @@ -22,7 +23,6 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; 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 = 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..7d2d5f1445 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 @@ -5,6 +5,7 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.core.courts.CourtApplication; import uk.gov.justice.core.courts.CourtApplicationCase; @@ -22,7 +23,6 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import org.slf4j.Logger; @@ -52,9 +52,9 @@ public void hearingResultReceived(final JsonEnvelope jsonEnvelope) { return; } - if (hearing.getProsecutionCases() != null && hearing.getProsecutionCases().stream().anyMatch(e-> Objects.nonNull(e.getMigrationSourceSystem()))){ + if (hearing.getProsecutionCases() != null && hearing.getProsecutionCases().stream().anyMatch(e -> Objects.nonNull(e.getMigrationSourceSystem()))) { LOGGER.info("public.events.hearing.hearing-resulted has migrationsource system. Hence ignoring"); - return ; + return; } LOGGER.info("public.events.hearing.hearing-resulted processing start"); @@ -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 = 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..4195c0fd18 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,10 +1,10 @@ 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.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +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.service.NotificationNotifyDocumentType.AOCP_ACCEPTED_EMAIL_NOTIFICATION; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.ENDORSEMENT_REMOVAL_NOTIFICATION; 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..11d794469c 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,10 +1,10 @@ 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.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.getString; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.PARTIAL_AOCP_CRITERIA_NOTIFICATION; 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..2c1b4a2441 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,8 +2,8 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.common.configuration.Value; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; 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..e9b2b6d5fe 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,10 +1,10 @@ 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.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.GUILTY; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.GUILTY_REQUEST_HEARING; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.NOT_GUILTY; 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..527a180742 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 @@ -12,11 +12,11 @@ import static org.apache.commons.lang3.StringUtils.SPACE; 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.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.COMPLETED; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.REFERRED_FOR_COURT_HEARING; - import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter; @@ -36,7 +36,6 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -93,7 +92,7 @@ public void pleadOnline(final JsonEnvelope envelope) { checkValidationErrors(validationErrors); final JsonObjectBuilder pleaOnlineObjectBuilder = createObjectBuilderWithFilter(payload, field -> !asList(PERSONAL_DETAILS, EMPLOYER).contains(field)); - if (payload.containsKey(PERSONAL_DETAILS)) { + if (payload.containsKey(PERSONAL_DETAILS)) { pleaOnlineObjectBuilder.add(PERSONAL_DETAILS, replacePostcodeInPayload(payload, PERSONAL_DETAILS)); } @@ -190,15 +189,15 @@ private Boolean checkCaseAdjournedTo(final JsonObject caseDetail) { } private static boolean hasEmptyFinancialMeans(final JsonObject pleadOnline) { - return ! pleadOnline.containsKey(FINANCIAL_MEANS) || - ! pleadOnline.getJsonObject(FINANCIAL_MEANS).containsKey("benefits") || - ! pleadOnline.getJsonObject(FINANCIAL_MEANS).containsKey("income") || + return !pleadOnline.containsKey(FINANCIAL_MEANS) || + !pleadOnline.getJsonObject(FINANCIAL_MEANS).containsKey("benefits") || + !pleadOnline.getJsonObject(FINANCIAL_MEANS).containsKey("income") || StringUtils.isEmpty(pleadOnline.getJsonObject(FINANCIAL_MEANS).getString("employmentStatus", null)); } private static boolean hasEmptyLegalEntityFinancialMeans(final JsonObject pleadOnline) { - return ! pleadOnline.containsKey("legalEntityFinancialMeans") || - ! pleadOnline.getJsonObject("legalEntityFinancialMeans").containsKey("netTurnover"); + return !pleadOnline.containsKey("legalEntityFinancialMeans") || + !pleadOnline.getJsonObject("legalEntityFinancialMeans").containsKey("netTurnover"); } private void checkValidationErrors(Map> validationErrors) { @@ -208,7 +207,7 @@ private void checkValidationErrors(Map> validationErrors) { } private JsonObject getCaseDetail(final JsonEnvelope envelope) { - final JsonObject queryCasePayload = Json.createObjectBuilder() + final JsonObject queryCasePayload = 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..175cb2d0b6 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,12 +8,12 @@ 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 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; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.DocumentLanguage.WELSH; import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.FULL; import static uk.gov.moj.cpp.sjp.event.processor.DateTimeUtil.DATE_FORMAT; @@ -45,10 +45,11 @@ import java.io.ByteArrayInputStream; import java.time.LocalDate; import java.time.format.DateTimeParseException; -import java.util.*; +import java.util.List; +import java.util.Optional; +import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -179,7 +180,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 = 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..de17e04a88 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,8 +1,8 @@ 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.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; 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/SJPDefendantUpdatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessor.java index e966f1d285..598f1026aa 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessor.java @@ -1,8 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor; 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.Envelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -10,7 +11,6 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -58,7 +58,7 @@ public void handleCaseDefendantChanged(final JsonEnvelope jsonEnvelope) { final JsonObject personDefendant = defendant.getJsonObject("personDefendant"); final JsonObject legalEntityDefendant = defendant.getJsonObject("legalEntityDefendant"); - + if (personDefendant == null && legalEntityDefendant == null) { LOGGER.info("No personDefendant or legalEntityDefendant found in event, skipping update"); return; @@ -83,9 +83,9 @@ public void handleCaseDefendantChanged(final JsonEnvelope jsonEnvelope) { } } - private JsonObject buildCommandPayload(final JsonObject defendant, final String prosecutionCaseId, - final JsonObject personDefendant, final JsonObject legalEntityDefendant) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder() + private JsonObject buildCommandPayload(final JsonObject defendant, final String prosecutionCaseId, + final JsonObject personDefendant, final JsonObject legalEntityDefendant) { + final JsonObjectBuilder payloadBuilder = createObjectBuilder() .add("caseId", prosecutionCaseId) .add("defendantId", defendant.getString("id")); @@ -100,8 +100,8 @@ private JsonObject buildCommandPayload(final JsonObject defendant, final String return payloadBuilder.build(); } - private void addPersonDefendantData(final JsonObjectBuilder payloadBuilder, final JsonObject personDefendant, - final JsonObject defendant) { + private void addPersonDefendantData(final JsonObjectBuilder payloadBuilder, final JsonObject personDefendant, + final JsonObject defendant) { final JsonObject personDetails = personDefendant.getJsonObject("personDetails"); if (personDetails != null) { addPersonDetails(payloadBuilder, personDetails); @@ -130,7 +130,7 @@ private void addContactDetails(final JsonObjectBuilder payloadBuilder, final Jso return; } - final JsonObjectBuilder contactNumberBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder contactNumberBuilder = createObjectBuilder(); addIfPresent(contactNumberBuilder, contact, "home", "home"); addIfPresent(contactNumberBuilder, contact, MOBILE, MOBILE); addIfPresent(contactNumberBuilder, contact, "work", "business"); @@ -151,7 +151,7 @@ private void addAddressIfPresent(final JsonObjectBuilder payloadBuilder, final J } private void addDefendantAddressIfNeeded(final JsonObjectBuilder payloadBuilder, final JsonObject personDefendant, - final JsonObject defendant) { + final JsonObject defendant) { final JsonObject personDetailsForAddress = personDefendant.getJsonObject("personDetails"); if (personDetailsForAddress == null || personDetailsForAddress.getJsonObject(ADDRESS) == null) { addAddressIfPresent(payloadBuilder, defendant, ADDRESS); @@ -159,19 +159,19 @@ private void addDefendantAddressIfNeeded(final JsonObjectBuilder payloadBuilder, } private void addLegalEntityDefendantData(final JsonObjectBuilder payloadBuilder, final JsonObject legalEntityDefendant) { - final JsonObjectBuilder legalEntityBuilder = Json.createObjectBuilder(); - + final JsonObjectBuilder legalEntityBuilder = createObjectBuilder(); + // Handle Organisation structure (legalEntityDefendant.organisation.name, etc.) final JsonObject organisation = legalEntityDefendant.getJsonObject("organisation"); if (organisation != null) { // Extract from organisation addIfPresent(legalEntityBuilder, organisation, "name", "name"); addAddressIfPresent(legalEntityBuilder, organisation, ADDRESS); - + final JsonObject contact = organisation.getJsonObject("contact"); if (contact != null) { // Convert ContactNumber to contactDetails format - final JsonObjectBuilder contactDetailsBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder contactDetailsBuilder = createObjectBuilder(); addIfPresent(contactDetailsBuilder, contact, "home", "home"); addIfPresent(contactDetailsBuilder, contact, MOBILE, MOBILE); addIfPresent(contactDetailsBuilder, contact, "work", "business"); @@ -182,32 +182,32 @@ private void addLegalEntityDefendantData(final JsonObjectBuilder payloadBuilder, legalEntityBuilder.add(CONTACT_DETAILS, contactDetails); } } - + addIfPresent(legalEntityBuilder, organisation, INCORPORATION_NUMBER, INCORPORATION_NUMBER); } else { // Handle flat structure (for backward compatibility) addIfPresent(legalEntityBuilder, legalEntityDefendant, "name", "name"); addAddressIfPresent(legalEntityBuilder, legalEntityDefendant, ADDRESS); - + final JsonObject contactDetails = legalEntityDefendant.getJsonObject(CONTACT_DETAILS); if (contactDetails != null) { legalEntityBuilder.add(CONTACT_DETAILS, contactDetails); } - + addIfPresent(legalEntityBuilder, legalEntityDefendant, INCORPORATION_NUMBER, INCORPORATION_NUMBER); } - + // Position is at legalEntityDefendant level, not in organisation addIfPresent(legalEntityBuilder, legalEntityDefendant, "position", "position"); - + final JsonObject legalEntity = legalEntityBuilder.build(); if (!legalEntity.isEmpty()) { payloadBuilder.add("legalEntityDefendant", legalEntity); } } - private void addIfPresent(final JsonObjectBuilder builder, final JsonObject source, - final String sourceKey, final String targetKey) { + private void addIfPresent(final JsonObjectBuilder builder, final JsonObject source, + final String sourceKey, final String targetKey) { if (source.containsKey(sourceKey) && !source.isNull(sourceKey)) { try { final String value = source.getString(sourceKey, null); @@ -221,7 +221,8 @@ private void addIfPresent(final JsonObjectBuilder builder, final JsonObject sour } /** - * Converts gender from courtsGender format (MALE, FEMALE, etc.) to gender format (Male, Female, etc.) + * Converts gender from courtsGender format (MALE, FEMALE, etc.) to gender format (Male, Female, + * etc.) */ private void addGenderIfPresent(final JsonObjectBuilder builder, final JsonObject personDetails) { if (personDetails.containsKey("gender") && !personDetails.isNull("gender")) { @@ -240,9 +241,8 @@ private void addGenderIfPresent(final JsonObjectBuilder builder, final JsonObjec } /** - * Converts gender from courtsGender.json enum values to gender.json enum values. - * courtsGender: MALE, FEMALE, NOT_KNOWN, NOT_SPECIFIED - * gender: Male, Female, Not Specified + * Converts gender from courtsGender.json enum values to gender.json enum values. courtsGender: + * MALE, FEMALE, NOT_KNOWN, NOT_SPECIFIED gender: Male, Female, Not Specified */ private String convertGenderFromCourtsFormat(final String courtsGender) { if (courtsGender == null) { 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..68332a420d 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 @@ -5,6 +5,8 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -18,11 +20,9 @@ import uk.gov.moj.cpp.sjp.event.session.MagistrateSessionStarted; import uk.gov.moj.cpp.sjp.event.session.ResetAocpSession; -import java.util.Optional; import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) @@ -71,15 +71,15 @@ public void delegatedPowersSessionStarted(final JsonEnvelope delegatedPowersSess @Handles(ResetAocpSession.EVENT_NAME) public void aocpSessionResetRequested(final JsonEnvelope envelope) { - final JsonObject response= sjpService.getLatestAocpSessionDetails(envelope); - if(nonNull(response)) { + final JsonObject response = sjpService.getLatestAocpSessionDetails(envelope); + if (nonNull(response)) { endSession(envelope, response.getString(SESSION_ID)); } startNewSession(envelope); } - private void endSession(final JsonEnvelope envelope, String sessionId){ - final JsonObject payload = Json.createObjectBuilder() + private void endSession(final JsonEnvelope envelope, String sessionId) { + final JsonObject payload = createObjectBuilder() .add(SESSION_ID, sessionId).build(); final Metadata metadata = metadataFrom(envelope.metadata()) @@ -89,15 +89,15 @@ private void endSession(final JsonEnvelope envelope, String sessionId){ sender.send(envelopeFrom(metadata, payload)); } - private void startNewSession(final JsonEnvelope envelope){ + private void startNewSession(final JsonEnvelope envelope) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = createObjectBuilder() .add(SESSION_ID, randomUUID().toString()) - .add(COURT_HOUSE_CODE , AOCP_COURT_HOUSE_CODE) + .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", 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 = 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..d845a5c21e 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,12 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; 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..d78984bdea 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,14 +5,14 @@ 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 org.apache.commons.lang3.StringUtils.capitalize; import static org.apache.commons.lang3.StringUtils.length; import static org.apache.commons.lang3.StringUtils.lowerCase; 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; +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.DocumentLanguage.WELSH; import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.FULL; import static uk.gov.moj.cpp.sjp.event.processor.DateTimeUtil.ENGLISH_TITLE_DATE_FORMATTER; @@ -43,10 +43,12 @@ import java.io.ByteArrayInputStream; import java.time.LocalDate; import java.time.Period; -import java.util.*; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -170,7 +172,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 = createObjectBuilder() .add(LANGUAGE, "ENGLISH") .add(LIST_PAYLOAD, payloadForPublicEventInEnglish); sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata()) @@ -186,7 +188,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 = createObjectBuilder() .add(LANGUAGE, "WELSH") .add(LIST_PAYLOAD, payloadForPublicEventInWelsh); sender.send(Envelope.envelopeFrom(metadataFrom(envelope.metadata()) @@ -233,7 +235,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 = 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..72d393658f 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 @@ -3,6 +3,7 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.FrameworkComponent; import uk.gov.justice.services.core.sender.Sender; @@ -13,7 +14,6 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.json.Json; 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 = 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..120c744f0e 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 @@ -3,6 +3,7 @@ import static java.util.Arrays.asList; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +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.OFFENCE_ID; import static uk.gov.moj.cpp.sjp.event.processor.PleaUpdatedProcessor.PLEA_CANCELLED_PUBLIC_EVENT_NAME; @@ -15,7 +16,6 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; 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 = 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..d6e1f7d6e9 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 @@ -2,6 +2,7 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +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.OFFENCE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.PLEA; @@ -17,7 +18,6 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; 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 = 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..22ec355451 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.activiti.delegates; -import static javax.json.Json.createObjectBuilder; import static org.apache.commons.lang3.BooleanUtils.isTrue; +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.MARKED_AT; 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/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..275b755d82 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 @@ -3,6 +3,7 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.FrameworkComponent; import uk.gov.justice.services.core.sender.Sender; @@ -15,7 +16,6 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.json.Json; 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 = createObjectBuilder() .add("documentId", documentReference) .add("caseId", caseIdAsString) .build(); - final JsonObject uploadFileCommandPayload = Json.createObjectBuilder() + final JsonObject uploadFileCommandPayload = 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..4b020f269a 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 @@ -2,6 +2,7 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.AllOffencesWithdrawalRequestCancelledProcessor.WITHDRAWAL_REQUEST_CANCELLED_PUBLIC_EVENT_NAME; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.activiti.CaseStateService.WITHDRAWAL_REQUESTED_VARIABLE; @@ -11,7 +12,6 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; 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 = 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..d9625fed44 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 @@ -2,6 +2,7 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.AllOffencesWithdrawalRequestedProcessor.WITHDRAWAL_REQUESTED_PUBLIC_EVENT_NAME; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.activiti.CaseStateService.WITHDRAWAL_REQUESTED_VARIABLE; @@ -11,7 +12,6 @@ import java.util.UUID; import javax.inject.Named; -import javax.json.Json; 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 = 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..9493cf915a 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,10 +1,10 @@ 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.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.activiti.CaseStateService.METADATA_VARIABLE; import static uk.gov.moj.cpp.sjp.event.processor.utils.MetadataHelper.metadataFromString; 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..aa2ca5d651 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.helper; -import static javax.json.Json.createReader; import static org.apache.commons.io.Charsets.UTF_8; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; 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..5f002566ae 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor.results.converter; -import static javax.json.Json.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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.core.courts.Defendant; import uk.gov.justice.core.courts.Offence; 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..0394fbf972 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,6 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; -import static javax.json.Json.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; @@ -11,7 +10,7 @@ import static uk.gov.justice.json.schemas.domains.sjp.results.PublicHearingResulted.publicHearingResulted; 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.helper.JsonObjectConversionHelper.toJsonString; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCaseResultsConstants.DATE_FORMAT; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JudicialResultHelper.LABEL; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JudicialResultHelper.SESSION_ID; 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..10b6becbe3 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 @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service; +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; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -9,7 +11,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; public class MaterialService { @@ -22,7 +23,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 = 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..5cb27f0d83 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,13 +10,13 @@ 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.core.courts.AllocationDecision.allocationDecision; import static uk.gov.justice.core.courts.BailStatus.bailStatus; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; 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.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCaseResultsConstants.RESULTS; import uk.gov.justice.core.courts.AllocationDecision; @@ -39,7 +39,6 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -83,7 +82,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 = createObjectBuilder().build(); final Envelope jsonObjectEnvelope = envelop(payload) .withName("referencedata.query.verdict-types") @@ -99,7 +98,7 @@ public Optional getVerdictTypes(final JsonEnvelope event, public List getAllVerdictTypes(final JsonEnvelope envelope) { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = createObjectBuilder().build(); final Envelope jsonObjectEnvelope = envelop(payload) .withName("referencedata.query.verdict-types") @@ -114,7 +113,7 @@ public List getAllVerdictTypes(final JsonEnvelope envelope) { public List getAllVerdictTypesByJurisdiction(final JsonEnvelope envelope, final String jurisdiction) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = createObjectBuilder() .add("jurisdiction", jurisdiction) .build(); @@ -468,7 +467,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 = createObjectBuilder().add(ID, documentTypeId.toString()).build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_GET_DOCUMENT_ACCESS) .withMetadataFrom(jsonEnvelope)); @@ -498,7 +497,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 = 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..7cb835080f 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,10 +3,10 @@ import static java.util.Optional.empty; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.APPLICATION_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CORRELATION_ID; @@ -31,7 +31,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; 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..f42a86fa33 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 @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service; +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; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -9,7 +11,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; public class UsersGroupsService { @@ -22,7 +23,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 = 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..3887dcc5e5 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 @@ -1,19 +1,15 @@ package uk.gov.moj.cpp.sjp.event.processor.service.assignment; -import static java.util.Optional.*; +import static java.util.Optional.ofNullable; 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.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; - -import javax.json.JsonArray; -import javax.json.JsonObjectBuilder; -import javax.json.JsonString; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.FrameworkComponent; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -29,7 +25,10 @@ import java.util.UUID; import javax.inject.Inject; +import javax.json.JsonArray; import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; +import javax.json.JsonString; public class AssignmentService { 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..ad73e881d2 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,10 +2,10 @@ import static java.lang.String.format; import static java.util.Objects.nonNull; -import static javax.json.Json.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; +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.ApplicationType; 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..315b4ed2d4 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.service.notificationnotify; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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/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..c288315eaa 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 @@ -1,5 +1,8 @@ package uk.gov.moj.cpp.sjp.event.processor.service.referral; +import static java.util.Collections.emptyList; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; + 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.Offence; @@ -17,8 +20,6 @@ import uk.gov.moj.cpp.sjp.event.processor.service.referral.helpers.ProsecutionCasesViewHelper; import uk.gov.moj.cpp.sjp.model.prosecution.ProsecutionCaseView; -import javax.inject.Inject; -import javax.json.JsonObject; import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.HashMap; @@ -30,8 +31,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import static java.util.Collections.emptyList; -import static javax.json.Json.createObjectBuilder; +import javax.inject.Inject; +import javax.json.JsonObject; @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..951acd335f 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,9 +5,9 @@ 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 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.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.service.referral.helpers.NotifiedPleaViewHelper.createNotifiedPleaView; import uk.gov.justice.core.courts.ContactNumber; 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..76ee310932 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator.TemplateIdentifier.NOTIFICATION_TO_DVLA_TO_REMOVE_ENDORSEMENT; 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/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..738d9b7ef6 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator.TemplateIdentifier.ENFORCEMENT_PENDING_APPLICATION_NOTIFICATION; 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/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..ebeb8b8fcf 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,10 +1,10 @@ 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.core.annotation.Component.EVENT_PROCESSOR; 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.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.sender.Sender; 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..b29b518c04 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.sender.Sender; 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..8ab43e3c4d 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 @@ -4,6 +4,7 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.JsonMetadata; @@ -14,7 +15,6 @@ import java.util.Optional; import java.util.function.Function; -import javax.json.Json; 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 = 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..05ee74c1e9 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,12 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; 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.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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..ab80d2dcab 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; 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..e0d8fee62e 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,17 @@ 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 org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.never; +import static org.hamcrest.Matchers.is; 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 static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -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 +23,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 +37,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 +58,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 +65,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..a6615bdf64 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,16 +2,16 @@ 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 org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.AllOf.allOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; @@ -24,8 +24,6 @@ import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.REASON; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.SESSION_ID; - -import javax.json.JsonArray; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -45,6 +43,8 @@ import java.util.List; import java.util.UUID; +import javax.json.JsonArray; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; 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..534825aead 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 @@ -3,6 +3,7 @@ import static java.util.UUID.randomUUID; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +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; @@ -12,8 +13,6 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -39,7 +38,7 @@ public class CaseAdjournmentProcessorTest { public void shouldInvokeActivityFlowWhenCaseAdjournmentRecorder() { final JsonEnvelope caseAdjournmentRecordedEvent = EnvelopeFactory .createEnvelope("sjp.events.case-adjourned-to-later-sjp-hearing-recorded", - Json.createObjectBuilder() + 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..a91409654d 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,14 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.ArgumentMatchers.any; +import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import static uk.gov.moj.cpp.sjp.event.processor.utils.FileUtil.getFileContentAsJson; 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..995359b88c 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,26 +2,23 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; 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; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; -import static uk.gov.moj.cpp.sjp.event.processor.results.converter.ResultingToResultsConverterHelper.buildCaseDetails; import static uk.gov.moj.cpp.sjp.event.processor.utils.FileUtil.getFileContentAsJson; import uk.gov.justice.json.schemas.domains.sjp.CaseApplication; 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..2c909f078e 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 @@ -3,8 +3,9 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.AllOf.allOf; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.verify; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; @@ -17,8 +18,6 @@ import java.util.UUID; -import javax.json.Json; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -47,8 +46,8 @@ 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) - .build()); + createObjectBuilder().add("caseId", CASE_ID).add("urn", URN) + .build()); //when caseCreationFailedBecauseCaseAlreadyExistedProcessor.publish(privateEvent); @@ -57,8 +56,8 @@ public void publish() { verify(sender).send(argThat( jsonEnvelope(metadata().withName("public.sjp.case-creation-failed-because-case-already-existed"), payloadIsJson(allOf( - withJsonPath("$.caseId", is(CASE_ID)), - withJsonPath("$.urn", is(URN))))) + withJsonPath("$.caseId", is(CASE_ID)), + withJsonPath("$.urn", is(URN))))) )); } } 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..72ba032fa3 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,6 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.Is.is; @@ -12,6 +10,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..e24bcc0f3e 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,12 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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 static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_DOCUMENT; @@ -23,7 +23,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -115,7 +114,7 @@ public void shouldRaisePublicEventForCaseDocumentAlreadyAdded() { } private JsonEnvelope buildCaseDocumentAddedEvent(final Optional documentType, String eventName) { - final JsonObjectBuilder documentBuilder = Json.createObjectBuilder() + final JsonObjectBuilder documentBuilder = 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..44e52e9496 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,6 @@ 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 org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -11,12 +10,13 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; 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..48883929cd 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,16 +2,16 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; 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..f3daaa2aee 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,13 +1,13 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; @@ -29,7 +29,6 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonValue; @@ -93,7 +92,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", createObjectBuilder() .add("id", "cf73207f-3ced-488a-82a0-3fba79c2ce04") .add("name", "Carmarthen Magistrates' Court") .add("roomId", "d7020fe0-cd97-4ce0-84c2-fd00ff0bc48a") @@ -128,7 +127,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", 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..fbdbd68acd 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,12 +2,12 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -32,7 +32,6 @@ import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) 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..9be770dfb5 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -16,6 +15,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.converter.JsonObjectToObjectConverterFactory.createJsonObjectToObjectConverter; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; @@ -44,7 +44,6 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonValue; @@ -158,7 +157,7 @@ public void shouldUpdateCaseStateAndResolveCaseAOCPEligibility() throws IOExcept withJsonPath("$.id", equalTo(caseId.toString())), withJsonPath("$.postingDate", equalTo(postingDate.toString()))))); - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = createObjectBuilder(); payloadBuilder.add("CaseReference", urn); verify(azureFunctionService).relayCaseOnCPP(payloadBuilder.build().toString()); verify(timerService).startTimerForDefendantResponse(caseId, expectedDateReady, privateEvent.metadata()); @@ -205,7 +204,7 @@ public void shouldUpdateCaseStateAndResolveCaseAOCPEligibilityWhenSurchangeAmoun withJsonPath("$.id", equalTo(caseId.toString())), withJsonPath("$.postingDate", equalTo(postingDate.toString()))))); - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = createObjectBuilder(); payloadBuilder.add("CaseReference", urn); verify(azureFunctionService).relayCaseOnCPP(payloadBuilder.build().toString()); verify(timerService).startTimerForDefendantResponse(caseId, expectedDateReady, privateEvent.metadata()); @@ -255,7 +254,7 @@ public void shouldUpdateCaseStateAndResolveCaseAOCPEligibilityWhenMinAndMaxVicti withJsonPath("$.id", equalTo(caseId.toString())), withJsonPath("$.postingDate", equalTo(postingDate.toString()))))); - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = 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..7b724f8276 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 @@ -2,9 +2,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.AllOf.allOf; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; @@ -19,7 +20,6 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.json.Json; 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 = 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 = 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..ae869fa37c 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,21 +1,33 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; +import uk.gov.justice.services.core.enveloper.Enveloper; +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.justice.services.test.utils.core.enveloper.EnveloperFactory; +import uk.gov.moj.cpp.sjp.event.CaseAlreadyReserved; +import uk.gov.moj.cpp.sjp.event.CaseAlreadyUnReserved; +import uk.gov.moj.cpp.sjp.event.CaseReserved; +import uk.gov.moj.cpp.sjp.event.CaseUnReserved; +import uk.gov.moj.cpp.sjp.event.processor.service.timers.TimerService; import java.time.ZonedDateTime; import java.util.UUID; + import javax.json.JsonValue; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -24,16 +36,6 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.justice.services.core.enveloper.Enveloper; -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.justice.services.test.utils.core.enveloper.EnveloperFactory; -import uk.gov.moj.cpp.sjp.event.CaseAlreadyReserved; -import uk.gov.moj.cpp.sjp.event.CaseAlreadyUnReserved; -import uk.gov.moj.cpp.sjp.event.CaseReserved; -import uk.gov.moj.cpp.sjp.event.CaseUnReserved; -import uk.gov.moj.cpp.sjp.event.processor.service.timers.TimerService; @ExtendWith(MockitoExtension.class) public class CaseReservedProcessorTest { 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..c73ee86c96 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 @@ -2,9 +2,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.AllOf.allOf; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -18,8 +19,6 @@ import java.util.UUID; -import javax.json.Json; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -47,7 +46,7 @@ public class CaseUpdateRejectedProcessorTest { public void caseUpdateRejectedPublicEvent() { final JsonEnvelope privateEvent = createEnvelope("sjp.events.case-update-rejected", - Json.createObjectBuilder() + 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..9ab5a95bf1 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.moj.cpp.sjp.event.processor.ConvictionCourtResolvedProcessor.PUBLIC_CONVICTION_COURT_RESOLVED; 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..66972f4db1 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.moj.cpp.sjp.event.processor.ConvictionCourtResolvedProcessor.PUBLIC_CONVICTION_COURT_RESOLVED; 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..ed12160cfd 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,6 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; @@ -24,6 +22,8 @@ import static uk.gov.justice.json.schemas.domains.sjp.queries.QueryOffenceDecision.queryOffenceDecision; 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.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; 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..7164905a80 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; 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.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..043e7357cf 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 java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.AllOf.allOf; @@ -10,23 +10,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import static java.util.UUID.randomUUID; -import java.time.LocalDate; -import java.util.UUID; -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.Spy; -import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.sender.Sender; @@ -40,6 +29,19 @@ import uk.gov.moj.cpp.sjp.event.processor.service.SystemIdMapperService; import uk.gov.moj.cpp.sjp.event.processor.service.timers.TimerService; +import java.time.LocalDate; +import java.util.UUID; + +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.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + @ExtendWith(MockitoExtension.class) public class DefendantAcceptedAocpProcessorTest { @Mock 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..071695f3f2 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,10 +1,10 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.core.enveloper.Enveloper; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java index a31295fb55..57d97100e4 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java @@ -1,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.core.sender.Sender; 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..48ea41e3c3 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.time.ZoneOffset.UTC; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.DefendantDetailsUpdatesAcknowledgedProcessor.PUBLIC_SJP_EVENTS_DEFENDANT_DETAILS_UPDATES_ACKNOWLEDGED; import uk.gov.justice.services.core.enveloper.Enveloper; 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..d71ad8e174 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.core.enveloper.Enveloper; 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..059646b4b6 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.core.enveloper.Enveloper; 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..ebf168792b 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; 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..c0e8d08e67 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,12 +2,12 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; 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..d325de5e86 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,13 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; -import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; +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.core.sender.Sender; 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..817bc0ff52 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,16 +1,16 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.verify; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.internal.verification.VerificationModeFactory.times; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..25ef1ff491 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,42 @@ 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.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; @@ -16,6 +47,8 @@ import static uk.gov.justice.json.schemas.domains.sjp.results.PublicHearingResulted.publicHearingResulted; 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.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -29,50 +62,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 +116,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 +139,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 +262,9 @@ public void shouldHandleHearingResultReceivedWithApplicationTypeNotInCommonTypes @Test public void shouldHandleHearingResultReceivedWhenCourtApplicationsIsNotPresent() throws IOException { - JsonObjectBuilder hearingJsonBuilder = Json.createObjectBuilder(); + JsonObjectBuilder hearingJsonBuilder = createObjectBuilder(); hearingJsonBuilder.add("id", randomUUID().toString()); - JsonObjectBuilder hearingEnvelopeJsonBuilder = Json.createObjectBuilder(); + JsonObjectBuilder hearingEnvelopeJsonBuilder = createObjectBuilder(); hearingEnvelopeJsonBuilder.add("hearing", hearingJsonBuilder); final JsonEnvelope hearingJsonEnvelope = envelopeFrom(metadataWithRandomUUID(HearingResultReceivedProcessor.PUBLIC_HEARING_RESULTED), @@ -272,10 +276,10 @@ public void shouldHandleHearingResultReceivedWhenCourtApplicationsIsNotPresent() @Test public void shouldHandleHearingResultReceivedWhenCourtApplicationIsNotPresent() throws IOException { - JsonObjectBuilder courtApplicationJsonObjectBuilder = Json.createObjectBuilder(); - JsonArrayBuilder courtApplications = Json.createArrayBuilder(); + JsonObjectBuilder courtApplicationJsonObjectBuilder = createObjectBuilder(); + JsonArrayBuilder courtApplications = createArrayBuilder(); courtApplicationJsonObjectBuilder.add("courtApplications", courtApplications); - JsonObjectBuilder hearingJsonBuilder = Json.createObjectBuilder(); + JsonObjectBuilder hearingJsonBuilder = createObjectBuilder(); hearingJsonBuilder.add("hearing", courtApplicationJsonObjectBuilder); final JsonEnvelope hearingJsonEnvelope = envelopeFrom(metadataWithRandomUUID(HearingResultReceivedProcessor.PUBLIC_HEARING_RESULTED), @@ -291,5 +295,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 344c6f4f68..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 @@ -1,15 +1,21 @@ package uk.gov.moj.cpp.sjp.event.processor; -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; +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; +import static uk.gov.justice.core.courts.Hearing.hearing; +import static uk.gov.justice.json.schemas.domains.sjp.results.PublicHearingResulted.publicHearingResulted; +import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; +import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.G; +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; @@ -24,23 +30,20 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonValue; import java.util.Arrays; import java.util.UUID; -import static java.util.Collections.singletonList; -import static java.util.UUID.randomUUID; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static uk.gov.justice.core.courts.CourtApplication.courtApplication; -import static uk.gov.justice.core.courts.Hearing.hearing; -import static uk.gov.justice.json.schemas.domains.sjp.results.PublicHearingResulted.publicHearingResulted; -import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; -import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; -import static uk.gov.moj.cpp.sjp.event.processor.utils.ApplicationResult.G; -import static uk.gov.moj.cpp.sjp.event.processor.utils.SjpApplicationTypes.APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP; +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) @@ -61,7 +64,11 @@ public class HearingResultedProcessorTest { private final ProsecutionCase prosecutionCase = ProsecutionCase.prosecutionCase(). - withMigrationSourceSystem(new MigrationSourceSystem("1234","Exhibit")) + withMigrationSourceSystem(MigrationSourceSystem + .migrationSourceSystem() + .withMigrationSourceSystemCaseIdentifier("1234") + .withMigrationSourceSystemName("Exhibit") + .build()) .build(); final UUID caseId = randomUUID(); @@ -101,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(); @@ -119,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 @@ -127,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..8162b108e9 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,14 +2,14 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.AOCP_ACCEPTED_EMAIL_NOTIFICATION; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.ENDORSEMENT_REMOVAL_NOTIFICATION; import static uk.gov.moj.cpp.sjp.event.processor.service.NotificationNotifyDocumentType.ENFORCEMENT_PENDING_APPLICATION_NOTIFICATION; 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..5af27f01bc 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,13 +3,13 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; 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.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; 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..d4ca394216 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.COURT_CENTRE_CODE; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.FULL_NAME; 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..27093c166d 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,6 @@ 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 org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.AllOf.allOf; @@ -11,6 +10,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; 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..437cd8ed29 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 @@ -11,6 +11,7 @@ import static org.mockito.Mockito.when; 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.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; @@ -40,8 +41,6 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -74,7 +73,7 @@ public void shouldUpdateCaseStateWhenPleaUpdated() { final ZonedDateTime pleaUpdatedDate = ZonedDateTime.now(UTC).minusDays(2); final JsonEnvelope privateEvent = createEnvelope(PleaUpdated.EVENT_NAME, - Json.createObjectBuilder() + createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEA, pleaType.name()) @@ -96,7 +95,7 @@ public void shouldUpdateCaseStateWhenPleaUpdatedWithoutDateWithMetadataCreationD metadataWithRandomUUID(PleaUpdated.EVENT_NAME) .createdAt(metadataCreatedAt) .build(), - Json.createObjectBuilder() + createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEA, pleaType.name()) @@ -123,7 +122,7 @@ public void shouldUpdateCaseStateWhenPleaUpdatedWithoutDateWithoutMetadataCreati final PleaType pleaType = NOT_GUILTY; final JsonEnvelope privateEvent = createEnvelope(PleaUpdated.EVENT_NAME, - Json.createObjectBuilder() + createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEA, pleaType.name()) @@ -145,7 +144,7 @@ public void shouldUpdateCaseStateWhenPleadedGuilty() { final UUID offenceId = randomUUID(); final JsonEnvelope privateEvent = createEnvelope(PleadedGuilty.EVENT_NAME, - Json.createObjectBuilder() + createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEAD_DATE, stoppedClock.now().toString()) @@ -162,7 +161,7 @@ public void shouldUpdateCaseStateWhenPleadedGuiltyCourtHearingRequested() { final UUID offenceId = randomUUID(); final JsonEnvelope privateEvent = createEnvelope(PleadedGuiltyCourtHearingRequested.EVENT_NAME, - Json.createObjectBuilder() + createObjectBuilder() .add(CASE_ID, caseId.toString()) .add(OFFENCE_ID, offenceId.toString()) .add(PLEAD_DATE, stoppedClock.now().toString()) @@ -179,7 +178,7 @@ public void shouldUpdateCaseStateWhenPleadedNotGuilty() { final UUID offenceId = randomUUID(); final JsonEnvelope privateEvent = createEnvelope(PleadedNotGuilty.EVENT_NAME, - Json.createObjectBuilder() + 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..320165a8d5 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -10,6 +8,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.NO_PLEA_RECEIVED_READY_FOR_DECISION; @@ -22,12 +22,10 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.framework.api.JsonObjectConvertersFactory; - import java.math.BigDecimal; import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -297,7 +295,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 = createArrayBuilder().add(offenceObjectBuilder.build()).build(); final JsonObject defendant = createObjectBuilder() .add("offences", offences) @@ -320,7 +318,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 = 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..19ec8ea83f 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 @@ -3,9 +3,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singletonList; 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.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -22,7 +23,6 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonValue; @@ -74,18 +74,18 @@ public void raisesPleasSetPublicEvent() throws JsonProcessingException { assertThat(sentEnvelope.payload(), payloadIsJson( - allOf( - withJsonPath("$.caseId", equalTo(caseId.toString())), - withJsonPath("$.pleas[0].defendantId", equalTo(plea.getDefendantId().toString())), - withJsonPath("$.pleas[0].offenceId", equalTo(plea.getOffenceId().toString())), - withJsonPath("$.pleas[0].pleaType", equalTo(plea.getPleaType().toString())) - ) + allOf( + withJsonPath("$.caseId", equalTo(caseId.toString())), + withJsonPath("$.pleas[0].defendantId", equalTo(plea.getDefendantId().toString())), + withJsonPath("$.pleas[0].offenceId", equalTo(plea.getOffenceId().toString())), + withJsonPath("$.pleas[0].pleaType", equalTo(plea.getPleaType().toString())) + ) ) ); } public JsonObject convertToJsonObject(PleasSet pleasSet) throws JsonProcessingException { String json = objectMapper.writeValueAsString(pleasSet); - return Json.createReader(new StringReader(json)).readObject(); + return 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..a82128ed24 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; @@ -28,6 +26,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.JSON; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; 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..f25c4b17e4 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,18 +2,18 @@ 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 org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; 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.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; -import static uk.gov.moj.cpp.sjp.event.processor .EventProcessorConstants.CASE_ID; +import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.DEFENDANT_ID; import static uk.gov.moj.cpp.sjp.event.processor.utils.FileUtil.getFileContentAsJson; @@ -27,7 +27,6 @@ import java.util.UUID; -import javax.json.Json; import javax.json.JsonArray; import com.google.common.collect.ImmutableMap; @@ -92,7 +91,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", 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/SJPDefendantUpdatedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessorTest.java index 16514a8c2c..9196baddbb 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessorTest.java @@ -1,14 +1,14 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.doThrow; -import static org.mockito.ArgumentMatchers.any; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.core.sender.Sender; 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..a33e87e052 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,6 @@ package uk.gov.moj.cpp.sjp.event.processor; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -13,6 +12,7 @@ import static org.mockito.Mockito.when; import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..e34e2faab9 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,6 @@ 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 org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.everyItem; @@ -20,6 +18,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.event.processor.helper.JsonObjectConversionHelper.streamToJsonObject; 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..5e8b01671d 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,11 +1,11 @@ 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 org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.moj.cpp.sjp.domain.common.CaseManagementStatus.DONE; 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..372bc62ce3 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 @@ -3,6 +3,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.ADDRESS1_KEY; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.ADDRESS2_KEY; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.ADDRESS3_KEY; @@ -28,7 +29,6 @@ import java.util.Optional; -import javax.json.Json; 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(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(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..78904636dc 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 @@ -1,13 +1,13 @@ package uk.gov.moj.cpp.sjp.event.processor.results.converter; +import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.is; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; -import static java.util.UUID.randomUUID; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.ADDRESS_LINE_1; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.COURT_CENTRE_CODE; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.COURT_CENTRE_ID; @@ -27,13 +27,11 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; -import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -70,16 +68,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 = createObjectBuilder() .add("id", UUID.randomUUID().toString()) .add("name", "test") .build(); - final JsonObject sjpSessionPayload = Json.createObjectBuilder() + final JsonObject sjpSessionPayload = createObjectBuilder() .add("courtHouseCode", UUID.randomUUID().toString()) .build(); - final Optional courtOptional = Optional.of(Json.createObjectBuilder() + final Optional courtOptional = Optional.of(createObjectBuilder() .add("id", COURT_CENTRE_ID.toString()) .add("isWelsh", true) .add("oucode", COURT_CENTRE_CODE) @@ -119,16 +117,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 = createObjectBuilder() .add("id", UUID.randomUUID().toString()) .add("name", "test") .build(); - final JsonObject sjpSessionPayload = Json.createObjectBuilder() + final JsonObject sjpSessionPayload = createObjectBuilder() .add("courtHouseCode", UUID.randomUUID().toString()) .build(); - final Optional courtOptional = Optional.of(Json.createObjectBuilder() + final Optional courtOptional = Optional.of(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..c0a12f5c19 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,13 +2,13 @@ import static java.time.ZoneOffset.UTC; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +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.core.courts.Defendant; 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..7dabfcc48d 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 @@ -2,6 +2,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.LJA_CODE; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.LJA_CODE_KEY; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.LJA_NAME; @@ -13,7 +14,6 @@ import java.util.Optional; -import javax.json.Json; 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 createObjectBuilder() .add(LJA_CODE_KEY, LJA_CODE) .build(); } public static Optional getCourt() { - return Optional.of(Json.createObjectBuilder() + return Optional.of(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..5570e7526b 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 @@ -4,6 +4,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; +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.event.processor.results.converter.TestConstants.CASE_URN; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.COURT_CENTRE_CODE; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.FULL_NAME; @@ -14,7 +16,6 @@ import uk.gov.justice.core.courts.ProsecutionCaseIdentifier; import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; @@ -39,8 +40,8 @@ public class ProsecutionCaseIdentifierConverterTest { public void shouldConvertProsecutionCaseIdentifierWithPoliceFlag() { - JsonArray value = Json.createArrayBuilder() - .add(Json.createObjectBuilder() + JsonArray value = createArrayBuilder() + .add(createObjectBuilder() .add("policeFlag", true) .add("id", ID_2.toString()) .add("shortName", SHORT_NAME) @@ -49,7 +50,7 @@ public void shouldConvertProsecutionCaseIdentifierWithPoliceFlag() { ) .build(); - JsonObject jsonObject = Json.createObjectBuilder() + JsonObject jsonObject = createObjectBuilder() .add("prosecutors", value) .build(); @@ -68,8 +69,8 @@ public void shouldConvertProsecutionCaseIdentifierWithPoliceFlag() { public void shouldConvertProsecutionCaseIdentifierWithoutPoliceFlag() { - JsonArray value = Json.createArrayBuilder() - .add(Json.createObjectBuilder() + JsonArray value = createArrayBuilder() + .add(createObjectBuilder() .add("policeFlag", false) .add("id", ID_2.toString()) .add("shortName", SHORT_NAME) @@ -78,7 +79,7 @@ public void shouldConvertProsecutionCaseIdentifierWithoutPoliceFlag() { ) .build(); - JsonObject jsonObject = Json.createObjectBuilder() + JsonObject jsonObject = 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..df0879eaba 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,14 +4,14 @@ 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 org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.apache.commons.lang3.RandomUtils.nextInt; import static org.junit.jupiter.api.Assertions.assertEquals; import static uk.gov.justice.json.schemas.domains.sjp.Gender.NOT_SPECIFIED; import static uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails.caseDetails; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +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.json.schemas.domains.sjp.Address; @@ -45,7 +45,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonValue; @@ -113,7 +112,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("...", createObjectBuilder().build()); public static PersonalDetails buildPersonalDetails() { return PersonalDetails.personalDetails() @@ -188,7 +187,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(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..84fa107a42 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 @@ -5,6 +5,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.ID; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.ID_1; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.TestConstants.RANDOM_TEXT_1; @@ -21,7 +22,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; 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 = 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 = 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 = 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 = 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 = 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 = 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(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..2f5cb70cf9 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,10 +1,10 @@ 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 org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JudicialResultHelper.SESSION_ID; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JudicialResultHelper.STARTED_AT; import static uk.gov.moj.cpp.sjp.event.processor.utils.FileUtil.getFileContentAsJson; @@ -17,7 +17,6 @@ import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.HashMap; -import java.util.Optional; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; 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..260061783b 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,6 @@ 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 org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; @@ -11,9 +9,10 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.core.courts.CourtCentre.courtCentre; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import static uk.gov.moj.cpp.sjp.domain.decision.OffenceDecisionInformation.createOffenceDecisionInformation; import static uk.gov.moj.cpp.sjp.domain.disability.DisabilityNeeds.NO_DISABILITY_NEEDS; 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..62be5ae75b 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,15 +2,14 @@ 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 org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -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.when; +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.OffenceDecisionInformation.createOffenceDecisionInformation; import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.FOUND_GUILTY; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCaseResultsConstants.DATE_FORMAT; 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..39286a258c 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,17 +3,17 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -22,7 +22,6 @@ import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; -import javax.json.JsonArray; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.core.sender.Sender; @@ -36,7 +35,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.Json; +import javax.json.JsonArray; import com.google.common.collect.ImmutableMap; import org.hamcrest.CustomTypeSafeMatcher; @@ -82,7 +81,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", createArrayBuilder() .add(createObjectBuilder() .add("caseId", assignmentCandidate1.getCaseId().toString()) .add("caseStreamVersion", assignmentCandidate1.getCaseStreamVersion()) @@ -123,7 +122,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", createArrayBuilder() .add(createObjectBuilder() .add("caseId", assignmentCandidate1.getCaseId().toString()) .add("caseStreamVersion", assignmentCandidate1.getCaseStreamVersion()) @@ -161,7 +160,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", 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..0ef1a02fae 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,14 +1,13 @@ package uk.gov.moj.cpp.sjp.event.processor.service; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertThrows; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonObject; import org.junit.jupiter.api.Test; -import uk.gov.justice.services.adapter.rest.exception.BadRequestException; public class LocalJusticeAreaTest { 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..6fe8f496b2 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,13 +1,14 @@ package uk.gov.moj.cpp.sjp.event.processor.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -21,7 +22,6 @@ import java.util.UUID; -import javax.json.Json; 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", 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..754fce5a50 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,14 +3,14 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..21715e3bb0 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,15 +2,15 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..238bdf7f78 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -17,6 +15,8 @@ import static org.mockito.Mockito.when; import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -37,7 +37,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -377,7 +376,7 @@ private JsonEnvelope enforcementAreaQueryByNationalCourtCode(final String localJ } private static JsonObject newEnforcementArea() { - return Json.createObjectBuilder() + return 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..1c7b933022 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,18 +2,18 @@ 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 org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -26,7 +26,6 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.sjp.domain.ListType; import java.util.List; import java.util.UUID; 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..a9ecdccf4f 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,13 +2,13 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..6bb1a9d6aa 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,18 +5,18 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import static uk.gov.justice.json.schemas.domains.sjp.ApplicationType.REOPENING; import static uk.gov.justice.json.schemas.domains.sjp.ApplicationType.STAT_DEC; import static uk.gov.justice.json.schemas.domains.sjp.queries.DisqualificationType.POINTS; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.converter.JsonObjectToObjectConverterFactory.createJsonObjectToObjectConverter; import static uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator.TemplateIdentifier.NOTIFICATION_TO_DVLA_TO_REMOVE_ENDORSEMENT; 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..53b5caba16 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,13 +1,13 @@ package uk.gov.moj.cpp.sjp.event.processor.service.notificationnotify; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; 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..573826d5db 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,18 +2,18 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static javax.json.JsonValue.NULL; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import static uk.gov.justice.json.schemas.domains.sjp.queries.Defendant.defendant; import static uk.gov.justice.json.schemas.domains.sjp.queries.Offence.offence; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.event.CaseReferredForCourtHearing.caseReferredForCourtHearing; 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..dcffa3db5b 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,6 @@ 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 javax.json.JsonValue.NULL; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; @@ -11,6 +10,7 @@ import static uk.gov.justice.json.schemas.domains.sjp.queries.CaseDecision.caseDecision; import static uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails.caseDetails; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; import static uk.gov.moj.cpp.sjp.event.CaseReferredForCourtHearing.caseReferredForCourtHearing; @@ -31,7 +31,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -140,7 +139,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 = 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..9172131ab6 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,6 @@ 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 org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -12,6 +10,8 @@ import static uk.gov.justice.json.schemas.domains.sjp.queries.Defendant.defendant; import static uk.gov.justice.json.schemas.domains.sjp.queries.OnlinePleaDetail.onlinePleaDetail; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; import static uk.gov.moj.cpp.sjp.event.CaseReferredForCourtHearing.caseReferredForCourtHearing; @@ -45,7 +45,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; 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..f9ca113718 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,12 +2,11 @@ import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static javax.json.JsonValue.NULL; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static uk.gov.justice.json.schemas.domains.sjp.queries.CaseDecision.caseDecision; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; import static uk.gov.moj.cpp.sjp.event.CaseReferredForCourtHearing.caseReferredForCourtHearing; 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..b0558d9f7f 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,10 +2,10 @@ 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 org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +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.disability.DisabilityNeeds.disabilityNeedsOf; import static uk.gov.moj.cpp.sjp.event.CaseReferredForCourtHearing.caseReferredForCourtHearing; 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..cf43f5e466 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,6 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -23,6 +21,8 @@ import static uk.gov.justice.json.schemas.domains.sjp.queries.Defendant.defendant; import static uk.gov.justice.json.schemas.domains.sjp.queries.PressRestriction.pressRestriction; import static uk.gov.justice.json.schemas.domains.sjp.queries.QueryOffenceDecision.queryOffenceDecision; +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.disability.DisabilityNeeds.disabilityNeedsOf; import static uk.gov.moj.cpp.sjp.event.CaseReferredForCourtHearing.caseReferredForCourtHearing; 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..d483d8b835 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,9 +3,9 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDecision; import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails; 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..9b2aa70835 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,11 +1,11 @@ package uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.core.sender.Sender; 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..6734849140 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 @@ -1,12 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor.utils; import static org.junit.jupiter.api.Assertions.fail; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import java.io.StringReader; import java.nio.charset.Charset; import java.util.Map; -import javax.json.Json; 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 = 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..693b6b5bd7 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 @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.utils; import static java.util.stream.Collectors.toList; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -10,8 +11,6 @@ import java.io.StringReader; import java.util.List; -import javax.json.Json; - import com.fasterxml.jackson.core.JsonProcessingException; public class Framework5Fix { @@ -40,7 +39,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(), 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..ef6eee200d 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,12 +1,12 @@ package uk.gov.moj.cpp.sjp.event.processor.utils; -import static javax.json.Json.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.messaging.JsonEnvelope.METADATA; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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-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 4ec01f9803..c44a44c76b 100644 --- a/sjp-healthchecks/pom.xml +++ b/sjp-healthchecks/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-integration-test/pom.xml b/sjp-integration-test/pom.xml index 79346fd860..a1eac2dc8c 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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 dd77690dcf..7163c1af0d 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 @@ -1,18 +1,18 @@ package uk.gov.moj.sjp.it.command; import static java.lang.String.format; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.util.HttpClientUtil.makePostCall; import java.util.UUID; -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 = JsonObjects.createObjectBuilder() + final JsonObject payload = 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 514283c0e1..26cb925000 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 @@ -1,6 +1,16 @@ package uk.gov.moj.sjp.it.command; -import org.apache.commons.lang3.RandomStringUtils; +import static com.google.common.collect.Lists.newArrayList; +import static java.util.Objects.nonNull; +import static java.util.Objects.requireNonNull; +import static java.util.Optional.ofNullable; +import static java.util.UUID.randomUUID; +import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.moj.sjp.it.Constants.DEFAULT_OFFENCE_CODE; +import static uk.gov.moj.sjp.it.util.HttpClientUtil.getPostCallResponse; + import uk.gov.justice.json.schemas.domains.sjp.Gender; import uk.gov.justice.json.schemas.domains.sjp.Language; import uk.gov.justice.services.common.converter.LocalDates; @@ -9,10 +19,6 @@ import uk.gov.moj.sjp.it.model.ProsecutingAuthority; import uk.gov.moj.sjp.it.util.UrnProvider; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; import java.math.BigDecimal; import java.time.LocalDate; import java.util.Arrays; @@ -22,16 +28,12 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static com.google.common.collect.Lists.newArrayList; -import static java.util.Objects.nonNull; -import static java.util.Objects.requireNonNull; -import static java.util.Optional.ofNullable; -import static java.util.UUID.randomUUID; -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; +import javax.json.JsonArrayBuilder; +import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; +import javax.ws.rs.core.Response; + +import org.apache.commons.lang3.RandomStringUtils; public class CreateCase { 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 a50280e376..ab1bdcffbd 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 @@ -1,12 +1,12 @@ package uk.gov.moj.sjp.it.helper; -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static java.util.concurrent.TimeUnit.SECONDS; import static javax.ws.rs.core.Response.Status.ACCEPTED; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.pollingquery.CasePoller.pollUntilCaseByIdIsOk; import static uk.gov.moj.sjp.it.util.HttpClientUtil.makeGetCall; 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/CaseApplicationHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java index a4b1155b41..0c1767c1a4 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,8 +2,8 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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 74a8c59cd6..b8e3dd213b 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,10 +3,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; -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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.moj.sjp.it.test.BaseIntegrationTest.USER_ID; import static uk.gov.moj.sjp.it.util.HttpClientUtil.getReadUrl; 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 64d374b73b..ca957706a0 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,9 +1,9 @@ package uk.gov.moj.sjp.it.helper; import static java.util.Objects.nonNull; -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.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.moj.sjp.it.util.HttpClientUtil.getReadUrl; import static uk.gov.moj.sjp.it.util.HttpClientUtil.makeGetCall; 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 fe7290bf04..e73950fb32 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,10 +1,10 @@ package uk.gov.moj.sjp.it.helper; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; 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 03796059cd..9c0caa2bb4 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,6 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -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; @@ -22,6 +21,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.isA; import static org.junit.jupiter.api.Assertions.assertEquals; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; 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 c996f48ee7..04536da4b3 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,8 +1,8 @@ package uk.gov.moj.sjp.it.helper; -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.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.Constants.PUBLIC_EVENT_SELECTOR_DELETE_CASE_DOCUMENT_REQUEST_ACCEPTED; import static uk.gov.moj.sjp.it.Constants.PUBLIC_EVENT_SELECTOR_DELETE_CASE_DOCUMENT_REQUEST_REJECTED; 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/EmployerHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java index 74336143c3..19bc7710d1 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 @@ -1,14 +1,14 @@ package uk.gov.moj.sjp.it.helper; -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.awaitility.Awaitility.await; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; @@ -23,7 +23,6 @@ import uk.gov.moj.sjp.it.util.TopicUtil; import java.util.UUID; -import java.util.concurrent.TimeUnit; import javax.jms.JMSException; import javax.jms.MessageConsumer; 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 62c0e199ff..d27fac4fc2 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,13 +5,13 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -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; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; 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 59d2a0577c..a3e2a13325 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 @@ -11,6 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.fail; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; import static uk.gov.moj.sjp.it.Constants.PUBLIC_EVENT_SET_PLEAS; @@ -34,7 +35,6 @@ import javax.jms.JMSException; import javax.jms.MessageConsumer; -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 = JsonObjects.createObjectBuilder(payload) + final JsonObject publicEvent = 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 6b3b15fbe9..60b310f7af 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,12 +1,12 @@ package uk.gov.moj.sjp.it.helper; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -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; import static org.hamcrest.Matchers.notNullValue; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; 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 ded56f939c..89b6c3867a 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,10 +3,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; import static java.util.Arrays.stream; -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.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder.withDefaults; import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; import static uk.gov.moj.sjp.it.helper.CaseHelper.pollUntilCaseReady; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java index 93ab63ad94..8a74511f00 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java @@ -18,7 +18,6 @@ import static uk.gov.moj.sjp.it.util.DefaultRequests.getProsecutionCaseById; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.pollWithDefaults; -import org.hamcrest.Matchers; import uk.gov.justice.services.test.utils.core.http.ResponseData; import uk.gov.moj.cpp.sjp.domain.common.CaseStatus; import uk.gov.moj.sjp.it.util.JsonHelper; @@ -84,9 +83,7 @@ public static String pollUntilPotentialCasesByDefendantIdIsOk(final UUID defenda anyOf( allOf( status().is(OK), - payload().isJson(allOf(any(ReadContext.class), - withJsonPath("$.sjpOpenCases.length()", Matchers.is(1)))) - ), + payload().isJson(any(ReadContext.class))), status().is(INTERNAL_SERVER_ERROR), status().is(FORBIDDEN)) ); diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java index e4066ec148..f462c53286 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java @@ -16,14 +16,18 @@ public class PendingDatesToAvoidPoller { - private static RequestParamsBuilder getDatesToAvoid(final String userId) { + private static RequestParamsBuilder getDatesToAvoid(final String userId, final String prosecutingAuthority) { + final String url = prosecutingAuthority != null ? "/cases/pending-dates-to-avoid?prosecutingAuthority=" + + prosecutingAuthority : "/cases/pending-dates-to-avoid"; + final String contentType = "application/vnd.sjp.query.pending-dates-to-avoid+json"; - return requestParams(getReadUrl("/cases/pending-dates-to-avoid"), contentType) + return requestParams(getReadUrl(url), contentType) .withHeader(HeaderConstants.USER_ID, userId); } - public static JsonPath pollUntilPendingDatesToAvoidIsOk(final String userId, final Matcher jsonPayloadMatcher) { - return new JsonPath(pollWithDefaults(getDatesToAvoid(userId)) + public static JsonPath pollUntilPendingDatesToAvoidIsOk(final String userId, final Matcher jsonPayloadMatcher, + final String prosecutingAuthority) { + return new JsonPath(pollWithDefaults(getDatesToAvoid(userId, prosecutingAuthority)) .until( status().is(OK), payload().isJson(jsonPayloadMatcher) 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 7e00e6082d..f39cbe09fd 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 @@ -9,11 +9,12 @@ 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_OK; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.Optional; import java.util.UUID; -import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -27,9 +28,9 @@ public static void stubGetEmptyAssignmentsByDomainObjectId(final UUID caseId) { } public static void stubGetAssignmentsByDomainObjectId(final UUID caseId, final Optional assignmentNature, final UUID... assignees) { - final JsonArrayBuilder assignments = JsonObjects.createArrayBuilder(); + final JsonArrayBuilder assignments = createArrayBuilder(); for (final UUID assignee : assignees) { - final JsonObjectBuilder assignment = JsonObjects.createObjectBuilder() + final JsonObjectBuilder assignment = createObjectBuilder() .add("id", UUID.randomUUID().toString()) .add("version", 2) .add("domainObjectId", caseId.toString()) @@ -38,7 +39,7 @@ public static void stubGetAssignmentsByDomainObjectId(final UUID caseId, final O assignments.add(assignment); } - final JsonObject payload = JsonObjects.createObjectBuilder().add("assignments", assignments).build(); + final JsonObject payload = 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 ebbec6b32d..70630f4f73 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,12 @@ 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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.OK; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.time.ZonedDateTime; import java.util.UUID; -import uk.gov.justice.services.messaging.JsonObjects; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; @@ -57,7 +56,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(JsonObjects.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(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 253f4e5aca..ad69bbcf78 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,6 @@ import static java.lang.String.format; import static java.util.Optional.empty; import static java.util.UUID.randomUUID; -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; @@ -24,6 +23,7 @@ import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.POLL_INTERVAL; import uk.gov.justice.services.common.http.HeaderConstants; @@ -31,16 +31,13 @@ import uk.gov.justice.services.messaging.DefaultJsonObjectEnvelopeConverter; import uk.gov.justice.services.messaging.JsonEnvelope; -import java.time.Duration; import java.time.ZonedDateTime; import java.util.UUID; import java.util.concurrent.TimeUnit; -import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.github.tomakehurst.wiremock.verification.LoggedRequest; -import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class MaterialStub { @@ -90,7 +87,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 = JsonObjects.createObjectBuilder() + final JsonObject metadata = 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 5ec95790ff..1f352f8289 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,13 +8,13 @@ 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 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; import static org.awaitility.Awaitility.waitAtMost; import static org.hamcrest.Matchers.hasSize; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.Constants.PUBLIC_EVENT; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.POLL_INTERVAL; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.TIMEOUT_IN_SECONDS; 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 5c999b2845..ba7e7762c2 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,14 +9,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.lang.String.format; import static java.util.UUID.randomUUID; -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; import static org.apache.http.HttpHeaders.ACCEPT; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.justice.services.common.http.HeaderConstants.ID; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.Constants.DEFAULT_OFFENCE_CODE; import static uk.gov.moj.sjp.it.util.Defaults.DEFAULT_AOCP_COURT_HOUSE_OU_CODE; import static uk.gov.moj.sjp.it.util.Defaults.DEFAULT_AOCP_LJA_NATIONAL_COURT_CODE; @@ -36,7 +36,6 @@ import java.util.Map; import java.util.UUID; -import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -285,7 +284,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(JsonObjects.createArrayBuilder(), JsonArrayBuilder::add, JsonArrayBuilder::add).build(); + .reduce(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 8af58c7826..5a1b3de78a 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 @@ -11,6 +11,7 @@ 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_OK; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.util.FileUtil.getPayload; import uk.gov.justice.json.schemas.domains.sjp.User; @@ -18,7 +19,6 @@ import java.util.UUID; -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 = JsonObjects.createObjectBuilder() + final JsonObjectBuilder userDetailsBuilder = 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 a9d49543a5..572bf620e6 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 @@ -2,16 +2,14 @@ import static com.google.common.collect.Lists.newArrayList; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -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; import static org.hamcrest.Matchers.hasSize; import static uk.gov.justice.json.schemas.domains.sjp.User.user; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.stub.UsersGroupsStub.stubForUserDetails; import static uk.gov.moj.sjp.it.stub.UsersGroupsStub.stubGroupForUser; import static uk.gov.moj.sjp.it.util.CaseAssignmentRestrictionHelper.pollCaseAssignmentRestriction; @@ -19,7 +17,6 @@ import static uk.gov.moj.sjp.it.util.SjpDatabaseCleaner.cleanViewStore; import uk.gov.justice.json.schemas.domains.sjp.User; -import uk.gov.moj.sjp.it.util.SjpDatabaseCleaner; import java.sql.SQLException; import java.util.List; 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 dc8ae5b79c..ad9b1e2b1b 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,6 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -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; @@ -18,6 +17,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.moj.cpp.sjp.domain.SessionType.DELEGATED_POWERS; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; 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 d6fc0c99a4..7650c76d52 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,11 +4,11 @@ import static java.time.LocalDate.now; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -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; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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 e5187cfe35..1b74d769dd 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,12 +3,12 @@ import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -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; import static org.junit.jupiter.api.Assertions.assertTrue; +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.common.CaseManagementStatus.DONE; import static uk.gov.moj.cpp.sjp.domain.common.CaseManagementStatus.IN_PROGRESS; import static uk.gov.moj.sjp.it.Constants.NOTICE_PERIOD_IN_DAYS; 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 5e88c9aff7..1e35bf92da 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,6 @@ import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.of; -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; @@ -18,6 +17,7 @@ import static uk.gov.justice.core.courts.NextHearing.nextHearing; import static uk.gov.justice.json.schemas.domains.sjp.Language.W; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.domain.SessionType.DELEGATED_POWERS; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; import static uk.gov.moj.cpp.sjp.domain.decision.OffenceDecisionInformation.createOffenceDecisionInformation; 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 3093a994ff..4506642ee1 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,6 @@ import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; -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; @@ -17,6 +16,8 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertTrue; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder.defaultCaseBuilder; import static uk.gov.moj.sjp.it.command.CreateCase.OffenceBuilder.defaultOffenceBuilder; import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; @@ -52,7 +53,6 @@ import java.util.Optional; import java.util.UUID; -import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -81,7 +81,7 @@ public class CreateCaseIT extends BaseIntegrationTest { private static final String UPDATE_OFFENCE_MEDIA_TYPE = "application/vnd.sjp.update-offence-code+json"; @BeforeEach - public void setUp(){ + public void setUp() { stubOffenceFineLevelsQuery(fineLevel, maxValue); stubQueryOffencesByCode(offenceCode1); stubQueryOffencesByCode(offenceCode2); @@ -152,19 +152,19 @@ public void shouldCreateCaseWhenDefendantIsALegalEntity() { assertThat(jsonResponse.get("id"), equalTo(caseId.toString())); assertThat(jsonResponse.get("urn"), equalTo(createCase.getUrn())); assertThat(jsonResponse.get("prosecutingAuthorityName"), equalTo(TFL.getFullName())); - assertThat(jsonResponse.get("defendant.asn") , equalTo(defendant.getAsn())); - assertThat(jsonResponse.get("defendant.pncIdentifier") , equalTo(defendant.getPncIdentifier())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.legalEntityName") , equalTo(defendant.getLegalEntityName())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address1") , equalTo(defendant.getAddressBuilder().getAddress1())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address2") , equalTo(defendant.getAddressBuilder().getAddress2())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address3") , equalTo(defendant.getAddressBuilder().getAddress3())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address4") , equalTo(defendant.getAddressBuilder().getAddress4())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address5") , equalTo(defendant.getAddressBuilder().getAddress5())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.address.postcode") , equalTo(defendant.getAddressBuilder().getPostcode())); - - assertThat(jsonResponse.get("defendant.legalEntityDetails.contactDetails.mobile") , equalTo(defendant.getContactDetailsBuilder().getMobile())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.contactDetails.email") , equalTo(defendant.getContactDetailsBuilder().getEmail())); - assertThat(jsonResponse.get("defendant.legalEntityDetails.contactDetails.home") , equalTo(defendant.getContactDetailsBuilder().getHome())); + assertThat(jsonResponse.get("defendant.asn"), equalTo(defendant.getAsn())); + assertThat(jsonResponse.get("defendant.pncIdentifier"), equalTo(defendant.getPncIdentifier())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.legalEntityName"), equalTo(defendant.getLegalEntityName())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address1"), equalTo(defendant.getAddressBuilder().getAddress1())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address2"), equalTo(defendant.getAddressBuilder().getAddress2())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address3"), equalTo(defendant.getAddressBuilder().getAddress3())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address4"), equalTo(defendant.getAddressBuilder().getAddress4())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.address.address5"), equalTo(defendant.getAddressBuilder().getAddress5())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.address.postcode"), equalTo(defendant.getAddressBuilder().getPostcode())); + + assertThat(jsonResponse.get("defendant.legalEntityDetails.contactDetails.mobile"), equalTo(defendant.getContactDetailsBuilder().getMobile())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.contactDetails.email"), equalTo(defendant.getContactDetailsBuilder().getEmail())); + assertThat(jsonResponse.get("defendant.legalEntityDetails.contactDetails.home"), equalTo(defendant.getContactDetailsBuilder().getHome())); } @@ -390,7 +390,7 @@ public void shouldMultiOffenceCaseBeCreatedWithDvlaAttributes() { } @Test - public void shouldCaseBeCreatedWithoutDefendantTitle(){ + public void shouldCaseBeCreatedWithoutDefendantTitle() { final UUID caseId = randomUUID(); final ProsecutingAuthority prosecutingAuthority = TFL; stubProsecutorQuery(prosecutingAuthority.name(), prosecutingAuthority.getFullName(), randomUUID()); @@ -409,11 +409,11 @@ public void shouldCaseBeCreatedWithoutDefendantTitle(){ assertThat(jsonResponse.get("id"), equalTo(caseId.toString())); assertThat(jsonResponse.get("urn"), equalTo(createCase.getUrn())); assertThat(jsonResponse.get("prosecutingAuthorityName"), equalTo(TFL.getFullName())); - assertThat(jsonResponse.get("defendant.personalDetails.title") , blankOrNullString()); + assertThat(jsonResponse.get("defendant.personalDetails.title"), blankOrNullString()); } @Test - public void shouldCaseBeCreatedWithoutPostcode(){ + public void shouldCaseBeCreatedWithoutPostcode() { final UUID caseId = randomUUID(); final ProsecutingAuthority prosecutingAuthority = TFL; stubProsecutorQuery(prosecutingAuthority.name(), prosecutingAuthority.getFullName(), randomUUID()); @@ -432,11 +432,11 @@ public void shouldCaseBeCreatedWithoutPostcode(){ assertThat(jsonResponse.get("id"), equalTo(caseId.toString())); assertThat(jsonResponse.get("urn"), equalTo(createCase.getUrn())); assertThat(jsonResponse.get("prosecutingAuthorityName"), equalTo(TFL.getFullName())); - assertThat(jsonResponse.get("defendant.personalDetails.address.postcode") , blankOrNullString()); + assertThat(jsonResponse.get("defendant.personalDetails.address.postcode"), blankOrNullString()); } @Test - public void shouldCaseBeCreatedWithAsnAndPncIdentifier(){ + public void shouldCaseBeCreatedWithAsnAndPncIdentifier() { final UUID caseId = randomUUID(); final ProsecutingAuthority prosecutingAuthority = TFL; stubProsecutorQuery(prosecutingAuthority.name(), prosecutingAuthority.getFullName(), randomUUID()); @@ -454,13 +454,13 @@ public void shouldCaseBeCreatedWithAsnAndPncIdentifier(){ assertThat(jsonResponse.get("id"), equalTo(caseId.toString())); assertThat(jsonResponse.get("urn"), equalTo(createCase.getUrn())); assertThat(jsonResponse.get("prosecutingAuthorityName"), equalTo(TFL.getFullName())); - assertThat(jsonResponse.get("defendant.asn") , equalTo(defendant.getAsn())); + assertThat(jsonResponse.get("defendant.asn"), equalTo(defendant.getAsn())); assertThat(jsonResponse.get("defendant.pcqId"), is(notNullValue())); - assertThat(jsonResponse.get("defendant.pncIdentifier") , equalTo(defendant.getPncIdentifier())); + assertThat(jsonResponse.get("defendant.pncIdentifier"), equalTo(defendant.getPncIdentifier())); } @Test - public void shouldCaseBeCreatedWithEndorsableOffences(){ + public void shouldCaseBeCreatedWithEndorsableOffences() { final UUID caseId = randomUUID(); final ProsecutingAuthority prosecutingAuthority = TVL; stubProsecutorQuery(prosecutingAuthority.name(), prosecutingAuthority.getFullName(), randomUUID()); @@ -578,8 +578,9 @@ private CreateCase.CreateCasePayloadBuilder createMultiOffenceCaseWithDvlaAttrib ).collect(toList())) .withDefendantId(randomUUID()); } + private JsonObject responseToJsonObject(String response) { - return JsonObjects.createReader(new StringReader(response)).readObject(); + return 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/DatesToAvoidIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DatesToAvoidIT.java index e241e1a23f..4921b5fb72 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DatesToAvoidIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DatesToAvoidIT.java @@ -122,7 +122,7 @@ public void setUp() throws Exception { @Test public void shouldCaseBePendingDatesToAvoidForPleaChangeScenariosAndBeResultedAfterDatesToAvoid() { setupIdMapperStub(); - shouldCaseBePendingDatesToAvoidForPleaChangeScenarios(); + shouldCaseBePendingDatesToAvoidForPleaChangeScenarios(null); addDatesToAvoid(tflCaseBuilder.getId(), DATE_TO_AVOID); assertThatNumberOfCasesPendingDatesToAvoidIsAccurate(tflUserId, tflInitialPendingDatesToAvoidCount); @@ -134,7 +134,7 @@ public void shouldCaseBePendingDatesToAvoidForPleaChangeScenariosAndBeResultedAf @Test public void shouldCaseBePendingDatesToAvoidForPleaChangeScenariosAndBeReadyAfterDatesToAvoidExpiry() { - shouldCaseBePendingDatesToAvoidForPleaChangeScenarios(); + shouldCaseBePendingDatesToAvoidForPleaChangeScenarios("TFL"); pollUntilCaseHasStatus(tflCaseBuilder.getId(), PLEA_RECEIVED_NOT_READY_FOR_DECISION); makeDatesToAvoidExpired(eventListener, tflCaseBuilder.getId()); verifyDatesToAvoidExpiredEventEmitted(eventListener, tflCaseBuilder.getId()); @@ -198,7 +198,7 @@ private void shouldCaseBePendingDatesToAvoidForResultedCaseScenario(UUID userId, updatePleaToNotGuiltyAndConfirm(tvlCaseBuilder.getId(), tvlCaseBuilder.getOffenceId(), tvlCaseBuilder.getDefendantBuilder().getId()); //checks that correct dates-to-avoid record is retrieved (i.e. the one related to the case passed in) - assertThatDatesToAvoidIsPendingSubmissionForCase(userId, createCasePayloadBuilder); + assertThatDatesToAvoidIsPendingSubmissionForCase(userId, createCasePayloadBuilder, null); requestWithdrawalOfOffences(createCasePayloadBuilder.getId(), userId, asList(withdrawalRequestsStatus() .withOffenceId(createCasePayloadBuilder.getOffenceId()) @@ -210,11 +210,11 @@ private void shouldCaseBePendingDatesToAvoidForResultedCaseScenario(UUID userId, assertThatNumberOfCasesPendingDatesToAvoidIsAccurate(userId, expectedPendingDatesToAvoidCount); } - private void shouldCaseBePendingDatesToAvoidForPleaChangeScenarios() { + private void shouldCaseBePendingDatesToAvoidForPleaChangeScenarios(final String prosecutingAuthority) { //checks that dates-to-avoid is pending submission when NOT_GUILTY plea submitted updatePleaToNotGuiltyAndConfirm(tflCaseBuilder.getId(), tflCaseBuilder.getOffenceId(), tflCaseBuilder.getDefendantBuilder().getId()); // verifyDatesToAvoidRequiredEvent(tflCaseBuilder.getId()); - assertThatDatesToAvoidIsPendingSubmissionForCase(tflUserId, tflCaseBuilder); + assertThatDatesToAvoidIsPendingSubmissionForCase(tflUserId, tflCaseBuilder, prosecutingAuthority); //checks that dates-to-avoid NOT pending submission when plea is cancelled cancelPlea(tflCaseBuilder.getId(), tflCaseBuilder.getOffenceId(), tflCaseBuilder.getDefendantBuilder().getId()); @@ -223,7 +223,7 @@ private void shouldCaseBePendingDatesToAvoidForPleaChangeScenarios() { //checks that dates-to-avoid is pending submission again when plea updated to NOT_GUILTY updatePleaToNotGuiltyAndConfirm(tflCaseBuilder.getId(), tflCaseBuilder.getOffenceId(), tflCaseBuilder.getDefendantBuilder().getId()); - assertThatDatesToAvoidIsPendingSubmissionForCase(tflUserId, tflCaseBuilder); + assertThatDatesToAvoidIsPendingSubmissionForCase(tflUserId, tflCaseBuilder, prosecutingAuthority); } private void completeCase(CreateCase.CreateCasePayloadBuilder createCasePayloadBuilder) { @@ -242,11 +242,12 @@ private void cancelPlea(final UUID caseId, final UUID offenceId, final UUID defe false, null, singletonList(Triple.of(offenceId, defendantId, null))); } - private void assertThatDatesToAvoidIsPendingSubmissionForCase(final UUID userId, final CreateCase.CreateCasePayloadBuilder aCase) { + private void assertThatDatesToAvoidIsPendingSubmissionForCase(final UUID userId, final CreateCase.CreateCasePayloadBuilder aCase, + final String prosecutingAuthority) { final Matcher pendingDatesToAvoidMatcher = withJsonPath("$.cases[-1].caseId", equalTo(aCase.getId().toString())); - final JsonPath path = pollUntilPendingDatesToAvoidIsOk(userId.toString(), pendingDatesToAvoidMatcher); + final JsonPath path = pollUntilPendingDatesToAvoidIsOk(userId.toString(), pendingDatesToAvoidMatcher, prosecutingAuthority); final List pendingDatesToAvoid = path.getList("cases"); final Integer datesToAvoidCount = path.get("count"); final Map map = pendingDatesToAvoid.get(pendingDatesToAvoid.size() - 1); @@ -267,12 +268,12 @@ private void assertThatDatesToAvoidIsPendingSubmissionForCase(final UUID userId, } private int pollForCountOfCasesPendingDatesToAvoid(final UUID userId) { - return pollUntilPendingDatesToAvoidIsOk(userId.toString(), withJsonPath("$.count")) + return pollUntilPendingDatesToAvoidIsOk(userId.toString(), withJsonPath("$.count"), null) .get("count"); } private void assertThatNumberOfCasesPendingDatesToAvoidIsAccurate(final UUID userId, final int pendingDatesToAvoidCount) { - pollUntilPendingDatesToAvoidIsOk(userId.toString(), withJsonPath("$.count", equalTo(pendingDatesToAvoidCount))); + pollUntilPendingDatesToAvoidIsOk(userId.toString(), withJsonPath("$.count", equalTo(pendingDatesToAvoidCount)), null); } private void assertWithinSeconds(final long value, final long tolerance) { 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 f806cbbfa0..4e3dd5fd0b 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 @@ -11,6 +11,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.core.Is.is; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; @@ -45,7 +46,7 @@ import java.util.Optional; import java.util.UUID; -import uk.gov.justice.services.messaging.JsonObjects; +import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.core.Response; @@ -245,7 +246,7 @@ public void shouldObeyLimit() { @Test public void shouldReturnUpdatedDetailsBasedOnUserProsecutingAuthority() { - final JsonObject existingUpdatedDefendantDetails = getUpdatedDefendantDetails(tvlUserUid); + final JsonObject existingUpdatedDefendantDetails = getUpdatedDefendantDetails(tvlUserUid, "TVL"); updateDefendantDetailsForCaseAndPayload( caseIdOne, @@ -275,10 +276,20 @@ private JsonObject getUpdatedDefendantDetails(UUID userUid) { userUid); assertThat(response.getStatus(), equalTo(Response.Status.OK.getStatusCode())); - return JsonObjects.createReader(new StringReader(response.readEntity(String.class))).readObject(); + return createReader(new StringReader(response.readEntity(String.class))).readObject(); + } + + private JsonObject getUpdatedDefendantDetails(UUID userUid, String prosecutingAuhority) { + final Response response = makeGetCall( + "/defendant-details-updates?limit=" + Integer.MAX_VALUE + "&prosecutingAuthority="+ prosecutingAuhority, + DEFENDANT_DETAIL_UPDATES_CONTENT_TYPE, + userUid); + assertThat(response.getStatus(), equalTo(Response.Status.OK.getStatusCode())); + + return Json.createReader(new StringReader(response.readEntity(String.class))).readObject(); } private JsonObject responseToJsonObject(String response) { - return JsonObjects.createReader(new StringReader(response)).readObject(); + return 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 59ee08ce8d..dcc7f8fe9b 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 @@ -1,18 +1,21 @@ package uk.gov.moj.sjp.it.test; -import static java.time.LocalDate.*; +import static java.time.LocalDate.of; import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder.defaultCaseBuilder; import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.TFL; import static uk.gov.moj.sjp.it.pollingquery.CasePoller.pollForCase; +import static uk.gov.moj.sjp.it.pollingquery.CasePoller.pollUntilCaseByIdIsOk; import static uk.gov.moj.sjp.it.pollingquery.CasePoller.pollUntilPotentialCasesByDefendantIdIsOk; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubProsecutorQuery; import static uk.gov.moj.sjp.it.stub.UnifiedSearchStub.stubUnifiedSearchQueryForCases; +import org.junit.jupiter.api.Disabled; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.CaseReceived; import uk.gov.moj.sjp.it.command.CreateCase; @@ -24,7 +27,6 @@ import java.util.Optional; import java.util.UUID; -import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -64,7 +66,7 @@ public void shouldReturnFalseForPotentialCases() { } @Test - public void shouldFindPotentialCases() { + public void shouldFindPotentialCases(){ UUID caseId = randomCaseId; UUID defendantId = randomUUID(); @@ -81,6 +83,8 @@ public void shouldFindPotentialCases() { .popEvent(CaseReceived.EVENT_NAME); assertTrue(caseReceivedEvent.isPresent()); + pollUntilCaseByIdIsOk(caseId); + final String potentialCasesResponsePayload = pollUntilPotentialCasesByDefendantIdIsOk(defendantId); final JsonObject potentialCases = responseToJsonObject(potentialCasesResponsePayload); final JsonArray sjpOpenCases = potentialCases.getJsonArray("sjpOpenCases"); @@ -108,6 +112,6 @@ private CreateCase.CreateCasePayloadBuilder createCase(UUID caseId, } private JsonObject responseToJsonObject(String response) { - return JsonObjects.createReader(new StringReader(response)).readObject(); + return 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 85e16489a8..ce546c19bc 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,9 +3,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singleton; -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.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.cpp.sjp.domain.IncomeFrequency.MONTHLY; import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; import static uk.gov.moj.sjp.it.helper.DeleteFinancialMeansMatcherHelper.getExpectedFinancialMeanDataAfterDeletionMatcher; @@ -37,7 +38,6 @@ import java.util.Set; import java.util.UUID; -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 = JsonObjects.createReader(new StringReader(jsonObject.toString()))) { + try (JsonReader jsonReader = 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 7ca5ebc3c5..23b78f12ab 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 @@ -7,9 +7,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.COMPLETED; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.COMPLETED_APPLICATION_PENDING; -import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; import static uk.gov.moj.cpp.sjp.domain.decision.discharge.DischargeType.CONDITIONAL; import static uk.gov.moj.cpp.sjp.domain.decision.discharge.PeriodUnit.MONTH; import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.FOUND_GUILTY; @@ -74,7 +75,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -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 = JsonObjects.createObjectBuilder(); + final JsonObjectBuilder payload = 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 cb341f1a4c..a4fa8389b5 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 @@ -1,19 +1,19 @@ package uk.gov.moj.sjp.it.test; import static java.util.UUID.randomUUID; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubEnforcementAreaByPostcode; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubProsecutorQuery; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubQueryOffencesByCode; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubRegionByPostcode; -import uk.gov.moj.sjp.it.model.ProsecutingAuthority; import uk.gov.moj.sjp.it.command.CreateCase; import uk.gov.moj.sjp.it.helper.CitizenHelper; +import uk.gov.moj.sjp.it.model.ProsecutingAuthority; import java.util.UUID; -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 = JsonObjects.createReader(getClass().getResourceAsStream("/GetCaseByUrnAndPostcodeIT/expected.json")).readObject(); + final JsonObject expected = 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 8a6e0076e0..ce4f16cd53 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 @@ -13,6 +13,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.helper.CaseDocumentHelper.getCaseDocumentContent; import static uk.gov.moj.sjp.it.helper.CaseDocumentHelper.getCaseDocumentMetadata; import static uk.gov.moj.sjp.it.helper.CaseDocumentHelper.pollForCaseDocument; @@ -34,7 +35,6 @@ import java.time.ZonedDateTime; import java.util.UUID; -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 = JsonObjects.createObjectBuilder().add("url", documentUrl).build(); + private final JsonObject expectedResponse = 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/MultipleOffencesWithdrawalRequestedIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesWithdrawalRequestedIT.java index f888f0f6a5..392985c24c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesWithdrawalRequestedIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesWithdrawalRequestedIT.java @@ -35,7 +35,7 @@ import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.DVLA; import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.TFL; import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.TVL; -import static uk.gov.moj.sjp.it.stub.IdMapperStub.stubAddMapping; +import static uk.gov.moj.sjp.it.stub.IdMapperStub.stubForIdMapperSuccess; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubDefaultCourtByCourtHouseOUCodeQuery; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubEnforcementAreaByPostcode; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubProsecutorQuery; @@ -75,6 +75,8 @@ import java.util.UUID; import java.util.stream.Collectors; +import javax.ws.rs.core.Response; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import org.hamcrest.Matcher; @@ -183,12 +185,10 @@ public void offenceWithdrawalRequestForMultipleOffences() throws Exception { @Test public void offenceWithdrawalForSomeOffencesOnAPartiallyDecidedCaseMakesCaseReady() throws Exception { - stubAddMapping(); stubDefaultCourtByCourtHouseOUCodeQuery(); stubForUserDetails(user, "ALL"); stubEnforcementAreaByPostcode(aCase.getDefendantBuilder().getAddressBuilder().getPostcode(), "1080", "Bedfordshire Magistrates' Court"); - - + stubForIdMapperSuccess(Response.Status.OK); final UUID sessionId = randomUUID(); 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 bf2fbed8ac..cbecb3e6f1 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,6 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -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; @@ -28,6 +26,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static uk.gov.justice.json.schemas.domains.sjp.User.user; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.REFERRED_FOR_COURT_HEARING; import static uk.gov.moj.cpp.sjp.domain.disability.DisabilityNeeds.NO_DISABILITY_NEEDS; 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 26b3b4a5c8..59b2a2b408 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,11 +7,11 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -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; import static org.hamcrest.text.IsEqualCompressingWhiteSpace.equalToCompressingWhiteSpace; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.Constants.NOTICE_PERIOD_IN_DAYS; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder; import static uk.gov.moj.sjp.it.command.CreateCase.DefendantBuilder.defaultDefendant; 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 0d095d9b13..064ca07b4a 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,13 +5,13 @@ import static java.time.Month.JULY; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -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; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; 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 654939518e..6eca603c77 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 @@ -5,6 +5,7 @@ import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; @@ -21,8 +22,6 @@ import java.time.ZoneOffset; import java.util.UUID; -import uk.gov.justice.services.messaging.JsonObjects; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -100,7 +99,7 @@ private CreateCase.CreateCasePayloadBuilder createCase() { private static CaseDocumentHelper createResultOrder(final UUID caseId) { CaseDocumentHelper caseDocumentHelper = new CaseDocumentHelper(caseId); caseDocumentHelper.addCaseDocument( - JsonObjects.createObjectBuilder().add("id", caseDocumentHelper.getDocumentId()) + 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/SearchCasesIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SearchCasesIT.java index 690a44037c..a20b5425f3 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SearchCasesIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SearchCasesIT.java @@ -16,7 +16,6 @@ import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.DVLA; import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.TFL; import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.TVL; -import static uk.gov.moj.sjp.it.stub.IdMapperStub.stubAddMapping; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubEnforcementAreaByPostcode; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubProsecutorQuery; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubRegionByPostcode; @@ -148,7 +147,6 @@ public void findsDefendantByHistoricalLastName() { @Test public void verifyCaseAssignmentIsReflected() { - stubAddMapping(); //given case is created final CreateCase.CreateCasePayloadBuilder createCasePayloadBuilder = withDefaults().withDefendantBuilder(defendantBuilder); createCaseForPayloadBuilder(createCasePayloadBuilder); 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 f59625d7c2..22900113b1 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,11 +7,11 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -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; import static org.hamcrest.text.IsEqualCompressingWhiteSpace.equalToCompressingWhiteSpace; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.Constants.NOTICE_PERIOD_IN_DAYS; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder; import static uk.gov.moj.sjp.it.command.CreateCase.DefendantBuilder.defaultDefendant; 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 de3b223adb..0e2ae75d24 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,10 +4,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.domain.IncomeFrequency.MONTHLY; import static uk.gov.moj.cpp.sjp.domain.IncomeFrequency.YEARLY; import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateDefendantDetailsFromCCIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateDefendantDetailsFromCCIT.java new file mode 100644 index 0000000000..e74d11e31b --- /dev/null +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateDefendantDetailsFromCCIT.java @@ -0,0 +1,454 @@ +package uk.gov.moj.sjp.it.test; + +import static java.util.UUID.randomUUID; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder.withDefaults; +import static uk.gov.moj.sjp.it.command.CreateCase.DefendantBuilder.defaultLegalEntityDefendant; +import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; +import static uk.gov.moj.sjp.it.pollingquery.CasePoller.pollUntilCaseByIdIsOk; +import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubEnforcementAreaByPostcode; +import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubProsecutorQuery; +import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubRegionByPostcode; +import static uk.gov.moj.sjp.it.stub.UsersGroupsStub.stubForUserDetails; + +import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClient; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.sjp.it.command.CreateCase; +import uk.gov.moj.sjp.it.helper.EventListener; +import uk.gov.moj.sjp.it.model.ProsecutingAuthority; + +import java.util.Optional; +import java.util.UUID; + +import javax.json.JsonObject; + +import org.junit.Before; +import org.junit.Test; + +public class UpdateDefendantDetailsFromCCIT extends BaseIntegrationTest { + + private static final String DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT = "public.sjp.events.defendant-details-updated"; + private final UUID caseId = randomUUID(); + private final UUID userId = randomUUID(); + private CreateCase.CreateCasePayloadBuilder createCasePayloadBuilder; + + @Before + public void setUp() { + createCasePayloadBuilder = withDefaults(); + stubEnforcementAreaByPostcode(createCasePayloadBuilder.getDefendantBuilder().getAddressBuilder().getPostcode(), + "1080", "Bedfordshire Magistrates' Court"); + stubRegionByPostcode("1080", "TestRegion"); + + createCaseForPayloadBuilder(createCasePayloadBuilder.withId(caseId)); + + stubForUserDetails(userId, ProsecutingAuthority.TVL); + stubProsecutorQuery(ProsecutingAuthority.TFL.name(), ProsecutingAuthority.TFL.getFullName(), randomUUID()); + } + + @Test + public void shouldUpdateDefendantDetailsFromCCWhenEventReceived() { + // given + UUID defendantId = UUID.fromString(pollUntilCaseByIdIsOk(caseId).getString("defendant.id")); + + final JsonObject personDetails = createObjectBuilder() + .add("title", "Mr") + .add("firstName", "John") + .add("lastName", "Updated") + .add("dateOfBirth", "1985-06-20") + .add("gender", "MALE") + .add("nationalInsuranceNumber", "AB123456C") + .add("address", createObjectBuilder() + .add("address1", "123 Updated Street") + .add("address2", "Updated City") + .add("postcode", "SW1A 1AA") + .build()) + .add("contact", createObjectBuilder() + .add("home", "02011111111") + .add("mobile", "07111111111") + .add("primaryEmail", "updated@example.com") + .build()) + .build(); + + final JsonObject personDefendant = createObjectBuilder() + .add("personDetails", personDetails) + .add("driverNumber", "TESTY708166G99KZ") + .build(); + + final JsonObject defendant = createObjectBuilder() + .add("id", defendantId.toString()) + .add("prosecutionCaseId", caseId.toString()) + .add("personDefendant", personDefendant) + .build(); + + final JsonObject eventPayload = createObjectBuilder() + .add("defendant", defendant) + .build(); + + // when + final EventListener defendantDetailsUpdatedListener = new EventListener() + .subscribe(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT) + .run(() -> { + final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() + .getMessageProducerClient(); + publicJmsMessageProducerClient.sendMessage("public.progression.case-defendant-changed", eventPayload); + }); + + // then + final Optional defendantDetailsUpdatedEvent = defendantDetailsUpdatedListener.popEvent(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT); + + assertThat(defendantDetailsUpdatedEvent.isPresent(), is(true)); + final JsonObject payload = defendantDetailsUpdatedEvent.get().payloadAsJsonObject(); + assertThat(payload.getString("caseId"), is(caseId.toString())); + assertThat(payload.getString("defendantId"), is(defendantId.toString())); + } + + @Test + public void shouldUpdateDefendantDetailsFromCCWhenCaseIsCompleted() { + // given + UUID defendantId = UUID.fromString(pollUntilCaseByIdIsOk(caseId).getString("defendant.id")); + + final JsonObject personDetails = createObjectBuilder() + .add("title", "Mr") + .add("firstName", "John") + .add("lastName", "CompletedCase") + .add("dateOfBirth", "1985-06-20") + .add("gender", "MALE") + .add("address", createObjectBuilder() + .add("address1", "123 Completed Street") + .add("postcode", "SW1A 1AA") + .build()) + .add("contact", createObjectBuilder() + .add("primaryEmail", "completed@example.com") + .build()) + .build(); + + final JsonObject personDefendant = createObjectBuilder() + .add("personDetails", personDetails) + .build(); + + final JsonObject defendant = createObjectBuilder() + .add("id", defendantId.toString()) + .add("prosecutionCaseId", caseId.toString()) + .add("personDefendant", personDefendant) + .build(); + + final JsonObject eventPayload = createObjectBuilder() + .add("defendant", defendant) + .build(); + + // when - should succeed even though case might be completed (key difference from regular update) + final EventListener defendantDetailsUpdatedListener = new EventListener() + .subscribe(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT) + .run(() -> { + final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() + .getMessageProducerClient(); + publicJmsMessageProducerClient.sendMessage("public.progression.case-defendant-changed", eventPayload); + }); + + // then + final Optional defendantDetailsUpdatedEvent = defendantDetailsUpdatedListener.popEvent(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT); + + assertThat(defendantDetailsUpdatedEvent.isPresent(), is(true)); + final JsonObject payload = defendantDetailsUpdatedEvent.get().payloadAsJsonObject(); + assertThat(payload.getString("caseId"), is(caseId.toString())); + assertThat(payload.getString("defendantId"), is(defendantId.toString())); + } + + @Test + public void shouldUpdateDefendantDetailsFromCCWhenCaseIsReferredForCourtHearing() { + // given + UUID defendantId = UUID.fromString(pollUntilCaseByIdIsOk(caseId).getString("defendant.id")); + + final JsonObject personDetails = createObjectBuilder() + .add("title", "Mr") + .add("firstName", "John") + .add("lastName", "ReferredCase") + .add("dateOfBirth", "1985-06-20") + .add("gender", "MALE") + .add("nationalInsuranceNumber", "AB123456C") + .add("address", createObjectBuilder() + .add("address1", "123 Referred Street") + .add("postcode", "SW1A 1AA") + .build()) + .add("contact", createObjectBuilder() + .add("home", "02011111111") + .add("mobile", "07111111111") + .add("primaryEmail", "referred@example.com") + .build()) + .build(); + + final JsonObject personDefendant = createObjectBuilder() + .add("personDetails", personDetails) + .add("driverNumber", "MORGA753116SM9IV") + .build(); + + final JsonObject defendant = createObjectBuilder() + .add("id", defendantId.toString()) + .add("prosecutionCaseId", caseId.toString()) + .add("personDefendant", personDefendant) + .build(); + + final JsonObject eventPayload = createObjectBuilder() + .add("defendant", defendant) + .build(); + + // when - should succeed even though case might be referred (key difference from regular update) + final EventListener defendantDetailsUpdatedListener = new EventListener() + .subscribe(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT) + .run(() -> { + final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() + .getMessageProducerClient(); + publicJmsMessageProducerClient.sendMessage("public.progression.case-defendant-changed", eventPayload); + }); + + // then + final Optional defendantDetailsUpdatedEvent = defendantDetailsUpdatedListener.popEvent(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT); + + assertThat(defendantDetailsUpdatedEvent.isPresent(), is(true)); + final JsonObject payload = defendantDetailsUpdatedEvent.get().payloadAsJsonObject(); + assertThat(payload.getString("caseId"), is(caseId.toString())); + assertThat(payload.getString("defendantId"), is(defendantId.toString())); + } + + @Test + public void shouldNotProcessEventWhenDefendantIsMissing() { + // given + final JsonObject eventPayload = createObjectBuilder().build(); + + // when + final EventListener defendantDetailsUpdatedListener = new EventListener() + .subscribe(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT) + .run(() -> { + final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() + .getMessageProducerClient(); + publicJmsMessageProducerClient.sendMessage("public.progression.case-defendant-changed", eventPayload); + }); + + // then - no event should be generated + final Optional defendantDetailsUpdatedEvent = defendantDetailsUpdatedListener.popEvent(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT); + + assertThat(defendantDetailsUpdatedEvent.isPresent(), is(false)); + } + + @Test + public void shouldNotProcessEventWhenPersonDefendantIsMissing() { + // given + UUID defendantId = UUID.fromString(pollUntilCaseByIdIsOk(caseId).getString("defendant.id")); + + final JsonObject defendant = createObjectBuilder() + .add("id", defendantId.toString()) + .add("prosecutionCaseId", caseId.toString()) + .build(); + + final JsonObject eventPayload = createObjectBuilder() + .add("defendant", defendant) + .build(); + + // when + final EventListener defendantDetailsUpdatedListener = new EventListener() + .subscribe(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT) + .run(() -> { + final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() + .getMessageProducerClient(); + publicJmsMessageProducerClient.sendMessage("public.progression.case-defendant-changed", eventPayload); + }); + + // then - no event should be generated + final Optional defendantDetailsUpdatedEvent = defendantDetailsUpdatedListener.popEvent(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT); + + assertThat(defendantDetailsUpdatedEvent.isPresent(), is(false)); + } + + @Test + public void shouldUpdateLegalEntityDefendantDetailsFromCCWhenEventReceived() { + // given - create a case with legal entity defendant + final UUID legalEntityCaseId = randomUUID(); + final CreateCase.CreateCasePayloadBuilder legalEntityCaseBuilder = withDefaults() + .withId(legalEntityCaseId) + .withDefendantBuilder(defaultLegalEntityDefendant()); + + stubEnforcementAreaByPostcode(legalEntityCaseBuilder.getDefendantBuilder().getAddressBuilder().getPostcode(), + "1080", "Bedfordshire Magistrates' Court"); + stubRegionByPostcode("1080", "TestRegion"); + stubProsecutorQuery(legalEntityCaseBuilder.getProsecutingAuthority().name(), + legalEntityCaseBuilder.getProsecutingAuthority().getFullName(), randomUUID()); + + createCaseForPayloadBuilder(legalEntityCaseBuilder); + + UUID defendantId = UUID.fromString(pollUntilCaseByIdIsOk(legalEntityCaseId).getString("defendant.id")); + + // Prepare legal entity defendant update with new name and address + // Using Organisation structure as per LegalEntityDefendant class + final JsonObject updatedAddress = createObjectBuilder() + .add("address1", "789 Corporate Avenue") + .add("address2", "Business District") + .add("address3", "London") + .add("address4", "Greater London") + .add("address5", "UK") + .add("postcode", "EC1A 1BB") + .build(); + + JsonObject contactNumber = createObjectBuilder() + .add("home", "02088888888") + .add("mobile", "07988888888") + .add("work", "02099999999") + .add("primaryEmail", "updated@corporation.com") + .add("secondaryEmail", "info@corporation.com") + .build(); + + final JsonObject organisation = createObjectBuilder() + .add("name", "Acme Corporation Ltd") + .add("address", updatedAddress) + .add("contact", contactNumber) + .add("incorporationNumber", "INC123456") + .build(); + + final JsonObject legalEntityDefendant = createObjectBuilder() + .add("organisation", organisation) + .build(); + + final JsonObject defendant = createObjectBuilder() + .add("id", defendantId.toString()) + .add("prosecutionCaseId", legalEntityCaseId.toString()) + .add("legalEntityDefendant", legalEntityDefendant) + .build(); + + final JsonObject eventPayload = createObjectBuilder() + .add("defendant", defendant) + .build(); + + // when + final EventListener defendantDetailsUpdatedListener = new EventListener() + .subscribe(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT) + .run(() -> { + final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() + .getMessageProducerClient(); + publicJmsMessageProducerClient.sendMessage("public.progression.case-defendant-changed", eventPayload); + }); + + // then + final Optional defendantDetailsUpdatedEvent = defendantDetailsUpdatedListener.popEvent(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT); + + assertThat(defendantDetailsUpdatedEvent.isPresent(), is(true)); + final JsonObject payload = defendantDetailsUpdatedEvent.get().payloadAsJsonObject(); + + // Verify basic identifiers + assertThat(payload.getString("caseId"), is(legalEntityCaseId.toString())); + assertThat(payload.getString("defendantId"), is(defendantId.toString())); + + // Verify legal entity name from LegalEntityDefendant + assertThat(payload.getString("legalEntityName"), is("Acme Corporation Ltd")); + + // Verify address from LegalEntityDefendant + final JsonObject updatedEventAddress = payload.getJsonObject("address"); + assertThat(updatedEventAddress, is(notNullValue())); + assertThat(updatedEventAddress.getString("address1"), is("789 Corporate Avenue")); + assertThat(updatedEventAddress.getString("address2"), is("Business District")); + assertThat(updatedEventAddress.getString("postcode"), is("EC1A 1BB")); + + // Verify contact details from LegalEntityDefendant + // Note: The event schema uses "contactNumber" but the domain object uses ContactDetails + // The contactDetails should be serialized as contactNumber in the JSON + contactNumber = payload.getJsonObject("contactNumber"); + if (contactNumber != null) { + assertThat(contactNumber.getString("home"), is("02088888888")); + assertThat(contactNumber.getString("mobile"), is("07988888888")); + assertThat(contactNumber.getString("email"), is("updated@corporation.com")); + } + + // For legal entity defendants, person-specific fields should be null/absent + assertThat(payload.containsKey("firstName") ? payload.isNull("firstName") : true, is(true)); + assertThat(payload.containsKey("lastName") ? payload.isNull("lastName") : true, is(true)); + assertThat(payload.containsKey("title") ? payload.isNull("title") : true, is(true)); + } + + @Test + public void shouldUpdateLegalEntityDefendantDetailsWithoutContactFromCCWhenEventReceived() { + // given - create a case with legal entity defendant + final UUID legalEntityCaseId = randomUUID(); + final CreateCase.CreateCasePayloadBuilder legalEntityCaseBuilder = withDefaults() + .withId(legalEntityCaseId) + .withDefendantBuilder(defaultLegalEntityDefendant()); + + stubEnforcementAreaByPostcode(legalEntityCaseBuilder.getDefendantBuilder().getAddressBuilder().getPostcode(), + "1080", "Bedfordshire Magistrates' Court"); + stubRegionByPostcode("1080", "TestRegion"); + stubProsecutorQuery(legalEntityCaseBuilder.getProsecutingAuthority().name(), + legalEntityCaseBuilder.getProsecutingAuthority().getFullName(), randomUUID()); + + createCaseForPayloadBuilder(legalEntityCaseBuilder); + + UUID defendantId = UUID.fromString(pollUntilCaseByIdIsOk(legalEntityCaseId).getString("defendant.id")); + + // Prepare legal entity defendant update with new name and address + // Using Organisation structure as per LegalEntityDefendant class + final JsonObject updatedAddress = createObjectBuilder() + .add("address1", "789 Corporate Avenue") + .add("address2", "Business District") + .add("address3", "London") + .add("address4", "Greater London") + .add("address5", "UK") + .add("postcode", "EC1A 1BB") + .build(); + + final JsonObject organisation = createObjectBuilder() + .add("name", "Acme Corporation Ltd") + .add("address", updatedAddress) + .add("incorporationNumber", "INC123456") + .build(); + + final JsonObject legalEntityDefendant = createObjectBuilder() + .add("organisation", organisation) + .build(); + + final JsonObject defendant = createObjectBuilder() + .add("id", defendantId.toString()) + .add("prosecutionCaseId", legalEntityCaseId.toString()) + .add("legalEntityDefendant", legalEntityDefendant) + .build(); + + final JsonObject eventPayload = createObjectBuilder() + .add("defendant", defendant) + .build(); + + // when + final EventListener defendantDetailsUpdatedListener = new EventListener() + .subscribe(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT) + .run(() -> { + final JmsMessageProducerClient publicJmsMessageProducerClient = newPublicJmsMessageProducerClientProvider() + .getMessageProducerClient(); + publicJmsMessageProducerClient.sendMessage("public.progression.case-defendant-changed", eventPayload); + }); + + // then + final Optional defendantDetailsUpdatedEvent = defendantDetailsUpdatedListener.popEvent(DEFENDANT_DETAILS_UPDATED_PUBLIC_EVENT); + + assertThat(defendantDetailsUpdatedEvent.isPresent(), is(true)); + final JsonObject payload = defendantDetailsUpdatedEvent.get().payloadAsJsonObject(); + + // Verify basic identifiers + assertThat(payload.getString("caseId"), is(legalEntityCaseId.toString())); + assertThat(payload.getString("defendantId"), is(defendantId.toString())); + + // Verify legal entity name from LegalEntityDefendant + assertThat(payload.getString("legalEntityName"), is("Acme Corporation Ltd")); + + // Verify address from LegalEntityDefendant + final JsonObject updatedEventAddress = payload.getJsonObject("address"); + assertThat(updatedEventAddress, is(notNullValue())); + assertThat(updatedEventAddress.getString("address1"), is("789 Corporate Avenue")); + assertThat(updatedEventAddress.getString("address2"), is("Business District")); + assertThat(updatedEventAddress.getString("postcode"), is("EC1A 1BB")); + + + assertThat(payload.containsKey("contactNumber"), is(false)); + // For legal entity defendants, person-specific fields should be null/absent + assertThat(payload.containsKey("firstName") ? payload.isNull("firstName") : true, is(true)); + assertThat(payload.containsKey("lastName") ? payload.isNull("lastName") : true, is(true)); + assertThat(payload.containsKey("title") ? payload.isNull("title") : true, is(true)); + } +} 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 ac8c6b2358..6e5411fdfb 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,10 +5,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; -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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.domain.IncomeFrequency.MONTHLY; import static uk.gov.moj.cpp.sjp.domain.IncomeFrequency.WEEKLY; import static uk.gov.moj.sjp.it.stub.ReferenceDataServiceStub.stubEnforcementAreaByPostcode; @@ -17,9 +17,9 @@ import uk.gov.moj.cpp.sjp.domain.Benefits; import uk.gov.moj.cpp.sjp.domain.Income; -import uk.gov.moj.sjp.it.model.ProsecutingAuthority; import uk.gov.moj.sjp.it.command.CreateCase; import uk.gov.moj.sjp.it.helper.FinancialMeansHelper; +import uk.gov.moj.sjp.it.model.ProsecutingAuthority; import uk.gov.moj.sjp.it.pollingquery.CasePoller; import java.math.BigDecimal; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java index 92b46c9f1d..723e4b2cf0 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java @@ -1,7 +1,5 @@ package uk.gov.moj.sjp.it.test.ingestor.helper; -import uk.gov.justice.services.messaging.JsonObjects; - import static uk.gov.justice.services.test.utils.core.messaging.JsonObjects.getJsonArray; import static uk.gov.moj.sjp.it.test.ingestor.helper.IngesterHelper.jsonFromString; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java index b8c31b2bc0..ee569460b9 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java @@ -1,7 +1,5 @@ package uk.gov.moj.sjp.it.test.ingestor.helper; -import uk.gov.justice.services.messaging.JsonObjects; - import static java.util.Optional.empty; import static java.util.Optional.of; import static org.junit.jupiter.api.Assertions.assertTrue; 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 cbba86f392..930233951c 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,9 +1,9 @@ package uk.gov.moj.sjp.it.test.ingestor.helper; import static java.util.UUID.randomUUID; -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; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.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 ab14877186..17fe501c40 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,11 +2,12 @@ import static java.util.Optional.empty; import static java.util.concurrent.TimeUnit.SECONDS; -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; import static org.hamcrest.Matchers.not; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.http.BaseUriProvider.getBaseUri; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.POLL_INTERVAL; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.TIMEOUT_IN_SECONDS; @@ -21,7 +22,6 @@ import java.util.UUID; import java.util.stream.IntStream; -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, JsonObjects.createObjectBuilder().add("action", "execute").build()); + sendPostRequest(url, 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 36ebe46f30..19a8f606f6 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,12 +2,12 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -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; import static uk.gov.justice.json.schemas.domains.sjp.User.user; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.DVLA; import static uk.gov.moj.sjp.it.model.ProsecutingAuthority.TFL; @@ -15,7 +15,6 @@ import static uk.gov.moj.sjp.it.stub.UsersGroupsStub.stubForUserDetails; import static uk.gov.moj.sjp.it.stub.UsersGroupsStub.stubGroupForUser; import static uk.gov.moj.sjp.it.util.Defaults.DEFAULT_LONDON_LJA_NATIONAL_COURT_CODE; -import static uk.gov.moj.sjp.it.util.Defaults.DEFAULT_NON_LONDON_LJA_NATIONAL_COURT_CODE; import static uk.gov.moj.sjp.it.util.HttpClientUtil.getReadUrl; import static uk.gov.moj.sjp.it.util.HttpClientUtil.makePostCall; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.pollWithDefaultsUntilResponseIsJson; 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 aee7041fd2..05c9611d34 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 @@ -4,6 +4,7 @@ import static org.skyscreamer.jsonassert.JSONCompare.compareJSON; import static org.skyscreamer.jsonassert.JSONCompareMode.LENIENT; import static org.skyscreamer.jsonassert.JSONCompareMode.STRICT; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; @@ -13,7 +14,6 @@ import java.io.UncheckedIOException; import java.util.List; -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 = JsonObjects.createReader(new StringReader(json))) { + try (final JsonReader reader = 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 8defe3dd30..506f00a05e 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,8 +1,8 @@ package uk.gov.moj.sjp.it.util; import static java.util.UUID.randomUUID; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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 885b6cf907..c64eb80200 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 @@ -3,12 +3,11 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.joining; import static org.apache.commons.lang3.StringUtils.wrap; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.sjp.it.Constants.PRIVATE_ACTIVE_MQ_TOPIC; import static uk.gov.moj.sjp.it.Constants.PUBLIC_ACTIVE_MQ_TOPIC; import static uk.gov.moj.sjp.it.util.OptionalPresent.ifPresent; - -import org.hamcrest.Matcher; import uk.gov.justice.services.messaging.DefaultJsonObjectEnvelopeConverter; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -23,12 +22,12 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import io.restassured.path.json.JsonPath; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.client.ActiveMQTopic; +import org.hamcrest.Matcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,7 +100,7 @@ public static Optional retrieveMessage(final MessageConsumer consumer, public static Optional retrieveMessageAsJsonObject(final MessageConsumer consumer) { return ifPresent(retrieveMessageAsString(consumer, RETRIEVE_TIMEOUT), - (x) -> Optional.of(JsonObjects.createReader(new StringReader(x)).readObject()) + (x) -> Optional.of(createReader(new StringReader(x)).readObject()) ).orElse(Optional::empty); } @@ -129,7 +128,7 @@ public static JsonPath retrieveMessage(final MessageConsumer consumer, final Mat do { message = retrieveMessage(consumer, RETRIEVE_TIMEOUT).orElse(null); if (ofNullable(message).isPresent()) { - if(matchers.matches(message.prettify())){ + if (matchers.matches(message.prettify())) { return message; } } diff --git a/sjp-json/pom.xml b/sjp-json/pom.xml index 43242408d0..0b3ffebab8 100644 --- a/sjp-json/pom.xml +++ b/sjp-json/pom.xml @@ -2,7 +2,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-query/pom.xml b/sjp-query/pom.xml index 2f346a8611..0ac05aa6b6 100644 --- a/sjp-query/pom.xml +++ b/sjp-query/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-api/pom.xml b/sjp-query/sjp-query-api/pom.xml index 8658c3ba59..8707bfacab 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..a74401a4c4 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,6 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; @@ -12,6 +11,7 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Adapter; import uk.gov.justice.services.core.interceptor.InterceptorChainProcessor; 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..2fec7bb1bc 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,6 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; @@ -11,6 +10,7 @@ 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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Adapter; import uk.gov.justice.services.core.annotation.Component; @@ -23,7 +23,6 @@ import javax.ejb.Stateless; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.WebApplicationException; @@ -87,7 +86,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 = 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..7f329bbe05 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,10 +1,10 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Adapter; import uk.gov.justice.services.core.annotation.Component; 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..8ea7be9a6e 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,10 +1,10 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.Adapter; 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/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..28090f5230 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,10 +1,10 @@ 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.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter; 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..c06cf57adc 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,16 +1,17 @@ package uk.gov.moj.cpp.sjp.query.api.converter; -import static javax.json.Json.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; +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; import uk.gov.justice.services.messaging.JsonObjects; +import uk.gov.moj.cpp.sjp.query.api.service.ReferenceOffencesDataService; import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonNumber; @@ -18,7 +19,6 @@ import javax.json.JsonObjectBuilder; import org.slf4j.Logger; -import uk.gov.moj.cpp.sjp.query.api.service.ReferenceOffencesDataService; @SuppressWarnings("WeakerAccess") public class CaseConverter { @@ -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 = 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 = createObjectBuilder() .add("id", offence.getString("id")) .add("wording", offence.getString("wording")) .add("pendingWithdrawal", offence.getBoolean("pendingWithdrawal", false)) @@ -95,8 +95,7 @@ private JsonObject buildOffenceObject(final JsonEnvelope query, final JsonObject .ifPresent(titleWelsh -> builder.add("titleWelsh", titleWelsh)); Optional.ofNullable(welsh.getString("welshlegislation", null)) .ifPresent(legislationWelsh -> builder.add("legislationWelsh", legislationWelsh)); - } - else { + } else { LOGGER.warn("No referencedata offence welsh translations for offenceCode: {}", offenceCode); } @@ -114,9 +113,9 @@ private static JsonObject buildCaseObject(final JsonObject caseDetails, final Js final JsonNumber aocpTotalCost = caseDetails.getJsonNumber("aocpTotalCost"); - final Optional resultedThroughAocp= JsonObjects.getBoolean(caseDetails, "resultedThroughAocp"); + final Optional resultedThroughAocp = JsonObjects.getBoolean(caseDetails, "resultedThroughAocp"); - final Optional defendantAcceptedAocp= JsonObjects.getBoolean(caseDetails, "defendantAcceptedAocp"); + final Optional defendantAcceptedAocp = JsonObjects.getBoolean(caseDetails, "defendantAcceptedAocp"); final JsonObjectBuilder builder = createObjectBuilder() .add("id", caseDetails.getString("id")) 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..f4a30c10bd 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 @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.UUID.fromString; +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; @@ -9,7 +10,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; 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 = 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", 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..2c36dadbf4 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 @@ -2,6 +2,7 @@ import static java.util.UUID.fromString; import static org.slf4j.LoggerFactory.getLogger; +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.createObjectBuilderWithFilter; @@ -13,7 +14,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; 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(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..b5b3ed6682 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 @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.UUID.fromString; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.JsonObjects; @@ -12,7 +13,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; 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(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(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..a977acc5c5 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.service; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; +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.ServiceComponent; 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..8db3eebeab 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 @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.query.api.service; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -8,7 +9,6 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; 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(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(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..27081d3333 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,7 +1,7 @@ package uk.gov.moj.cpp.sjp.query.service; -import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; 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..c74edf2d03 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 @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.query.service; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -11,7 +12,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; 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 = 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/raml/sjp-query-api.raml b/sjp-query/sjp-query-api/src/raml/sjp-query-api.raml index cbf58e9ec9..71280a8234 100644 --- a/sjp-query/sjp-query-api/src/raml/sjp-query-api.raml +++ b/sjp-query/sjp-query-api/src/raml/sjp-query-api.raml @@ -134,6 +134,10 @@ baseUri: http://localhost:8080/sjp-query-api/query/api/rest/sjp description: The defendant's region. type: string required: false + prosecutingAuthority: + description: The prosecuting authority + type: string + required: false responses: 200: @@ -378,6 +382,10 @@ baseUri: http://localhost:8080/sjp-query-api/query/api/rest/sjp description: The defendant's region id. type: string required: false + prosecutingAuthority: + description: The prosecuting authority + type: string + required: false responses: 200: description: OK 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..3247cc1e6c 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 @@ -6,16 +6,16 @@ import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR; import static org.apache.http.HttpStatus.SC_NOT_FOUND; import static org.apache.http.HttpStatus.SC_OK; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isA; import static org.hamcrest.collection.IsMapContaining.hasEntry; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; @@ -31,7 +31,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -69,7 +68,7 @@ public class DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest { @BeforeEach public void init() { - // when(serviceContextSystemUserProvider.getContextSystemUserId()).thenReturn(Optional.of(userId)); + // when(serviceContextSystemUserProvider.getContextSystemUserId()).thenReturn(Optional.of(userId)); } @Test @@ -93,7 +92,7 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocument() throws Exception } @Test - public void shouldReturnNotFoundStatusWhenCourtExtractDataNotFound(){ + public void shouldReturnNotFoundStatusWhenCourtExtractDataNotFound() { when(courtExtractDataService.getCourtExtractData(any(JsonEnvelope.class))). thenReturn(Optional.empty()); @@ -119,21 +118,19 @@ public void shouldReturnInternalServerErrorIfDocumentServiceFails() throws IOExc } - - private void verifyInterceptorChainExecution() { verify(interceptorChainProcessor).process(interceptorContextCaptor.capture()); MatcherAssert.assertThat(interceptorContextCaptor.getValue().inputEnvelope(), jsonEnvelope(metadata().withName(DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.QUERY_ACTION_NAME).withUserId(userId.toString()), - payload().isJson(allOf( - withJsonPath("$.caseId", equalTo(caseId.toString())) - )) - )); + payload().isJson(allOf( + withJsonPath("$.caseId", equalTo(caseId.toString())) + )) + )); } private Optional buildMockCourtData() { - return Optional.of(Json.createReader(getClass().getClassLoader(). + return Optional.of(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..1433e0d53f 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,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; @@ -12,12 +11,13 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.api.resource.DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.CASE_DOCUMENT_CONTENT_QUERY_NAME; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; @@ -33,7 +33,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.core.MultivaluedHashMap; @@ -41,7 +40,6 @@ import javax.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -87,7 +85,7 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocument() { final MultivaluedMap headers = new MultivaluedHashMap(ImmutableMap.of(CONTENT_TYPE, JSON_CONTENT_TYPE)); - final JsonObject json = Json.createObjectBuilder() + final JsonObject json = 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..7937145be5 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,14 +3,14 @@ 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 org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.Matchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static org.hamcrest.Matchers.allOf; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; 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..8a35757fec 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,16 +1,17 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; + import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; 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..9180324ffd 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 @@ -5,13 +5,14 @@ import static java.util.UUID.randomUUID; import static org.apache.commons.lang3.RandomStringUtils.random; 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.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -21,7 +22,6 @@ import static uk.gov.justice.services.test.utils.core.matchers.JsonValueNullMatcher.isJsonValueNull; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import static uk.gov.moj.cpp.sjp.query.api.matcher.Matchers.materialMetadataRequest; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -35,7 +35,6 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -146,7 +145,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 = 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..2a83a39499 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 @@ -1,37 +1,17 @@ package uk.gov.moj.cpp.sjp.query.api; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.justice.services.core.enveloper.Enveloper; -import uk.gov.justice.services.core.requester.Requester; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.sjp.query.api.decorator.DecisionDecorator; -import uk.gov.moj.cpp.sjp.query.api.decorator.OffenceDecorator; -import uk.gov.moj.cpp.sjp.query.service.OffenceFineLevels; -import uk.gov.moj.cpp.sjp.query.service.WithdrawalReasons; - -import javax.json.JsonObject; -import javax.json.JsonValue; -import java.time.LocalDate; -import java.util.UUID; - import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; @@ -39,6 +19,28 @@ import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; +import uk.gov.justice.services.core.enveloper.Enveloper; +import uk.gov.justice.services.core.requester.Requester; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.sjp.query.api.decorator.DecisionDecorator; +import uk.gov.moj.cpp.sjp.query.api.decorator.OffenceDecorator; +import uk.gov.moj.cpp.sjp.query.service.OffenceFineLevels; +import uk.gov.moj.cpp.sjp.query.service.WithdrawalReasons; + +import java.time.LocalDate; +import java.util.UUID; + +import javax.json.JsonObject; +import javax.json.JsonValue; + +import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + @ExtendWith(MockitoExtension.class) public class SjpFindCaseQueryApiTest { 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..dc66510f8a 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,14 +2,14 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; 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.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -18,14 +18,7 @@ import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; import uk.gov.justice.services.core.annotation.Component; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -33,9 +26,17 @@ import uk.gov.moj.cpp.sjp.query.api.converter.CaseConverter; import uk.gov.moj.cpp.sjp.query.api.validator.SjpQueryApiValidator; +import java.util.Collections; + import javax.json.JsonObject; import javax.json.JsonValue; -import java.util.Collections; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) public class SjpQueryApiTest { 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..d6b201a270 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,13 +1,13 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; 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..e011218d10 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.when; +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; import uk.gov.justice.services.messaging.JsonObjects; @@ -12,7 +13,6 @@ import java.util.UUID; -import javax.json.Json; 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", 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", 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", 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..27b377527c 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,20 +1,17 @@ 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 org.hamcrest.CoreMatchers.equalTo; -import static org.junit.jupiter.api.Assertions.assertSame; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import static uk.gov.moj.cpp.sjp.query.api.matcher.Matchers.materialMetadataRequest; -import org.junit.jupiter.api.BeforeEach; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -26,6 +23,7 @@ import javax.json.JsonObject; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; 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..6fd41470b6 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,11 +5,11 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; +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; import uk.gov.justice.services.test.utils.core.messaging.JsonObjects; 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..f60cd953e5 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,12 +5,12 @@ 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 org.apache.commons.lang3.StringUtils.EMPTY; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.when; +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.api.util.FileUtil.getFileContentAsJson; import uk.gov.justice.services.messaging.JsonEnvelope; 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..2910bf2467 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,12 +3,12 @@ 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 org.hamcrest.CoreMatchers.equalTo; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +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.api.util.FileUtil.getFileContentAsJson; import uk.gov.moj.cpp.sjp.query.service.OffenceFineLevels; 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..ae89d9d8ca 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + import javax.json.JsonObjectBuilder; import org.junit.jupiter.params.ParameterizedTest; 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..8f76555387 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,16 +1,15 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.time.LocalDate; - import java.util.stream.Stream; + import javax.json.JsonObjectBuilder; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; 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..9c5d623d11 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,13 +1,13 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.time.LocalDate; - import java.util.stream.Stream; + import javax.json.JsonObjectBuilder; import org.junit.jupiter.params.ParameterizedTest; 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..0c658599f4 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.api.decorator; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import javax.json.JsonObject; 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..41fdf67d8b 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 @@ -2,14 +2,12 @@ import static java.util.Collections.emptyMap; import static org.junit.jupiter.api.Assertions.fail; - -import uk.gov.moj.cpp.sjp.query.api.helper.JsonHelper; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import java.io.StringReader; import java.nio.charset.Charset; import java.util.Map; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonReader; @@ -49,7 +47,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 = 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..af28538572 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,20 +1,21 @@ package uk.gov.moj.cpp.sjp.query.converter; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import uk.gov.justice.services.common.converter.LocalDates; import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.sjp.query.api.converter.CaseConverter; +import uk.gov.moj.cpp.sjp.query.api.service.ReferenceOffencesDataService; import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -22,8 +23,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.moj.cpp.sjp.query.api.converter.CaseConverter; -import uk.gov.moj.cpp.sjp.query.api.service.ReferenceOffencesDataService; @ExtendWith(MockitoExtension.class) public class CaseConverterTest { @@ -177,12 +176,12 @@ public void shouldAddPersonInfoForDefendantWithMatchingPostcode() { private JsonObject buildOffenceReferenceData(final String title, final String legislation, final String titleWelsh, final String legislationWelsh) { - return Json.createObjectBuilder() + return createObjectBuilder() .add("title", title) .add("legislation", legislation) - .add("details", Json.createObjectBuilder() - .add("document", Json.createObjectBuilder() - .add("welsh", Json.createObjectBuilder() + .add("details", createObjectBuilder() + .add("document", createObjectBuilder() + .add("welsh", 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..90aede0ac6 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,13 +1,13 @@ package uk.gov.moj.cpp.sjp.query.service; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +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/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..c8c230d03f 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,6 @@ 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 org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -11,10 +9,12 @@ import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..02b743f1a6 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 @@ -4,6 +4,8 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; @@ -11,10 +13,10 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; +import uk.gov.moj.cpp.sjp.query.api.service.ReferenceOffencesDataService; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -25,7 +27,6 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.moj.cpp.sjp.query.api.service.ReferenceOffencesDataService; @ExtendWith(MockitoExtension.class) public class ReferenceOffencesDataServiceTest { @@ -57,8 +58,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 = createObjectBuilder() + .add("offences", createArrayBuilder().add(createObjectBuilder())) .build(); when(response.payloadAsJsonObject()).thenReturn(responsePayload); @@ -81,7 +82,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 = 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..52c165655b 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,13 +2,13 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +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/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..15fe8061ac 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,13 +2,13 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; diff --git a/sjp-query/sjp-query-view/pom.xml b/sjp-query/sjp-query-view/pom.xml index fdc87d6262..19a470eaf9 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..88c560693f 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.query.view; -import static javax.json.Json.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.createObjectBuilder; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.Handles; 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..24300bf8b0 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,8 @@ import static java.util.Arrays.stream; -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.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.Handles; @@ -25,7 +26,6 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; 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 = 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..e67b71c8d3 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 @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.view; -import static java.util.Optional.ofNullable; -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.common.converter.jackson.ObjectMapperProducer; import uk.gov.justice.services.core.annotation.Component; @@ -19,7 +19,6 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -46,9 +45,9 @@ public JsonEnvelope getCaseAssignmentRestriction(final JsonEnvelope query) { Optional restriction = Optional.empty(); - if(!caseAssignmentRestrictionList.isEmpty()) { + if (!caseAssignmentRestrictionList.isEmpty()) { restriction = Optional.of(caseAssignmentRestrictionList.get(0)) - .map(assignmentRestriction -> Json.createObjectBuilder() + .map(assignmentRestriction -> 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..f0c21d7fda 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,9 +1,9 @@ package uk.gov.moj.cpp.sjp.query.view; -import static javax.json.Json.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.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.toJsonArray; import uk.gov.justice.json.schemas.domains.sjp.NoteType; 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..7f65629865 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 @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.sjp.query.view; +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; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -11,7 +13,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; @ServiceComponent(Component.QUERY_VIEW) @@ -29,8 +30,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 -> createObjectBuilder().add("caseDocument", + 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..6212ee6e1b 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,9 +5,10 @@ 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.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.persistence.entity.EmailNotification.NotificationNotifyDocumentType.PARTIAL_AOCP_CRITERIA_NOTIFICATION; import static uk.gov.moj.cpp.sjp.query.view.util.JsonUtility.getString; @@ -74,7 +75,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; 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(), 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(), 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 = 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..5d3af7b237 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,6 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonNumber; @@ -553,7 +552,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(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..9457443ef0 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,9 +2,9 @@ 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 org.apache.commons.lang3.StringUtils.isNotBlank; +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.DAY; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.DAYS; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.INDEX; @@ -14,7 +14,6 @@ import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.PROMPT_DEFINITION_ID; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.TERMINAL_ENTRIES; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.UNIT; -import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.VALUE; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.WEEK; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.WEEKS; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.YEAR; 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/response/DefendantDetailsUpdatesView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/DefendantDetailsUpdatesView.java index 3bff8fbb11..146fd85a93 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/DefendantDetailsUpdatesView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/DefendantDetailsUpdatesView.java @@ -116,6 +116,8 @@ public static class DefendantDetailsUpdate { */ private String legalEntityName; + private String prosecutingAuthority; + @SuppressWarnings("squid:S00107") public DefendantDetailsUpdate( final String firstName, @@ -129,7 +131,8 @@ public DefendantDetailsUpdate( final boolean addressUpdated, final String updatedOn, final String region, - final String legalEntityName) { + final String legalEntityName, + final String prosecutingAuthority) { this.firstName = firstName; this.lastName = lastName; @@ -143,6 +146,7 @@ public DefendantDetailsUpdate( this.updatedOn = updatedOn; this.region = region; this.legalEntityName = legalEntityName; + this.prosecutingAuthority = prosecutingAuthority; } public String getLastName() { @@ -197,6 +201,10 @@ public void setLegalEntityName(final String legalEntityName) { this.legalEntityName = legalEntityName; } + public String getProsecutingAuthority() { + return prosecutingAuthority; + } + public static DefendantDetailsUpdate of(UpdatedDefendantDetails defendantDetail) { return new DefendantDetailsUpdate( defendantDetail.getFirstName(), @@ -214,7 +222,8 @@ public static DefendantDetailsUpdate of(UpdatedDefendantDetails defendantDetail) .map(DateTimeFormatter.ISO_LOCAL_DATE::format) .orElse(DateTimeFormatter.ISO_LOCAL_DATE.format(ZonedDateTime.now())), defendantDetail.getRegion(), - defendantDetail.getLegalEntityName()); + defendantDetail.getLegalEntityName(), + defendantDetail.getProsecutingAuthority()); } @Override 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..2bed908f42 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,9 +1,9 @@ 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 org.apache.commons.lang3.BooleanUtils.isTrue; +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.service.ApplicationPrompt.DER_DVLA_ENDORSEMENT_CODE; import static uk.gov.moj.cpp.sjp.query.view.service.ApplicationPrompt.DER_DVLA_ENDORSEMENT_CODE2; import static uk.gov.moj.cpp.sjp.query.view.service.ApplicationPrompt.DER_DVLA_ENDORSEMENT_CODE3; 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 d9d17ef608..1fbd8b6490 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,13 +10,14 @@ 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 org.apache.commons.lang3.StringUtils.isNotEmpty; +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.ExportType.PUBLIC; import uk.gov.justice.services.common.converter.ListToJsonArrayConverter; import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.accesscontrol.sjp.providers.ProsecutingAuthorityAccess; import uk.gov.moj.cpp.accesscontrol.sjp.providers.ProsecutingAuthorityProvider; import uk.gov.moj.cpp.sjp.domain.common.CaseManagementStatus; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; @@ -52,6 +53,7 @@ import java.time.LocalDate; import java.time.ZoneOffset; import java.time.ZonedDateTime; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -149,10 +151,10 @@ public CaseView findCase(final UUID id) { public DefendantDetailUpdateRequestView findDefendantDetailUpdateRequest(final UUID caseId) { try { - return ofNullable(defendantDetailUpdateRequestRepository.findBy(caseId)) - .map(DefendantDetailUpdateRequestView::new) - .orElse(null); - }catch (NoResultException e) { + return ofNullable(defendantDetailUpdateRequestRepository.findBy(caseId)) + .map(DefendantDetailUpdateRequestView::new) + .orElse(null); + } catch (NoResultException e) { LOGGER.debug("No defendant detail update request found with caseId='{}'", caseId, e); return null; } @@ -177,19 +179,29 @@ public CasesMissingSjpnView findCasesMissingSjpn(final JsonEnvelope envelope, final Optional postedBefore) { final List casesDetails; - + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = prosecutingAuthorityProvider + .getCurrentUsersProsecutingAuthorityAccess(envelope); final String prosecutingAuthorityFilterValue = prosecutingAuthorityAccessFilterConverter - .convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityProvider - .getCurrentUsersProsecutingAuthorityAccess(envelope)); + .convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess); + + final List agentProsecutorAuthorityAccessFilterValue; + if (prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess() == null || prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess().isEmpty()){ + agentProsecutorAuthorityAccessFilterValue = Arrays.asList("DUMMY_VALUE"); + } else { + agentProsecutorAuthorityAccessFilterValue = prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess(); + } if (limit.isPresent() && limit.get() < 1) { casesDetails = Collections.emptyList(); } else { QueryResult caseDetailsResult; + if (postedBefore.isPresent()) { - caseDetailsResult = caseRepository.findCasesMissingSjpn(prosecutingAuthorityFilterValue, postedBefore.get()); + caseDetailsResult = caseRepository.findCasesMissingSjpn(prosecutingAuthorityFilterValue, postedBefore.get(), + agentProsecutorAuthorityAccessFilterValue); } else { - caseDetailsResult = caseRepository.findCasesMissingSjpn(prosecutingAuthorityFilterValue); + caseDetailsResult = caseRepository.findCasesMissingSjpn(prosecutingAuthorityFilterValue, + agentProsecutorAuthorityAccessFilterValue); } if (limit.isPresent()) { @@ -206,8 +218,8 @@ public CasesMissingSjpnView findCasesMissingSjpn(final JsonEnvelope envelope, .map(CaseSummaryView::new).collect(toList()); final int casesCount = postedBefore - .map(localDate -> caseRepository.countCasesMissingSjpn(prosecutingAuthorityFilterValue, localDate)) - .orElseGet(() -> caseRepository.countCasesMissingSjpn(prosecutingAuthorityFilterValue)); + .map(localDate -> caseRepository.countCasesMissingSjpn(prosecutingAuthorityFilterValue, localDate, agentProsecutorAuthorityAccessFilterValue)) + .orElseGet(() -> caseRepository.countCasesMissingSjpn(prosecutingAuthorityFilterValue, agentProsecutorAuthorityAccessFilterValue)); return new CasesMissingSjpnView(casesIds, cases, casesCount); } @@ -333,14 +345,22 @@ private Optional getProsecutorDetails(final String prosecutingAuthor public CaseSearchResultsView searchCases(final JsonEnvelope envelope, final String query) { - final String prosecutingAuthorityFilterValue = prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope); + final String prosecutingAuthorityFilterValue = prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess); + + final List agentProsecutorAuthorityAccessFilterValue; + if (prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess() == null || prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess().isEmpty()){ + agentProsecutorAuthorityAccessFilterValue = Arrays.asList("DUMMY_VALUE"); + } else { + agentProsecutorAuthorityAccessFilterValue = prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess(); + } - List searchResults = caseSearchResultRepository.findByUrn(prosecutingAuthorityFilterValue, query); + List searchResults = caseSearchResultRepository.findByUrn(prosecutingAuthorityFilterValue, query, agentProsecutorAuthorityAccessFilterValue); if (searchResults.isEmpty()) { - searchResults = caseSearchResultRepository.findByLastName(prosecutingAuthorityFilterValue, query); + searchResults = caseSearchResultRepository.findByLastName(prosecutingAuthorityFilterValue, query, agentProsecutorAuthorityAccessFilterValue); } if (searchResults.isEmpty()) { - searchResults = caseSearchResultRepository.findByLegalEntityName(prosecutingAuthorityFilterValue, query); + searchResults = caseSearchResultRepository.findByLegalEntityName(prosecutingAuthorityFilterValue, query, agentProsecutorAuthorityAccessFilterValue); } return new CaseSearchResultsView(searchResults); diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java index 40d707fdec..5d01d518c7 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java @@ -11,6 +11,7 @@ import uk.gov.moj.cpp.sjp.query.view.converter.ProsecutingAuthorityAccessFilterConverter; import uk.gov.moj.cpp.sjp.query.view.response.CasesPendingDatesToAvoidView; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -38,8 +39,17 @@ public class DatesToAvoidService { public CasesPendingDatesToAvoidView findCasesPendingDatesToAvoid(final JsonEnvelope envelope) { final ProsecutingAuthorityAccess prosecutingAuthorityAccess = prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope); final String prosecutingAuthorityFilterValue = prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess); + final List agentProsecutorAuthorityAccess; + + if (prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess() == null || prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess().isEmpty()) { + agentProsecutorAuthorityAccess = Arrays.asList("DUMMY_VALUE"); + } else { + agentProsecutorAuthorityAccess = prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess(); + } + + List pendingCases = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(prosecutingAuthorityFilterValue, + agentProsecutorAuthorityAccess); - List pendingCases = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(prosecutingAuthorityFilterValue); final int total = pendingCases.size(); final String regionFilter = getRegionFilterCriteria(envelope); @@ -51,6 +61,12 @@ public CasesPendingDatesToAvoidView findCasesPendingDatesToAvoid(final JsonEnvel pendingCases = filterByRegionId(envelope, pendingCases, regionFilter); } + final String prosecutingAuthorityFilter = getProsecutingAuthorityFilterCriteria(envelope); + + if (isFilterByProsecutingAuthority(prosecutingAuthorityFilter)) { + pendingCases = filterByProsecutingAuthority(pendingCases, prosecutingAuthorityFilter); + } + return new CasesPendingDatesToAvoidView(pendingCases, total); } @@ -58,6 +74,10 @@ private String getRegionFilterCriteria(final JsonEnvelope envelope) { return envelope.payloadAsJsonObject().getString("regionId", null); } + private String getProsecutingAuthorityFilterCriteria(final JsonEnvelope envelope) { + return envelope.payloadAsJsonObject().getString("prosecutingAuthority", null); + } + private boolean isFilterByUnknownRegion(final String regionFilter) { return nonNull(regionFilter) && isBlankRegion(regionFilter); } @@ -70,6 +90,10 @@ private boolean isFilterByRegionId(final String regionFilter) { return nonNull(regionFilter) && !isBlankRegion(regionFilter); } + private boolean isFilterByProsecutingAuthority(final String prosecutingAuthority) { + return nonNull(prosecutingAuthority); + } + private List filterByRegionId(final JsonEnvelope envelope, final List pendingCases, final String regionFilter) { final List regions = referenceDataService.getRegionalOrganisations(envelope); final String regionName = getRegionNameById(regionFilter, regions); @@ -87,6 +111,13 @@ private List filterByUnknownRegion(final List filterByProsecutingAuthority(final List pendingCases, final String prosecutingAuthorityFilter) { + return pendingCases + .stream() + .filter(pendingCase -> prosecutingAuthorityFilter.equalsIgnoreCase(pendingCase.getCaseDetail().getProsecutingAuthority())) + .collect(Collectors.toList()); + } + private String getRegionNameById(String regionId, List regions) { return regions.stream() .filter(region -> regionId.equalsIgnoreCase(region.getId().toString())) diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java index 009bc73c76..939e48b35a 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java @@ -6,10 +6,12 @@ import static org.apache.commons.lang3.StringUtils.isBlank; import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.accesscontrol.sjp.providers.ProsecutingAuthorityAccess; import uk.gov.moj.cpp.accesscontrol.sjp.providers.ProsecutingAuthorityProvider; import uk.gov.moj.cpp.sjp.domain.DefendantOutstandingFineRequest; import uk.gov.moj.cpp.sjp.domain.DefendantOutstandingFineRequestsQueryResult; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; +import uk.gov.moj.cpp.sjp.persistence.entity.PendingDatesToAvoid; import uk.gov.moj.cpp.sjp.persistence.entity.view.UpdatedDefendantDetails; import uk.gov.moj.cpp.sjp.persistence.repository.DefendantRepository; import uk.gov.moj.cpp.sjp.query.view.converter.ProsecutingAuthorityAccessFilterConverter; @@ -41,14 +43,17 @@ public class DefendantService { private ReferenceDataService referenceDataService; public DefendantDetailsUpdatesView findDefendantDetailUpdates(final JsonEnvelope envelope) { + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = prosecutingAuthorityProvider + .getCurrentUsersProsecutingAuthorityAccess(envelope); final String prosecutingAuthorityFilterValue = prosecutingAuthorityAccessFilterConverter - .convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityProvider - .getCurrentUsersProsecutingAuthorityAccess(envelope)); + .convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess); + final List agentProsecutorAuthorityAccessFilterValue = prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess(); final List updatedDefendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority( prosecutingAuthorityFilterValue, ZonedDateTime.now().minusDays(UPDATES_DAYS_HISTORY), - ZonedDateTime.now()); + ZonedDateTime.now(), + agentProsecutorAuthorityAccessFilterValue); List results = updatedDefendantDetails; @@ -62,6 +67,12 @@ public DefendantDetailsUpdatesView findDefendantDetailUpdates(final JsonEnvelope results = filterByRegionId(envelope, updatedDefendantDetails, filterCriteria); } + final String prosecutingAuthorityFilter = getProsecutingAuthorityFilterCriteria(envelope); + + if (isFilterByProsecutingAuthority(prosecutingAuthorityFilter)) { + results = filterByProsecutingAuthority(results, prosecutingAuthorityFilter); + } + return DefendantDetailsUpdatesView.of(updatedDefendantDetails.size(), sortByMostRecentUpdated(envelope, results)); } @@ -77,10 +88,21 @@ private List filterByRegionId(final JsonEnvelope envelo return sortedDefendantDetailsResult; } + private List filterByProsecutingAuthority(final List updatedDefendantDetails, final String prosecutingAuthorityFilter) { + return updatedDefendantDetails + .stream() + .filter(updatedDefendantDetail -> prosecutingAuthorityFilter.equalsIgnoreCase(updatedDefendantDetail.getProsecutingAuthority())) + .collect(Collectors.toList()); + } + private boolean isFilterByRegionId(final String filterCriteria) { return !isBlankRegion(filterCriteria) && nonNull(filterCriteria); } + private boolean isFilterByProsecutingAuthority(final String prosecutingAuthority) { + return nonNull(prosecutingAuthority); + } + private List filterByUnknownRegion(final List updatedDefendantDetails) { return updatedDefendantDetails .stream() @@ -96,6 +118,10 @@ private String getRegionFilterCriteria(final JsonEnvelope envelope) { return envelope.payloadAsJsonObject().getString("regionId", null); } + private String getProsecutingAuthorityFilterCriteria(final JsonEnvelope envelope) { + return envelope.payloadAsJsonObject().getString("prosecutingAuthority", null); + } + private List sortByMostRecentUpdated(final JsonEnvelope envelope, final List updatedDefendantDetails) { return updatedDefendantDetails.stream() .sorted(comparing(defendantDetails -> defendantDetails.getMostRecentUpdateDate().get())) 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..77a5f44324 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,9 +3,9 @@ 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 org.slf4j.LoggerFactory.getLogger; +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.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 9422df415c..9e38401416 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,10 +2,10 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -60,7 +60,11 @@ public Optional findCaseById(UUID caseId) { withName(PROGRESSION_CASE_QUERY), requestPayload); final JsonEnvelope jsonResultEnvelope = requester.requestAsAdmin(requestEnvelope); - return ofNullable(jsonResultEnvelope.payloadAsJsonObject()); + if (!jsonResultEnvelope.payloadIsNull()){ + return ofNullable(jsonResultEnvelope.payloadAsJsonObject()); + } else { + return Optional.empty(); + } } public List findDefendantOffences(UUID caseId, DefendantDetail defendant) { 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..65ca633c15 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,9 +3,9 @@ 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.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +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-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..93e2a80a99 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,6 @@ 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 org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.justice.core.courts.ContactNumber.contactNumber; import static uk.gov.justice.core.courts.Defendant.defendant; @@ -20,6 +19,7 @@ import static uk.gov.justice.core.courts.NotifiedPleaValue.NO_NOTIFICATION; import static uk.gov.justice.core.courts.PersonDefendant.personDefendant; import static uk.gov.justice.core.courts.ProsecutionCase.prosecutionCase; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.core.courts.Address; import uk.gov.justice.core.courts.ContactNumber; 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..a98f3cc1df 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,8 +3,8 @@ 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.JsonEnvelope.metadataBuilder; +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-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..bb80fe3726 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,11 +6,11 @@ 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.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; 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..5024aeca5d 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,10 +6,10 @@ 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.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +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.ACCOUNT_DIVISION_CODE; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.CREATED; import static uk.gov.moj.cpp.sjp.query.view.util.CaseResultsConstants.ENFORCING_COURT_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..0b530c6384 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,12 +2,12 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.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; 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.createObjectBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -24,7 +24,6 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; @@ -108,7 +107,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(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..b6453c8985 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 @@ -1,17 +1,18 @@ package uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search; import static org.apache.commons.lang3.StringUtils.isNotEmpty; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.moj.cpp.sjp.persistence.entity.Address; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; + public class DefendantCaseQuery { public static final String CASES_QUERY_NAME = "unifiedsearch.query.cases"; @@ -36,7 +37,7 @@ public DefendantCaseQuery(DefendantDetail defendant) { } private void populateDefendantCriteria() { - final JsonObjectBuilder criteriaBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder criteriaBuilder = 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..337186d3be 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 @@ -3,6 +3,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.CASES_DEFAULT_PAGE_SIZE; import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.CASES_QUERY_NAME; import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.CASES_START_FROM; @@ -12,19 +13,18 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; +import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; public class UnifiedDefendantCaseSearcher implements DefendantCaseSearcher { @@ -41,7 +41,7 @@ public class UnifiedDefendantCaseSearcher implements DefendantCaseSearcher { public List searchDefendantCases(Envelope envelope, DefendantDetail defendant) { final List defendantCases = new ArrayList<>(); - if(!hasMandatoryDetails(defendant)){ + if (!hasMandatoryDetails(defendant)) { return defendantCases; } int page = 0; @@ -51,7 +51,7 @@ public List searchDefendantCases(Envelope envelope, while (true) { - final JsonObjectBuilder criteriaBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder criteriaBuilder = createObjectBuilder(); defendantQuery.getCriteria().forEach(criteriaBuilder::add); criteriaBuilder.add(CASES_START_FROM, page); @@ -80,7 +80,7 @@ public List searchDefendantCases(Envelope envelope, private boolean hasMandatoryDetails(final DefendantDetail defendant) { final PersonalDetails personalDetails = defendant.getPersonalDetails(); - if(personalDetails != null) { + if (personalDetails != null) { final String firstName = personalDetails.getFirstName(); final String lastName = personalDetails.getLastName(); final LocalDate dateOfBirth = personalDetails.getDateOfBirth(); diff --git a/sjp-query/sjp-query-view/src/raml/sjp-query-view.raml b/sjp-query/sjp-query-view/src/raml/sjp-query-view.raml index 1a824582e2..11a7a9e5bc 100644 --- a/sjp-query/sjp-query-view/src/raml/sjp-query-view.raml +++ b/sjp-query/sjp-query-view/src/raml/sjp-query-view.raml @@ -163,6 +163,10 @@ baseUri: http://localhost:8080/sjp-query-view/query/view/rest/sjp description: The defendant's region. type: string required: false + prosecutingAuthority: + description: The prosecuting authority + type: string + required: false responses: 200: @@ -459,6 +463,10 @@ baseUri: http://localhost:8080/sjp-query-view/query/view/rest/sjp description: The defendant's region id. type: string required: false + prosecutingAuthority: + description: The prosecuting authority + type: string + required: false responses: 200: description: OK 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..dc14d12fcf 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,11 +3,11 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; 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..9aa7c826da 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,12 +2,12 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.math.BigDecimal.ROUND_DOWN; -import static javax.json.Json.createObjectBuilder; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.when; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass; import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -29,10 +29,11 @@ import uk.gov.moj.cpp.sjp.query.view.service.CaseService; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.Collections; import java.util.UUID; +import javax.json.JsonObject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -40,8 +41,6 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import javax.json.JsonObject; - @ExtendWith(MockitoExtension.class) public class CaseDocumentsRestrictionTests { 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..1c5ecaf4f3 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 @@ -9,12 +9,13 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.AllOf.allOf; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; @@ -34,7 +35,6 @@ import java.util.Set; import java.util.UUID; -import javax.json.Json; import javax.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; @@ -80,10 +80,10 @@ public void shouldFindAssignmentCandidatesForMagistrateSession() { final JsonEnvelope assignmentCandidates = assignmentQueryView.findAssignmentCandidates(assignmentQuery); assertThat(assignmentCandidates, jsonEnvelope(metadata().withName(QUERY_NAME), payload().isJson(allOf( - withJsonPath("$.assignmentCandidates[0].caseId", equalTo(assignmentCandidate1.getCaseId().toString())), - withJsonPath("$.assignmentCandidates[0].caseStreamVersion", equalTo(assignmentCandidate1.getCaseStreamVersion())), - withJsonPath("$.assignmentCandidates[1].caseId", equalTo(assignmentCandidate2.getCaseId().toString())), - withJsonPath("$.assignmentCandidates[1].caseStreamVersion", equalTo(assignmentCandidate2.getCaseStreamVersion())) + withJsonPath("$.assignmentCandidates[0].caseId", equalTo(assignmentCandidate1.getCaseId().toString())), + withJsonPath("$.assignmentCandidates[0].caseStreamVersion", equalTo(assignmentCandidate1.getCaseStreamVersion())), + withJsonPath("$.assignmentCandidates[1].caseId", equalTo(assignmentCandidate2.getCaseId().toString())), + withJsonPath("$.assignmentCandidates[1].caseStreamVersion", equalTo(assignmentCandidate2.getCaseStreamVersion())) ))) ); } @@ -105,10 +105,10 @@ public void shouldFindAssignmentCandidatesForMagistrateSessionWitProsecutors() { verify(assignmentService, never()).getProsecutingAuthorityByLja(any()); assertThat(assignmentCandidates, jsonEnvelope(metadata().withName(QUERY_NAME), payload().isJson(allOf( - withJsonPath("$.assignmentCandidates[0].caseId", equalTo(assignmentCandidate1.getCaseId().toString())), - withJsonPath("$.assignmentCandidates[0].caseStreamVersion", equalTo(assignmentCandidate1.getCaseStreamVersion())), - withJsonPath("$.assignmentCandidates[1].caseId", equalTo(assignmentCandidate2.getCaseId().toString())), - withJsonPath("$.assignmentCandidates[1].caseStreamVersion", equalTo(assignmentCandidate2.getCaseStreamVersion())) + withJsonPath("$.assignmentCandidates[0].caseId", equalTo(assignmentCandidate1.getCaseId().toString())), + withJsonPath("$.assignmentCandidates[0].caseStreamVersion", equalTo(assignmentCandidate1.getCaseStreamVersion())), + withJsonPath("$.assignmentCandidates[1].caseId", equalTo(assignmentCandidate2.getCaseId().toString())), + withJsonPath("$.assignmentCandidates[1].caseStreamVersion", equalTo(assignmentCandidate2.getCaseStreamVersion())) ))) ); } @@ -129,10 +129,10 @@ public void shouldFindAssignmentCandidatesForDelegatedPowersSession() { final JsonEnvelope assignmentCandidates = assignmentQueryView.findAssignmentCandidates(assignmentQuery); assertThat(assignmentCandidates, jsonEnvelope(metadata().withName(QUERY_NAME), payload().isJson(allOf( - withJsonPath("$.assignmentCandidates[0].caseId", equalTo(assignmentCandidate1.getCaseId().toString())), - withJsonPath("$.assignmentCandidates[0].caseStreamVersion", equalTo(assignmentCandidate1.getCaseStreamVersion())), - withJsonPath("$.assignmentCandidates[1].caseId", equalTo(assignmentCandidate2.getCaseId().toString())), - withJsonPath("$.assignmentCandidates[1].caseStreamVersion", equalTo(assignmentCandidate2.getCaseStreamVersion())) + withJsonPath("$.assignmentCandidates[0].caseId", equalTo(assignmentCandidate1.getCaseId().toString())), + withJsonPath("$.assignmentCandidates[0].caseStreamVersion", equalTo(assignmentCandidate1.getCaseStreamVersion())), + withJsonPath("$.assignmentCandidates[1].caseId", equalTo(assignmentCandidate2.getCaseId().toString())), + withJsonPath("$.assignmentCandidates[1].caseStreamVersion", equalTo(assignmentCandidate2.getCaseStreamVersion())) ))) ); } @@ -150,13 +150,13 @@ public void shouldReturnEmptyListOfAssignmentCandidates() { final JsonEnvelope assignmentCandidates = assignmentQueryView.findAssignmentCandidates(assignmentQuery); assertThat(assignmentCandidates, jsonEnvelope(metadata().withName(QUERY_NAME), payload().isJson( - withJsonPath("$.assignmentCandidates.*", hasSize(0)) + withJsonPath("$.assignmentCandidates.*", hasSize(0)) )) ); } private JsonEnvelope buildAssignmentQuery(final SessionType sessionType) { - final JsonObjectBuilder assignmentQueryPayloadBuilder = Json.createObjectBuilder() + final JsonObjectBuilder assignmentQueryPayloadBuilder = 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 = 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..c51f4e1a6f 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,5 @@ package uk.gov.moj.cpp.sjp.query.view; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; @@ -8,6 +7,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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.common.converter.LocalDates; @@ -21,7 +21,6 @@ import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; import uk.gov.moj.cpp.sjp.persistence.entity.Address; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; -import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; import uk.gov.moj.cpp.sjp.query.view.response.ResultOrdersView; import uk.gov.moj.cpp.sjp.query.view.service.CaseService; 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..9667cd4507 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,13 +2,13 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.AllOf.allOf; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; 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 cb0471c05b..4fee964fb6 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,6 +25,8 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payload; @@ -40,7 +40,6 @@ import static uk.gov.moj.cpp.sjp.query.view.SjpQueryView.ERROR_INVALID_DATE_RANGE; import static uk.gov.moj.cpp.sjp.query.view.SjpQueryView.ERROR_INVALID_PAGE_NUMBER; -import org.hamcrest.CoreMatchers; import uk.gov.justice.core.courts.ProsecutionCase; import uk.gov.justice.services.common.converter.LocalDates; import uk.gov.justice.services.common.exception.ForbiddenRequestException; @@ -110,10 +109,10 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.Json; import javax.json.JsonObject; import javax.persistence.NoResultException; +import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -122,7 +121,6 @@ import org.mockito.Mockito; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.moj.cpp.sjp.query.view.service.defendantcase.DefendantPotentialCaseService; @SuppressWarnings({"squid:S1607", "squid:S5976"}) @ExtendWith(MockitoExtension.class) @@ -839,7 +837,7 @@ public void shouldFindDefendantsOnlinePleaWithoutFinancesForProsecutor() { offenceDetail.setCode(offenceCode); when(offenceRepository.findBy(offenceId)).thenReturn(offenceDetail); - final JsonObject offenceData = Json.createObjectBuilder() + final JsonObject offenceData = createObjectBuilder() .add("title", "Offence title").build(); when(referenceDataService.getOffenceData(offenceCode)).thenReturn(of(offenceData)); @@ -887,7 +885,9 @@ public void shouldFindDetailDetailUpdates() { true, updatedOn, REGION, - null); + null, + null + ); DefendantDetailsUpdatesView.DefendantDetailsUpdate defendantDetailsUpdateCompany = new DefendantDetailsUpdatesView.DefendantDetailsUpdate( null, @@ -901,7 +901,8 @@ public void shouldFindDetailDetailUpdates() { true, updatedOn, REGION, - LEGAL_ENTITY_NAME); + LEGAL_ENTITY_NAME, + null); when(defendantService.findDefendantDetailUpdates(queryEnvelope)).thenReturn(new DefendantDetailsUpdatesView( 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..4003e11e7a 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,8 +1,8 @@ package uk.gov.moj.cpp.sjp.query.view.converter; -import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; +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; import static uk.gov.moj.cpp.sjp.query.view.util.results.ResultsMatchers.D45; @@ -12,7 +12,6 @@ import javax.json.JsonObject; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ProsecutingAuthorityAccessFilterConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ProsecutingAuthorityAccessFilterConverterTest.java index e88b4a44aa..31b357d14a 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ProsecutingAuthorityAccessFilterConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ProsecutingAuthorityAccessFilterConverterTest.java @@ -3,6 +3,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import java.util.ArrayList; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -21,7 +22,7 @@ public class ProsecutingAuthorityAccessFilterConverterTest { static Stream data() { return Stream.of( Arguments.of(ProsecutingAuthorityAccess.NONE, null), - Arguments.of(ProsecutingAuthorityAccess.of(PROSECUTING_AUTHORITY), PROSECUTING_AUTHORITY), + Arguments.of(ProsecutingAuthorityAccess.of(PROSECUTING_AUTHORITY, new ArrayList<>()), PROSECUTING_AUTHORITY), Arguments.of(ProsecutingAuthorityAccess.ALL, "%") ); } 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..9963141a7f 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,26 +1,5 @@ package uk.gov.moj.cpp.sjp.query.view.converter; -import com.google.common.collect.ImmutableMap; -import org.json.JSONException; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.sjp.query.view.util.fakes.FakeReferenceDataService; - -import javax.json.*; -import java.math.BigDecimal; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; -import java.util.stream.Collectors; - import static java.time.format.DateTimeFormatter.ofPattern; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; @@ -29,11 +8,39 @@ import static org.hamcrest.Matchers.hasItem; import static org.junit.jupiter.api.Assertions.assertEquals; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.query.view.matcher.ResultMatchers.FO; import static uk.gov.moj.cpp.sjp.query.view.util.FileUtil.getFileContentAsJson; import static uk.gov.moj.cpp.sjp.query.view.util.FileUtil.getFileContentAsJsonArray; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.sjp.query.view.util.fakes.FakeReferenceDataService; + +import java.math.BigDecimal; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; + +import javax.json.JsonArray; +import javax.json.JsonArrayBuilder; +import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; + +import com.google.common.collect.ImmutableMap; +import org.json.JSONException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + @ExtendWith(MockitoExtension.class) public class ReferencedDecisionSavedOffenceConverterTest { @@ -57,6 +64,7 @@ public class ReferencedDecisionSavedOffenceConverterTest { public void setup() { referenceDataService.addWithdrawalReason(fromString("1dbf0960-51e3-4d90-803d-d54cd8ea7d3e"), "Reason"); } + @Test public void shouldConvertFinancialPenalty() throws JSONException { String path = "converter/decision-saved-event.fine.input.json"; @@ -383,21 +391,24 @@ private void assertJsonArraysEqualIgnoringIDs(JsonArray expectedArray, JsonArray assertEquals(toMap(expectedArrayModified), toMap(actualArrayModified)); } + private Map toMap(JsonObject jsonObject) { return jsonObject.entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().toString().replaceAll("\"", ""))); } + private List> toMap(JsonArray jsonArray) { return jsonArray.getValuesAs(JsonObject.class).stream() .map(this::toMap) .collect(Collectors.toList()); } + private JsonArray removeIdFromJsonObjects(JsonArray jsonArray) { - JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); + JsonArrayBuilder arrayBuilder = createArrayBuilder(); for (int i = 0; i < jsonArray.size(); i++) { JsonObject originalObject = jsonArray.getJsonObject(i); - JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); + JsonObjectBuilder objectBuilder = 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..ffd37e67be 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/COLLOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java index b4ddd8f6d6..6d1d4cf6ac 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/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..a40a041e5a 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,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static org.mockito.Mockito.when; +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.JsonHelper.readJsonFromFile; + +import java.util.Optional; import javax.json.JsonArray; import javax.json.JsonObject; @@ -9,10 +13,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Optional; - -import static org.mockito.Mockito.when; -import static uk.gov.moj.cpp.sjp.query.view.util.JsonHelper.readJsonFromFile; @ExtendWith(MockitoExtension.class) public class FCOMPResultCodeConverterTest extends ResultCodeConverterTest { 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..814e364e7c 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,31 +1,18 @@ 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 org.hamcrest.Matchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; +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.JsonHelper.readJsonFromFile; + +import java.util.Optional; import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static uk.gov.moj.cpp.sjp.query.view.util.JsonHelper.readJsonFromFile; - -import static org.mockito.Mockito.when; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.moj.cpp.sjp.domain.Address; -import uk.gov.moj.cpp.sjp.domain.Employer; -import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; -import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; -import uk.gov.moj.cpp.sjp.query.view.converter.ResultCode; -import uk.gov.moj.cpp.sjp.query.view.response.CaseView; -import uk.gov.moj.cpp.sjp.query.view.service.OffenceDataSupplier; - -import java.util.Optional; @ExtendWith(MockitoExtension.class) public class FCOSTResultCodeConverterTest extends ResultCodeConverterTest { 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..68a5a67d86 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/LSUMIResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java index c9a766bc6b..fb7d7073b6 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/LSUMResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java index 3ebe36f189..c371b67d5c 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,21 +1,21 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import java.util.stream.Stream; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import uk.gov.justice.services.common.converter.LocalDates; import java.time.LocalDate; +import java.util.stream.Stream; import javax.json.JsonArray; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; public class LSUMResultCodeConverterTest extends ResultCodeConverterTest { 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..07f8e52df0 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/RLSUMIResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java index a4bff9b198..0ee32890ae 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/RLSUMResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java index 4a7a51db19..244a687687 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,13 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; - -import java.util.Arrays; -import java.util.Collection; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/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..41aa60c878 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,21 +1,17 @@ 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 org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory.createEnvelope; -import static uk.gov.moj.cpp.sjp.query.view.util.JsonHelper.readJsonFromFile; import uk.gov.justice.services.common.converter.ZonedDateTimes; import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.domain.Address; import uk.gov.moj.cpp.sjp.domain.Employer; - import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; import uk.gov.moj.cpp.sjp.query.view.converter.ResultCode; 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..22e0f0325d 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,10 +1,11 @@ package uk.gov.moj.cpp.sjp.query.view.converter.results; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.mockito.MockitoAnnotations.initMocks; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.util.stream.Stream; + 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/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/CaseServiceFindCasesMissingSjpnTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceFindCasesMissingSjpnTest.java index 892031ecbd..b5e7bb95b7 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceFindCasesMissingSjpnTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceFindCasesMissingSjpnTest.java @@ -9,6 +9,8 @@ import static org.hamcrest.Matchers.hasSize; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -22,6 +24,7 @@ import uk.gov.moj.cpp.sjp.query.view.response.CasesMissingSjpnView; import java.time.LocalDate; +import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -39,6 +42,8 @@ public class CaseServiceFindCasesMissingSjpnTest { private static final LocalDate NOW = LocalDate.now(); private static final int COUNT = 10; private static final String TVL_FILTER_VALUE = "TVL"; + + private static final List AGENT_FILTER_VALUE = Arrays.asList("TFL", "XYZ"); private List caseDetails; @Mock private QueryResult queryResult; @@ -66,8 +71,10 @@ public void init() { public void shouldFindAllCasesMissingSjpn() { when(queryResult.getResultList()).thenReturn(caseDetails); - when(caseRepository.findCasesMissingSjpn(TVL_FILTER_VALUE)).thenReturn(queryResult); - when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE)).thenReturn(COUNT); + when(caseRepository.findCasesMissingSjpn(eq(TVL_FILTER_VALUE), anyList())) + .thenReturn(queryResult); + when(caseRepository.countCasesMissingSjpn(eq(TVL_FILTER_VALUE), anyList())) + .thenReturn(COUNT); final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, empty(), empty()); @@ -81,8 +88,8 @@ public void shouldFindAllCasesMissingSjpn() { public void shouldFindCasesMissingSjpnLimitedByPostingDate() { when(queryResult.getResultList()).thenReturn(caseDetails); - when(caseRepository.findCasesMissingSjpn(TVL_FILTER_VALUE, NOW)).thenReturn(queryResult); - when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE, NOW)).thenReturn(COUNT); + when(caseRepository.findCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE)).thenReturn(queryResult); + when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE)).thenReturn(COUNT); final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, empty(), Optional.of(NOW)); @@ -96,12 +103,12 @@ public void shouldFindCasesMissingSjpnLimitedByPostingDate() { public void shouldReturnEmptyListWhenLimitIsZero() { final int limit = 0; - when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE)).thenReturn(COUNT); + when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE, AGENT_FILTER_VALUE)).thenReturn(COUNT); final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, Optional.of(limit), empty()); - verify(caseRepository, never()).findCasesMissingSjpn(any(String.class)); - verify(caseRepository, never()).findCasesMissingSjpn(any(String.class), any(LocalDate.class)); + verify(caseRepository, never()).findCasesMissingSjpn(any(String.class), any(List.class)); + verify(caseRepository, never()).findCasesMissingSjpn(any(String.class), any(LocalDate.class), any(List.class)); verify(queryResult, never()).maxResults(anyInt()); assertThat(casesMissingSjpnView.ids, hasSize(0)); @@ -114,12 +121,12 @@ public void shouldFindCasesMissingSjpnWhenLimitIsPositive() { when(queryResult.getResultList()).thenReturn(caseDetails); when(queryResult.maxResults(anyInt())).thenReturn(queryResult); - when(caseRepository.findCasesMissingSjpn(TVL_FILTER_VALUE)).thenReturn(queryResult); - when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE)).thenReturn(COUNT); + when(caseRepository.findCasesMissingSjpn(eq(TVL_FILTER_VALUE), anyList())).thenReturn(queryResult); + when(caseRepository.countCasesMissingSjpn(eq(TVL_FILTER_VALUE), anyList())).thenReturn(COUNT); final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, Optional.of(limit), empty()); - verify(caseRepository).findCasesMissingSjpn(TVL_FILTER_VALUE); + verify(caseRepository).findCasesMissingSjpn(TVL_FILTER_VALUE, AGENT_FILTER_VALUE); verify(queryResult).maxResults(limit); assertThat(casesMissingSjpnView.ids, equalTo(extractCaseIds(caseDetails))); @@ -132,12 +139,12 @@ public void shouldFindCasesMissingSjpnWithCountAndPostingDateLimits() { when(queryResult.getResultList()).thenReturn(caseDetails); when(queryResult.maxResults(anyInt())).thenReturn(queryResult); - when(caseRepository.findCasesMissingSjpn(TVL_FILTER_VALUE, NOW)).thenReturn(queryResult); - when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE, NOW)).thenReturn(COUNT); + when(caseRepository.findCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE)).thenReturn(queryResult); + when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE)).thenReturn(COUNT); final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, Optional.of(limit), Optional.of(NOW)); - verify(caseRepository).findCasesMissingSjpn(TVL_FILTER_VALUE, NOW); + verify(caseRepository).findCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE); verify(queryResult).maxResults(limit); assertThat(casesMissingSjpnView.ids, equalTo(extractCaseIds(caseDetails))); @@ -145,11 +152,11 @@ public void shouldFindCasesMissingSjpnWithCountAndPostingDateLimits() { } private void mockProsecutingAuthorityAccess() { - when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)) .thenReturn(prosecutingAuthorityAccess); when(prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess)) .thenReturn(TVL_FILTER_VALUE); + when(prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()).thenReturn(AGENT_FILTER_VALUE); } private CaseDetail createCaseDetails() { 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 dd7c913d5c..f4abb4b694 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -18,12 +16,16 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.BDDMockito.given; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +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.common.CaseManagementStatus.IN_PROGRESS; import uk.gov.justice.services.common.converter.ListToJsonArrayConverter; @@ -720,12 +722,15 @@ public void shouldSearchCasesByUrn() { final String query = URN; final ProsecutingAuthorityAccess prosecutingAuthorityAccess = mock(ProsecutingAuthorityAccess.class); final String prosecutingAuthorityAccessFilterValue = "SOME_FILTER"; + final List agents = Arrays.asList("AGENT"); + when(prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()) + .thenReturn(agents); when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)) .thenReturn(prosecutingAuthorityAccess); when(prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess)) .thenReturn(prosecutingAuthorityAccessFilterValue); - when(caseSearchResultRepository.findByUrn(prosecutingAuthorityAccessFilterValue, query)) + when(caseSearchResultRepository.findByUrn(prosecutingAuthorityAccessFilterValue, query, agents)) .thenReturn(singletonList(createCaseSearchResult())); final CaseSearchResultsView cases = service.searchCases(envelope, query); @@ -740,15 +745,55 @@ public void shouldSearchCasesByLastName() { final String query = LAST_NAME; final ProsecutingAuthorityAccess prosecutingAuthorityAccess = mock(ProsecutingAuthorityAccess.class); final String prosecutingAuthorityAccessFilterValue = "SOME_FILTER"; + final List agents = Arrays.asList("AGENT"); + when(prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()) + .thenReturn(agents); when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)) .thenReturn(prosecutingAuthorityAccess); when(prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess)) .thenReturn(prosecutingAuthorityAccessFilterValue); - when(caseSearchResultRepository.findByUrn(prosecutingAuthorityAccessFilterValue, query)) + when(caseSearchResultRepository.findByUrn(prosecutingAuthorityAccessFilterValue, query, agents)) + .thenReturn(emptyList()); + when(caseSearchResultRepository.findByLastName(prosecutingAuthorityAccessFilterValue, query, agents)) + .thenReturn(singletonList(createCaseSearchResult())); + + final CaseSearchResultsView cases = service.searchCases(envelope, query); + + verify(prosecutingAuthorityProvider).getCurrentUsersProsecutingAuthorityAccess(envelope); + + final CaseSearchResultsView.CaseSearchResultView result = cases.getResults().get(0); + assertThat(result.getCaseId(), equalTo(CASE_ID)); + assertThat(result.getUrn(), equalTo(URN)); + assertThat(result.getEnterpriseId(), equalTo(ENTERPRISE_ID)); + assertThat(result.getProsecutingAuthority(), equalTo(PROSECUTING_AUTHORITY)); + assertThat(result.getPostingDate(), equalTo(POSTING_DATE)); + assertThat(result.getStatus(), equalTo(CASE_STATUS_REFERRED_FOR_COURT_HEARING)); + assertThat(result.getDefendant().getFirstName(), equalTo(FIRST_NAME)); + assertThat(result.getDefendant().getLastName(), equalTo(LAST_NAME)); + assertThat(result.getDefendant().getDateOfBirth(), equalTo(DATE_OF_BIRTH)); + } + + @Test + public void shouldSearchCasesByLegalEntityName() { + final String query = LAST_NAME; + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = mock(ProsecutingAuthorityAccess.class); + final String prosecutingAuthorityAccessFilterValue = "SOME_FILTER"; + final List agents = new ArrayList<>(); + + when(prosecutingAuthorityAccess.getAgentProsecutorAuthorityAccess()) + .thenReturn(agents); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)) + .thenReturn(prosecutingAuthorityAccess); + when(prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess)) + .thenReturn(prosecutingAuthorityAccessFilterValue); + + when(caseSearchResultRepository.findByUrn(anyString(), anyString(), anyList())) + .thenReturn(emptyList()); + when(caseSearchResultRepository.findByLastName(anyString(), anyString(), anyList())) .thenReturn(emptyList()); - when(caseSearchResultRepository.findByLastName(prosecutingAuthorityAccessFilterValue, query)) + when(caseSearchResultRepository.findByLegalEntityName(anyString(), anyString(), anyList())) .thenReturn(singletonList(createCaseSearchResult())); final CaseSearchResultsView cases = service.searchCases(envelope, query); 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..353b1fd311 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,17 +10,17 @@ 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 org.apache.commons.lang3.RandomUtils.nextInt; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static uk.gov.moj.cpp.sjp.domain.decision.DecisionType.ADJOURN; import static uk.gov.moj.cpp.sjp.domain.decision.DecisionType.DISMISS; import static uk.gov.moj.cpp.sjp.domain.decision.DecisionType.REFER_FOR_COURT_HEARING; @@ -51,7 +51,6 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DischargePeriod; import uk.gov.moj.cpp.sjp.persistence.entity.DismissOffenceDecision; import uk.gov.moj.cpp.sjp.persistence.entity.FinancialPenaltyOffenceDecision; -import uk.gov.moj.cpp.sjp.persistence.entity.LegalEntityDetails; import uk.gov.moj.cpp.sjp.persistence.entity.OffenceDecision; import uk.gov.moj.cpp.sjp.persistence.entity.OffenceDetail; import uk.gov.moj.cpp.sjp.persistence.entity.ReferForCourtHearingDecision; @@ -75,7 +74,6 @@ import javax.json.JsonArray; import javax.json.JsonObject; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidServiceTest.java index b59961cb6b..6e71a676cc 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidServiceTest.java @@ -31,7 +31,9 @@ import uk.gov.moj.cpp.sjp.query.view.response.CasesPendingDatesToAvoidView; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.UUID; @@ -48,6 +50,7 @@ public class DatesToAvoidServiceTest { private static final UUID OXFORD_REGION_ID = UUID.randomUUID(); private static final UUID LEICESTER_REGION_ID = UUID.randomUUID(); private static final String TITLE = "title"; + private static final String REGION = "region"; private static final String FIRST_NAME = "firstname"; private static final String LAST_NAME = "lastname"; private static final LocalDate DATE_OF_BIRTH = now().minusYears(50); @@ -80,7 +83,7 @@ public void setUpForLegalEntityDetails() { new PendingDatesToAvoid(createCaseDetailsWithRegionAndLegalEntityDetails(" ")), new PendingDatesToAvoid(createCaseDetailsWithRegionAndLegalEntityDetails(null)) ); - when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any())).thenReturn(pendingCases); + when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any(), any())).thenReturn(pendingCases); when(referenceDataService.getRegionalOrganisations(any())).thenReturn(REGIONS); } @Test @@ -93,17 +96,17 @@ public void shouldReturnFinancialMeansIfExists() { new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(" ")), new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(null)) ); - when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any())).thenReturn(pendingCases); final JsonEnvelope envelope = createEnvelope(); - final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL"); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); final String prosecutingAuthorityFilterValue = "TFL"; final CaseDetail caseDetail = new CaseDetail(UUID.randomUUID()); caseDetail.getDefendant().setAddress(new Address()); final List pendingDatesToAvoidList = Arrays.asList(new PendingDatesToAvoid(caseDetail)); + final List agentProsecutorAuthorityAccess = Arrays.asList("DUMMY_VALUE"); when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); when(prosecutingAuthorityAccessFilterConverter.convertToProsecutingAuthorityAccessFilter(prosecutingAuthorityAccess)).thenReturn(prosecutingAuthorityFilterValue); - when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(prosecutingAuthorityFilterValue)).thenReturn(pendingDatesToAvoidList); + when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(prosecutingAuthorityFilterValue, agentProsecutorAuthorityAccess)).thenReturn(pendingDatesToAvoidList); final CasesPendingDatesToAvoidView datesToAvoidsView = datesToAvoidService.findCasesPendingDatesToAvoid(envelope); @@ -122,10 +125,13 @@ public void shouldFilterPendingCasesByRegionId() { new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(" ")), new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(null)) ); - when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any())).thenReturn(pendingCases); + when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any(), any())).thenReturn(pendingCases); when(referenceDataService.getRegionalOrganisations(any())).thenReturn(REGIONS); final JsonEnvelope envelope = createEnvelope(LONDON_REGION_ID); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final CasesPendingDatesToAvoidView datesToAvoidsView = datesToAvoidService.findCasesPendingDatesToAvoid(envelope); assertThat(datesToAvoidsView.getCases(), hasSize(1)); @@ -136,10 +142,39 @@ public void shouldFilterPendingCasesByRegionId() { assertThat(datesToAvoidsView.getCount(), is(pendingCases.size())); } + @Test + public void shouldFilterPendingCasesByProsecutingAuthority() { + pendingCases = Arrays.asList( + new PendingDatesToAvoid(createCaseDetailsWithProsecutingAuthority("TFL")), + new PendingDatesToAvoid(createCaseDetailsWithProsecutingAuthority("TVL")), + new PendingDatesToAvoid(createCaseDetailsWithProsecutingAuthority("TFL")), + new PendingDatesToAvoid(createCaseDetailsWithProsecutingAuthority("TVL")), + new PendingDatesToAvoid(createCaseDetailsWithProsecutingAuthority("TFL")), + new PendingDatesToAvoid(createCaseDetailsWithProsecutingAuthority("TVL")) + ); + when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any(), any())).thenReturn(pendingCases); + final JsonEnvelope envelope = createEnvelopeWithProsecutingAuthority("TFL"); + + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + + final CasesPendingDatesToAvoidView datesToAvoidsView = datesToAvoidService.findCasesPendingDatesToAvoid(envelope); + + assertThat(datesToAvoidsView.getCases(), hasSize(3)); + assertThat(datesToAvoidsView.getCases(), hasItem(hasProperty("region", equalTo("region")))); + assertEquals(FIRST_NAME, datesToAvoidsView.getCases().get(0).getFirstName()); + assertEquals(LAST_NAME, datesToAvoidsView.getCases().get(0).getLastName()); + assertEquals(DATE_OF_BIRTH, datesToAvoidsView.getCases().get(0).getDateOfBirth()); + assertThat(datesToAvoidsView.getCount(), is(pendingCases.size())); + } + @Test public void shouldFilterPendingCasesByRegionIdWithLegalEntityDetails() { setUpForLegalEntityDetails(); final JsonEnvelope envelope = createEnvelope(LONDON_REGION_ID); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); final CasesPendingDatesToAvoidView datesToAvoidsView = datesToAvoidService.findCasesPendingDatesToAvoid(envelope); @@ -160,9 +195,12 @@ public void shouldReturnAllPendingCasesWhenFilterCriteriaIsNotProvided() { new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(" ")), new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(null)) ); - when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any())).thenReturn(pendingCases); + when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any(), any())).thenReturn(pendingCases); final JsonEnvelope envelope = createEnvelope(); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final CasesPendingDatesToAvoidView datesToAvoidsView = datesToAvoidService.findCasesPendingDatesToAvoid(envelope); assertThat(datesToAvoidsView.getCases(), containsInAnyOrder( @@ -186,9 +224,12 @@ public void shouldReturnPendingCasesWithEmptyRegionWhenFilterCriteriaIsUnknown() new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(" ")), new PendingDatesToAvoid(createCaseDetailsWithRegionAndPersonalDetails(null)) ); - when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any())).thenReturn(pendingCases); + when(pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid(any(), any())).thenReturn(pendingCases); final JsonEnvelope envelope = createEnvelope("UNKNOWN"); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final CasesPendingDatesToAvoidView datesToAvoidsView = datesToAvoidService.findCasesPendingDatesToAvoid(envelope); assertThat(datesToAvoidsView.getCases(), containsInAnyOrder( @@ -211,6 +252,13 @@ private JsonEnvelope createEnvelope(final String regionId) { .build(); } + private JsonEnvelope createEnvelopeWithProsecutingAuthority(final String prosecutingAuthority) { + return envelope() + .with(metadataWithRandomUUID("sjp.pending-dates-to-avoid")) + .withPayloadOf(prosecutingAuthority, "prosecutingAuthority") + .build(); + } + private JsonEnvelope createEnvelope() { return envelope() .with(metadataWithRandomUUID("sjp.pending-dates-to-avoid")) @@ -227,7 +275,23 @@ private CaseDetail createCaseDetailsWithRegionAndPersonalDetails(final String re .withLastName(LAST_NAME) .withDateOfBirth(DATE_OF_BIRTH) .build()) - .build()).build(); + .build()) + .build(); + } + + private CaseDetail createCaseDetailsWithProsecutingAuthority(final String prosecutingAuthority) { + return CaseDetailBuilder.aCase().withDefendantDetail( + DefendantDetailBuilder.aDefendantDetail() + .withRegion(REGION) + .withPersonalDetails(buildPersonalDetails() + .withTitle(TITLE) + .withFirstName(FIRST_NAME) + .withLastName(LAST_NAME) + .withDateOfBirth(DATE_OF_BIRTH) + .build()) + .build()) + .withProsecutingAuthority(prosecutingAuthority) + .build(); } private CaseDetail createCaseDetailsWithRegionAndLegalEntityDetails(final String region) { 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 3e1a4b3702..4d58342dc2 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,9 +3,9 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasItem; @@ -13,17 +13,17 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.iterableWithSize; import static org.hamcrest.collection.IsEmptyIterable.emptyIterable; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; import static uk.gov.moj.cpp.sjp.persistence.builder.UpdatedDefendantDetailsBuilder.anUpdatedDefendantDetails; import static uk.gov.moj.cpp.sjp.query.view.response.DefendantDetailsUpdatesView.DefendantDetailsUpdate; -import org.mockito.ArgumentMatchers; import uk.gov.justice.json.schemas.domains.sjp.Gender; import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.accesscontrol.sjp.providers.ProsecutingAuthorityAccess; import uk.gov.moj.cpp.accesscontrol.sjp.providers.ProsecutingAuthorityProvider; import uk.gov.moj.cpp.sjp.domain.DefendantOutstandingFineRequestsQueryResult; import uk.gov.moj.cpp.sjp.persistence.builder.CaseDetailBuilder; @@ -37,6 +37,7 @@ import uk.gov.moj.cpp.sjp.query.view.response.DefendantDetailsUpdatesView; import java.time.ZonedDateTime; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -79,11 +80,11 @@ public class DefendantServiceTest { @BeforeEach public void setup() { - updatedDefendantDetails1 = createUpdatedDefendantDetailsWithRegion("London"); - updatedDefendantDetails2 = createUpdatedDefendantDetailsWithRegion("Oxford"); - updatedDefendantDetails3 = createUpdatedDefendantDetailsWithRegion(" "); - updatedDefendantDetails4 = createUpdatedDefendantDetailsWithRegion(""); - updatedDefendantDetails5 = createUpdatedDefendantDetailsWithRegion(null); + updatedDefendantDetails1 = createUpdatedDefendantDetailsWithRegionAndProsecutingAuthority("London", null); + updatedDefendantDetails2 = createUpdatedDefendantDetailsWithRegionAndProsecutingAuthority("Oxford", "TVL"); + updatedDefendantDetails3 = createUpdatedDefendantDetailsWithRegionAndProsecutingAuthority(" ", null); + updatedDefendantDetails4 = createUpdatedDefendantDetailsWithRegionAndProsecutingAuthority("", "TFL"); + updatedDefendantDetails5 = createUpdatedDefendantDetailsWithRegionAndProsecutingAuthority(null, "TFL"); updatedDefendantDetails = newArrayList( updatedDefendantDetails1, @@ -106,11 +107,15 @@ public void shouldFindDefendantUpdates() { updatedDefendantDetails3, updatedDefendantDetails2); when(defendantRepository.findUpdatedByCaseProsecutingAuthority( + any(), any(), any(), any())) .thenReturn(updatedDefendantDetails); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final DefendantDetailsUpdatesView defendantDetailUpdates = defendantService.findDefendantDetailUpdates(envelope); assertThat(defendantDetailUpdates.getTotal(), is(3)); @@ -131,11 +136,15 @@ public void shouldObeyLimitProvided() { .mapToObj(i -> createUpdatedDefendantDetails(ZonedDateTime.now())) .collect(toList()); when(defendantRepository.findUpdatedByCaseProsecutingAuthority( + any(), any(), any(), any())) .thenReturn(updatedDefendantDetails); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final DefendantDetailsUpdatesView defendantDetailUpdates = defendantService.findDefendantDetailUpdates(envelope); assertThat(defendantDetailUpdates.getTotal(), is(3)); @@ -170,11 +179,15 @@ public void shouldFindDefendantListByReadyCases() { public void shouldReturnDefendantDetailUpdatesUnfilteredWhenNoFilterCriteriaIsProvided() { final JsonEnvelope envelope = envelope(); when(defendantRepository.findUpdatedByCaseProsecutingAuthority( + any(), any(), any(), any())) .thenReturn(updatedDefendantDetails); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final DefendantDetailsUpdatesView defendantDetailUpdates = defendantService.findDefendantDetailUpdates(envelope); assertThat(defendantDetailUpdates.getDefendantDetailsUpdates(), containsInAnyOrder( @@ -192,11 +205,15 @@ public void shouldReturnDefendantUpdatesFilteredByRegionId() { final JsonEnvelope envelope = envelope(LONDON_REGION_ID.toString()); when(referenceDataService.getRegionalOrganisations(any())).thenReturn(REGIONS); when(defendantRepository.findUpdatedByCaseProsecutingAuthority( + any(), any(), any(), any())) .thenReturn(updatedDefendantDetails); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final DefendantDetailsUpdatesView defendantDetailUpdates = defendantService.findDefendantDetailUpdates(envelope); assertThat(defendantDetailUpdates.getDefendantDetailsUpdates(), containsInAnyOrder( @@ -204,15 +221,43 @@ public void shouldReturnDefendantUpdatesFilteredByRegionId() { assertThat(defendantDetailUpdates.getTotal(), is(updatedDefendantDetails.size())); } + @Test + public void shouldReturnDefendantUpdatesFilteredByProsecutingAuthority() { + final JsonEnvelope envelope = envelopeWithProsecutingAuthority("TFL"); + when(defendantRepository.findUpdatedByCaseProsecutingAuthority( + any(), + any(), + any(), + any())) + .thenReturn(updatedDefendantDetails); + + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + + final DefendantDetailsUpdatesView defendantDetailUpdates = defendantService.findDefendantDetailUpdates(envelope); + + assertThat(defendantDetailUpdates.getDefendantDetailsUpdates().size(), is(2)); + assertThat(defendantDetailUpdates.getDefendantDetailsUpdates(), + containsInAnyOrder( + DefendantDetailsUpdate.of(updatedDefendantDetails4), + DefendantDetailsUpdate.of(updatedDefendantDetails5) + )); + assertThat(defendantDetailUpdates.getTotal(), is(updatedDefendantDetails.size())); + } + @Test public void shouldFindDefendantUpdatesFilteredEmptyList() { final JsonEnvelope envelope = envelope("UNKNOWN"); when(defendantRepository.findUpdatedByCaseProsecutingAuthority( + any(), any(), any(), any())) .thenReturn(updatedDefendantDetails); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final DefendantDetailsUpdatesView defendantDetailUpdates = defendantService.findDefendantDetailUpdates(envelope); assertThat(defendantDetailUpdates.getDefendantDetailsUpdates(), containsInAnyOrder( @@ -231,10 +276,14 @@ public void shouldApplyLimitAfterFilteredByRegionAndOrderByLastUpdated() { final UpdatedDefendantDetails update2 = anUpdatedDefendantDetails().withUpdateTime(ZonedDateTime.now().minusDays(1)).withRegion("").build(); final UpdatedDefendantDetails update3 = anUpdatedDefendantDetails().withUpdateTime(ZonedDateTime.now().minusDays(2)).withRegion("").build(); when(defendantRepository.findUpdatedByCaseProsecutingAuthority(any(), + any(), any(), any())) .thenReturn(asList(update3, update2, update1)); + final ProsecutingAuthorityAccess prosecutingAuthorityAccess = ProsecutingAuthorityAccess.of("TFL", new ArrayList<>()); + when(prosecutingAuthorityProvider.getCurrentUsersProsecutingAuthorityAccess(envelope)).thenReturn(prosecutingAuthorityAccess); + final DefendantDetailsUpdatesView defendantDetailUpdates = defendantService.findDefendantDetailUpdates(envelope); assertThat(defendantDetailUpdates.getDefendantDetailsUpdates(), hasSize(2)); @@ -267,9 +316,12 @@ public void shouldFindDefendantListByReadyCasesWithOnlyRequiredFields() { } - private UpdatedDefendantDetails createUpdatedDefendantDetailsWithRegion(final String region) { + private UpdatedDefendantDetails createUpdatedDefendantDetailsWithRegionAndProsecutingAuthority(final String region, + final String prosecutingAuthority) { return anUpdatedDefendantDetails() .withRegion(region) + .withProsecutingAuthority(prosecutingAuthority) + .withUpdateTime(ZonedDateTime.now()) .build(); } @@ -288,6 +340,15 @@ private JsonEnvelope envelope(final String regionFilterCriteria) { ); } + private JsonEnvelope envelopeWithProsecutingAuthority(final String prosecutingAuthority) { + return envelopeFrom( + metadataWithRandomUUIDAndName(), + createObjectBuilder() + .add("prosecutingAuthority", prosecutingAuthority) + .add("limit", 5) + ); + } + private JsonEnvelope envelope(final String regionFilterCriteria, final int limit) { return envelopeFrom( metadataWithRandomUUIDAndName(), 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..a709525e19 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,18 +4,18 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; import static uk.gov.moj.cpp.sjp.domain.plea.PleaMethod.ONLINE; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.GUILTY; @@ -60,9 +60,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) 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 9cb07c0e8a..fba2ec727c 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,11 +1,12 @@ package uk.gov.moj.cpp.sjp.query.view.service; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -28,7 +29,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -@ExtendWith(MockitoExtension.class) +@ExtendWith({MockitoExtension.class}) public class ProgressionServiceTest { @Mock @@ -45,8 +46,9 @@ public class ProgressionServiceTest { @BeforeEach public void setup() { defaultDefendant = createDefaultDefendantDetail(); - when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCase(defaultDefendant.getPersonalDetails())); + lenient().when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCase(defaultDefendant.getPersonalDetails())); when(requester.requestAsAdmin(any())).thenReturn(envelope); + when(envelope.payloadIsNull()).thenReturn(false); } @Test @@ -60,6 +62,15 @@ public void shouldFindMatchingDefendantOffencesFromProsecutionCase() { assertEquals(expectedOffences, defendantOffences); } + @Test + void shouldNotFindMatchingDefendantOffencesFromEmptyProsecutionCase() { + when(envelope.payloadIsNull()).thenReturn(true); + final DefendantDetail defendantDetail = createDefaultDefendantDetail(); + final List defendantOffences = + progressionService.findDefendantOffences(UUID.randomUUID(), defendantDetail); + assertEquals(0, defendantOffences.size()); + } + @Test public void shouldFindNoMatchingDefendantOffencesFromProsecutionCase() { final DefendantDetail defendantDetail = createDefaultDefendantDetail(); 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..45c3172103 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,13 +1,12 @@ package uk.gov.moj.cpp.sjp.query.view.service; -import static javax.json.Json.createReader; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.services.core.requester.Requester; -import java.util.HashMap; -import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -18,14 +17,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasProperty; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) 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..652708675f 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,22 +2,22 @@ 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 org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +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 uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson; 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..9daa63cc0d 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,23 +3,21 @@ 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 org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.NOT_GUILTY; import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.FOUND_NOT_GUILTY; import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.NO_VERDICT; import static uk.gov.moj.cpp.sjp.domain.verdict.VerdictType.PROVED_SJP; - import static uk.gov.moj.cpp.sjp.query.view.util.FileUtil.getFileContentAsJson; import static uk.gov.moj.cpp.sjp.query.view.util.FileUtil.getFileContentAsJsonArray; -import org.mockito.ArgumentMatchers; import uk.gov.justice.json.schemas.domains.sjp.Gender; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.MetadataBuilder; @@ -55,6 +53,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; 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..e00715a6eb 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,6 @@ 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 org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -15,26 +14,26 @@ import static org.mockito.MockitoAnnotations.initMocks; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; -import java.util.stream.Stream; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import uk.gov.justice.services.core.enveloper.Enveloper; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.accesscontrol.common.providers.UserAndGroupProvider; import uk.gov.moj.cpp.accesscontrol.drools.Action; -import java.util.Collection; import java.util.List; import java.util.UUID; +import java.util.stream.Stream; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InjectMocks; 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..7dc8d965ef 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,6 @@ 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 org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; @@ -16,6 +14,8 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import static uk.gov.moj.cpp.sjp.domain.common.CaseStatus.REFERRED_FOR_COURT_HEARING; import static uk.gov.moj.cpp.sjp.query.view.service.ProgressionService.CASE_STATUS_FIELD_NAME; @@ -32,7 +32,6 @@ import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.DOB_QUERY_PARAM; import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.FIRSTNAME_QUERY_PARAM; import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.LASTNAME_QUERY_PARAM; -import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.PARTY_NAME_QUERY_PARAM; import static uk.gov.moj.cpp.sjp.query.view.service.defendantcase.search.DefendantCaseQuery.POSTCODE_QUERY_PARAM; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; 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..96da715f82 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 @@ -1,13 +1,13 @@ package uk.gov.moj.cpp.sjp.query.view.util; import static org.junit.jupiter.api.Assertions.fail; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import java.io.StringReader; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; -import javax.json.Json; 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 = 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 = 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..96ee9d5b09 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,8 +1,8 @@ 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 org.apache.commons.io.FileUtils.readFileToString; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; 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..ad46b1a3ac 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 @@ -1,13 +1,14 @@ package uk.gov.moj.cpp.sjp.query.view.util; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonValue; -import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) public class JsonUtilityTest { @@ -17,13 +18,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 createObjectBuilder() .add(key, value) .build(); } private static JsonObject createEmptyPayload() { - return Json.createObjectBuilder() + return createObjectBuilder() .build(); } @@ -48,7 +49,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 = 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 ff1f3d09d3..1c07e1d210 100644 --- a/sjp-service/pom.xml +++ b/sjp-service/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT sjp-service war diff --git a/sjp-viewstore/pom.xml b/sjp-viewstore/pom.xml index c2805e06d1..93437b37cf 100644 --- a/sjp-viewstore/pom.xml +++ b/sjp-viewstore/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.103.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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 74eb56a9b2..070845142b 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-SNAPSHOT sjp-viewstore-liquibase diff --git a/sjp-viewstore/sjp-viewstore-liquibase/src/main/resources/liquibase/sjp-view-store-db-changesets/092-create-employer-indexes.xml b/sjp-viewstore/sjp-viewstore-liquibase/src/main/resources/liquibase/sjp-view-store-db-changesets/092-create-employer-indexes.xml new file mode 100644 index 0000000000..fe6fafa701 --- /dev/null +++ b/sjp-viewstore/sjp-viewstore-liquibase/src/main/resources/liquibase/sjp-view-store-db-changesets/092-create-employer-indexes.xml @@ -0,0 +1,18 @@ + + + + + + CREATE INDEX IF NOT EXISTS employer_defendant_id_idx ON employer (defendant_id); + + + + DROP INDEX IF EXISTS employer_defendant_id_idx; + + + + \ No newline at end of file diff --git a/sjp-viewstore/sjp-viewstore-liquibase/src/main/resources/liquibase/sjp-view-store-db-changesets/093-create-defendant-indexes.xml b/sjp-viewstore/sjp-viewstore-liquibase/src/main/resources/liquibase/sjp-view-store-db-changesets/093-create-defendant-indexes.xml new file mode 100644 index 0000000000..db46d762af --- /dev/null +++ b/sjp-viewstore/sjp-viewstore-liquibase/src/main/resources/liquibase/sjp-view-store-db-changesets/093-create-defendant-indexes.xml @@ -0,0 +1,18 @@ + + + + + + CREATE INDEX IF NOT EXISTS defendant_correlation_id_idx ON defendant (correlation_id NULLS LAST); + + + + DROP INDEX IF EXISTS defendant_correlation_id_idx; + + + + \ No newline at end of file diff --git a/sjp-viewstore/sjp-viewstore-persistence/pom.xml b/sjp-viewstore/sjp-viewstore-persistence/pom.xml index b506c7232b..53d1d6c0b7 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.165-DD-41592-SNAPSHOT + 17.104.182-DD-41592-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..ed295cea7c 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 @@ -1,8 +1,9 @@ package uk.gov.moj.cpp.sjp.persistence.converter; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; + import java.io.StringReader; -import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonReader; import javax.persistence.AttributeConverter; @@ -18,7 +19,7 @@ public String convertToDatabaseColumn(JsonObject jsonObject) { @Override public JsonObject convertToEntityAttribute(String dbData) { - final JsonReader jsonReader = Json.createReader(new StringReader(dbData)); + final JsonReader jsonReader = createReader(new StringReader(dbData)); JsonObject jsonObject; try { jsonObject = jsonReader.readObject(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetails.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetails.java index 921f43eb94..cbe0d71e0b 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetails.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetails.java @@ -22,6 +22,7 @@ public class UpdatedDefendantDetails { private final UUID caseId; private final String region; private final String legalEntityName; + private final String prosecutingAuthority; @SuppressWarnings("squid:S00107") public UpdatedDefendantDetails( @@ -35,7 +36,8 @@ public UpdatedDefendantDetails( final String caseUrn, final UUID caseId, final String region, - final String legalEntityName) { + final String legalEntityName, + final String prosecutingAuthority) { this.firstName = firstName; this.lastName = lastName; @@ -48,6 +50,7 @@ public UpdatedDefendantDetails( this.caseId = caseId; this.region = region; this.legalEntityName = legalEntityName; + this.prosecutingAuthority = prosecutingAuthority; } /** @@ -115,6 +118,10 @@ public String getLegalEntityName() { return legalEntityName; } + public String getProsecutingAuthority() { + return prosecutingAuthority; + } + @SuppressWarnings("squid:S1067") @Override public boolean equals(final Object o) { @@ -136,7 +143,8 @@ public boolean equals(final Object o) { Objects.equal(caseUrn, that.caseUrn) && Objects.equal(caseId, that.caseId) && Objects.equal(region, that.region)&& - Objects.equal(legalEntityName, that.legalEntityName); + Objects.equal(legalEntityName, that.legalEntityName) && + Objects.equal(prosecutingAuthority, that.prosecutingAuthority); } @Override @@ -152,6 +160,7 @@ public int hashCode() { caseUrn, caseId, region, - legalEntityName); + legalEntityName, + prosecutingAuthority); } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java index f1cebff613..c422dcbf23 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java @@ -101,20 +101,25 @@ public abstract CaseDetail findByUrnPostcode(@QueryParam("urn") String urn, public abstract List findByDefendantId(@QueryParam("defendantId") final UUID defendantId); @Query(value = "SELECT cd FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.completed IS NOT true AND cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter") - public abstract QueryResult findCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter); + "WHERE cdocs IS NULL AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))") + public abstract QueryResult findCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); @Query(value = "SELECT cd FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter") - public abstract QueryResult findCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, @QueryParam("postedBefore") final LocalDate postedBefore); + "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter " + + "OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))") + public abstract QueryResult findCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, @QueryParam("postedBefore") final LocalDate postedBefore, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); @Query(value = "SELECT COUNT(cd) FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.completed IS NOT true AND cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter") - public abstract int countCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter); + "WHERE cdocs IS NULL AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess) )") + public abstract int countCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); @Query(value = "SELECT COUNT(cd) FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter") - public abstract int countCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, @QueryParam("postedBefore") final LocalDate postedBefore); + "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))") + public abstract int countCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, @QueryParam("postedBefore") final LocalDate postedBefore, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); @Query(value = "SELECT cd.caseDocuments FROM CaseDetail cd where cd.id = :caseId") public abstract List findCaseDocuments(@QueryParam("caseId") final UUID caseId); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java index fb6fdd3be1..6041f65f37 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java @@ -15,21 +15,24 @@ public interface CaseSearchResultRepository extends EntityRepository findByLastName(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("lastName") String lastName); + List findByLastName(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("lastName") String lastName, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); @Query("from CaseSearchResult as r inner join fetch r.caseSummary as c where upper(r.caseSummary.urn) = upper(:urn) and r.dateAdded = " + "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId) " + - "and r.caseSummary.prosecutingAuthority like :prosecutingAuthority " + + "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + "order by r.firstName ASC, c.postingDate DESC") - List findByUrn(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("urn") String urn); + List findByUrn(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("urn") String urn, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); List findByCaseId(UUID caseId); @Query("from CaseSearchResult as r inner join fetch r.caseSummary as c where upper(r.legalEntityName) = upper(:legalEntityName) and r.dateAdded = " + "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId and upper(z.legalEntityName) = upper(:legalEntityName)) " + - "and r.caseSummary.prosecutingAuthority like :prosecutingAuthority " + + "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + "order by r.legalEntityName ASC, c.postingDate DESC") - List findByLegalEntityName(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("legalEntityName") String legalEntityName); + List findByLegalEntityName(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("legalEntityName") String legalEntityName, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java index 8842c06873..04dc246a73 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java @@ -5,6 +5,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.view.UpdatedDefendantDetails; import java.time.ZonedDateTime; +import java.util.Collections; import java.util.List; import java.util.UUID; @@ -34,10 +35,11 @@ public abstract class DefendantRepository implements EntityRepository dd.updatesAcknowledgedAt)) " + "OR ((dd.personalDetails.dateOfBirthUpdatedAt BETWEEN :fromDate and :toDate) AND (dd.personalDetails.dateOfBirthUpdatedAt IS NOT NULL AND dd.updatesAcknowledgedAt IS NULL OR dd.personalDetails.dateOfBirthUpdatedAt > dd.updatesAcknowledgedAt)) " + "OR ((dd.nameUpdatedAt BETWEEN :fromDate and :toDate) AND (dd.nameUpdatedAt IS NOT NULL AND dd.updatesAcknowledgedAt IS NULL OR dd.nameUpdatedAt > dd.updatesAcknowledgedAt)))"; @@ -47,11 +49,17 @@ public abstract class DefendantRepository implements EntityRepository findUpdatedByCaseProsecutingAuthority( String prosecutingAuthority, ZonedDateTime fromDate, - ZonedDateTime toDate) { + ZonedDateTime toDate, + List agentProsecutorAuthorityAccess) { + + if (agentProsecutorAuthorityAccess == null || agentProsecutorAuthorityAccess.isEmpty()) { + agentProsecutorAuthorityAccess = Collections.singletonList("DUMMY_VALUE"); + } final javax.persistence.Query query = entityManager.createQuery(UPDATED_DEFENDANT_DETAILS); query.setParameter("prosecutingAuthority", prosecutingAuthority); + query.setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess); query.setParameter("fromDate", fromDate); query.setParameter("toDate", toDate); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java index daec87296e..47e0aa7e07 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java @@ -19,9 +19,10 @@ public abstract class PendingDatesToAvoidRepository implements EntityRepository< @Query(value = "SELECT pda FROM PendingDatesToAvoid as pda INNER JOIN pda.caseDetail as cd " + "WHERE cd.datesToAvoid IS NULL AND cd.assigneeId IS NULL AND cd.completed = false " + - "AND cd.prosecutingAuthority like :prosecutingAuthority " + + "AND (cd.prosecutingAuthority like :prosecutingAuthority OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess) ) " + "ORDER BY pda.pleaDate ASC") - public abstract List findCasesPendingDatesToAvoid(@QueryParam("prosecutingAuthority") String prosecutingAuthority); + public abstract List findCasesPendingDatesToAvoid(@QueryParam("prosecutingAuthority") String prosecutingAuthority, + @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); public void removeByCaseId(final UUID caseId) { Optional.ofNullable(this.findBy(caseId)).ifPresent(this::remove); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/builder/UpdatedDefendantDetailsBuilder.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/builder/UpdatedDefendantDetailsBuilder.java index ace9bf31b5..4372490042 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/builder/UpdatedDefendantDetailsBuilder.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/builder/UpdatedDefendantDetailsBuilder.java @@ -11,9 +11,12 @@ public class UpdatedDefendantDetailsBuilder { private ZonedDateTime updateTime; private String region; + private String prosecutingAuthority; + private UpdatedDefendantDetailsBuilder() { this.updateTime = ZonedDateTime.now(); this.region = "region"; + this.prosecutingAuthority = "TFL"; } public static UpdatedDefendantDetailsBuilder anUpdatedDefendantDetails() { @@ -30,6 +33,11 @@ public UpdatedDefendantDetailsBuilder withRegion(final String region) { return this; } + public UpdatedDefendantDetailsBuilder withProsecutingAuthority(final String prosecutingAuthority) { + this.prosecutingAuthority = prosecutingAuthority; + return this; + } + public UpdatedDefendantDetails build() { return new UpdatedDefendantDetails( "firstName", @@ -42,6 +50,7 @@ public UpdatedDefendantDetails build() { "caseUrn", UUID.randomUUID(), region, - null); + null, + prosecutingAuthority); } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetailsTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetailsTest.java index bb666c36c0..c0729af9d8 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetailsTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/view/UpdatedDefendantDetailsTest.java @@ -27,6 +27,7 @@ public void shouldMostRecentUpdateDateForSingleUpdate() { "caseUrn", UUID.randomUUID(), "region", + null, null); final Optional mostRecentUpdateDataOptional = updatedDefendantDetails.getMostRecentUpdateDate(); @@ -52,6 +53,7 @@ public void shouldCorrectlyCompareUpdateDates() { "caseUrn", UUID.randomUUID(), "region", + null, null); final Optional mostRecentUpdateDataOptional = updatedDefendantDetails.getMostRecentUpdateDate(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java index 00d0362f1f..f427c6e6d9 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java @@ -64,7 +64,7 @@ public void addCasesAndDocuments() { @Test public void findCasesMissingSjpnForTflProsecutors() { - final List actualCases = caseRepository.findCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE).getResultList(); + final List actualCases = caseRepository.findCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, Collections.emptyList()).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); assertThat(actualCaseIds, equalTo(extractCaseIds(tflCases.uncompletedSjpCasesWithoutSjpn))); @@ -72,7 +72,7 @@ public void findCasesMissingSjpnForTflProsecutors() { @Test public void findCasesMissingSjpnForCourtAdmin() { - final List actualCases = caseRepository.findCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE).getResultList(); + final List actualCases = caseRepository.findCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, Collections.emptyList()).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); assertThat(actualCaseIds, equalTo(extractCaseIds(allCases.uncompletedSjpCasesWithoutSjpn))); @@ -82,7 +82,7 @@ public void findCasesMissingSjpnForCourtAdmin() { public void findCasesMissingSjpnWithLimitForTflProsecutors() { int limit = 3; - final List actualCases = caseRepository.findCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE).maxResults(limit).getResultList(); + final List actualCases = caseRepository.findCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, Collections.emptyList()).maxResults(limit).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); assertThat(actualCaseIds, hasSize(limit)); @@ -95,7 +95,7 @@ public void findCasesMissingSjpnWithLimitForTflProsecutors() { public void findCasesMissingSjpnWithLimitForCourtAdmin() { int limit = 3; - final List actualCases = caseRepository.findCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE).maxResults(limit).getResultList(); + final List actualCases = caseRepository.findCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, Collections.emptyList()).maxResults(limit).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); assertThat(actualCaseIds, hasSize(limit)); @@ -106,14 +106,14 @@ public void findCasesMissingSjpnWithLimitForCourtAdmin() { @Test public void countCasesMissingSjpnForTflProsecutors() { - final int actualCaseCount = caseRepository.countCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE); + final int actualCaseCount = caseRepository.countCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, Collections.emptyList()); assertThat(actualCaseCount, equalTo(tflCases.uncompletedSjpCasesWithoutSjpn.size())); } @Test public void countCasesMissingSjpnForCourAdmin() { - final int actualCaseCount = caseRepository.countCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE); + final int actualCaseCount = caseRepository.countCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, Collections.emptyList()); assertThat(actualCaseCount, equalTo(allCases.uncompletedSjpCasesWithoutSjpn.size())); } @@ -123,7 +123,7 @@ public void countCasesMissingSjpnWithPostingDateOlderThanSpecifiedForTflProsecut int sjpCasesMissingSjpnCount = tflCases.uncompletedSjpCasesWithoutSjpn.size(); for (int i = 0; i < sjpCasesMissingSjpnCount; i++) { final LocalDate postingDate = LocalDate.now().minusDays(i); - final int actualCaseCount = caseRepository.countCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, postingDate); + final int actualCaseCount = caseRepository.countCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, postingDate, Collections.emptyList()); assertThat(actualCaseCount, equalTo(sjpCasesMissingSjpnCount - i)); } } @@ -133,7 +133,7 @@ public void countCasesMissingSjpnWithPostingDateOlderThanSpecifiedForCourtAdmin( int sjpCasesMissingSjpnCount = allCases.uncompletedSjpCasesWithoutSjpn.size(); for (int i = 0; i < sjpCasesMissingSjpnCount / NUMBER_OF_PROSECUTING_AUTHORITIES; i++) { final LocalDate postingDate = LocalDate.now().minusDays(i); - final int actualCaseCount = caseRepository.countCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, postingDate); + final int actualCaseCount = caseRepository.countCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, postingDate, Collections.emptyList()); assertThat(actualCaseCount, equalTo(sjpCasesMissingSjpnCount - (i * NUMBER_OF_PROSECUTING_AUTHORITIES))); } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java index 7c95ba5ed4..32df84d216 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java @@ -16,6 +16,8 @@ import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; @@ -51,7 +53,18 @@ public void shouldFindByLastName() { createCaseSearchResult(false); // check it is case insensitive - final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_WILDCARD, LAST_NAME.toLowerCase()); + final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_WILDCARD, LAST_NAME.toLowerCase(), new ArrayList<>()); + + assertThat(results.get(0).getLastName(), equalTo(LAST_NAME)); + assertThat(results.get(0).getCaseSummary().getUrn(), equalTo(URN)); + } + + @Test + public void shouldFindByLastNameForAgent() { + + createCaseSearchResult(PROSECUTING_AUTHORITY_2); + + final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase(), Arrays.asList(PROSECUTING_AUTHORITY_2)); assertThat(results.get(0).getLastName(), equalTo(LAST_NAME)); assertThat(results.get(0).getCaseSummary().getUrn(), equalTo(URN)); @@ -62,7 +75,7 @@ public void shouldNotFindByLastNameForOtherProsecutingAuthority() { createCaseSearchResult(PROSECUTING_AUTHORITY_2); - final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase()); + final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase(), new ArrayList<>()); assertThat(results.size(), is(0)); } @@ -74,7 +87,7 @@ public void shouldFindByLastNameWithOrdering() { final CaseSearchResult caseSearchResultB = createCaseSearchResultWithFirstname("firstNameB", PROSECUTING_AUTHORITY_1); // check results come back ordered by first name ascending - final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_WILDCARD, LAST_NAME.toLowerCase()); + final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_WILDCARD, LAST_NAME.toLowerCase(), new ArrayList<>()); assertThat(results.get(0).getLastName(), equalTo(LAST_NAME)); assertThat(results.get(0).getFirstName(), equalTo(caseSearchResultA.getFirstName())); @@ -88,7 +101,7 @@ public void shouldFindByLastNameEvenThoughItWasChanged() { // given final CaseSearchResult caseSearchResult = createCaseSearchResult(false); // when - final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase()); + final List results = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase(), new ArrayList<>()); // then assertThat(results, hasSize(1)); ensure(results.get(0), LAST_NAME, IS_CURRENT); @@ -97,13 +110,13 @@ public void shouldFindByLastNameEvenThoughItWasChanged() { simulateDefendantLastNameChanged(LAST_NAME_UPDATED, results.get(0).getCaseId()); // when - final List afterUpdateForOldLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase()); + final List afterUpdateForOldLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase(), new ArrayList<>()); // then assertThat(afterUpdateForOldLastName, hasSize(1)); ensure(afterUpdateForOldLastName.get(0), LAST_NAME_UPDATED, IS_OLD); // when - final List afterUpdateForNewLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME_UPDATED.toLowerCase()); + final List afterUpdateForNewLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME_UPDATED.toLowerCase(), new ArrayList<>()); // then assertThat(afterUpdateForNewLastName, hasSize(1)); ensure(afterUpdateForNewLastName.get(0), LAST_NAME_UPDATED, IS_CURRENT); @@ -112,13 +125,13 @@ public void shouldFindByLastNameEvenThoughItWasChanged() { simulateDefendantLastNameChanged(LAST_NAME, caseSearchResult.getCaseId()); // when - final List afterUpdateBackForOriginalLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase()); + final List afterUpdateBackForOriginalLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase(), new ArrayList<>()); // then assertThat(afterUpdateBackForOriginalLastName, hasSize(1)); ensure(afterUpdateBackForOriginalLastName.get(0), LAST_NAME, IS_CURRENT); // when - final List afterUpdateBackForUpdatedButRevertedLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME_UPDATED.toLowerCase()); + final List afterUpdateBackForUpdatedButRevertedLastName = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME_UPDATED.toLowerCase(), new ArrayList<>()); // then assertThat(afterUpdateBackForUpdatedButRevertedLastName, hasSize(1)); ensure(afterUpdateBackForUpdatedButRevertedLastName.get(0), LAST_NAME, IS_OLD); @@ -128,7 +141,7 @@ public void shouldFindByLastNameEvenThoughItWasChanged() { //simulateDefendantLastNameChanged(LAST_NAME_UPDATED, caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_1, URN)); createCaseSearchResult(false); // when - final List resultsAfterInsert = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase()); + final List resultsAfterInsert = caseSearchResultRepository.findByLastName(PROSECUTING_AUTHORITY_1, LAST_NAME.toLowerCase(), new ArrayList<>()); // then the results should contain 1 entry with LAST_NAME and 1 entry with LAST_NAME_UPDATED assertThat(resultsAfterInsert, hasSize(2)); ensure(resultsAfterInsert.get(0), LAST_NAME_UPDATED, IS_OLD); @@ -146,19 +159,31 @@ public void shouldFindByUrn() { final CaseSearchResult caseSearchResult = createCaseSearchResult(false); // check it is case insensitive - final List results = caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_WILDCARD, URN.toLowerCase()); + final List results = caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_WILDCARD, URN.toLowerCase(), new ArrayList<>()); assertThat(results.get(0).getLastName(), equalTo(caseSearchResult.getLastName())); assertThat(results.get(0).getCaseSummary().getUrn(), equalTo(caseSearchResult.getCaseSummary().getUrn())); } + @Test + public void shouldFindByUrnForAgent() { + + createCaseSearchResult(PROSECUTING_AUTHORITY_2); + + // check it is case insensitive + final List results = caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_1, URN.toLowerCase(), Arrays.asList(PROSECUTING_AUTHORITY_2)); + + assertThat(results.get(0).getLastName(), equalTo(LAST_NAME)); + assertThat(results.get(0).getCaseSummary().getUrn(), equalTo(URN)); + } + @Test public void shouldNotFindByUrnForOtherProsecutingAuthority() { createCaseSearchResult(PROSECUTING_AUTHORITY_2); // check it is case insensitive - final List results = caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_1, URN.toLowerCase()); + final List results = caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_1, URN.toLowerCase(), new ArrayList<>()); assertThat(results.size(), is(0)); } @@ -171,7 +196,7 @@ public void shouldFindByUrnOnlyLatest() { simulateDefendantLastNameChanged(LAST_NAME, caseSearchResult.getCaseId()); // when - final List resultsByUrn = caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_1, URN); + final List resultsByUrn = caseSearchResultRepository.findByUrn(PROSECUTING_AUTHORITY_1, URN, new ArrayList<>()); final List resultsByCaseId = caseSearchResultRepository.findByCaseId(caseSearchResult.getCaseId()); // then @@ -288,7 +313,17 @@ private CaseSearchResult createCaseSearchResultWithLegalEntity( public void shouldFindByLegalEntityName() { createCaseSearchResult(true); // check it is case insensitive - final List results = caseSearchResultRepository.findByLegalEntityName(PROSECUTING_AUTHORITY_WILDCARD, LEGAL_ENTITY_NAME.toLowerCase()); + final List results = caseSearchResultRepository.findByLegalEntityName(PROSECUTING_AUTHORITY_WILDCARD, LEGAL_ENTITY_NAME.toLowerCase(), new ArrayList<>()); + + assertEquals(LEGAL_ENTITY_NAME, results.get(0).getLegalEntityName()); + assertEquals(URN, results.get(0).getCaseSummary().getUrn()); + } + + @Test + public void shouldFindByLegalEntityNameForAgent() { + createCaseSearchResult(true); + // check it is case insensitive + final List results = caseSearchResultRepository.findByLegalEntityName(PROSECUTING_AUTHORITY_2, LEGAL_ENTITY_NAME.toLowerCase(), Arrays.asList(PROSECUTING_AUTHORITY_1)); assertEquals(LEGAL_ENTITY_NAME, results.get(0).getLegalEntityName()); assertEquals(URN, results.get(0).getCaseSummary().getUrn()); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java index 40389e9c73..3298af8102 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java @@ -19,6 +19,7 @@ import java.time.LocalDate; import java.time.ZonedDateTime; +import java.util.Collections; import java.util.List; import java.util.UUID; @@ -49,7 +50,7 @@ public void shouldFindDefendantWithDoBUpdatedAndUpdatesNotAcknowledgedYet() { final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null,null,null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); assertThat(defendantDetails, contains(defendant)); @@ -62,7 +63,7 @@ public void shouldFindDefendantWithDoBUpdatedAndUpdatesAcknowledgedBefore() { final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now().minusDays(2),null,null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); assertThat(defendantDetails, contains(defendant)); @@ -75,7 +76,7 @@ public void shouldIgnoreDefendantWithDoBUpdateWhenAcknowledged() { createCaseDetail(personalDetails, "TVL", now(UTC),null,null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -86,7 +87,7 @@ public void shouldFindDefendantWithAddressUpdatedAndUpdatesNotAcknowledgedYet() final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null,now(UTC),null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); assertThat(defendantDetails.get(0), is(defendant)); @@ -98,7 +99,7 @@ public void shouldIgnoreDefendantWhenUpdateHappenedMoreThan10DaysAgo() { createCaseDetail(personalDetails, "TVL", null, now(UTC).minusDays(15), null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -109,7 +110,7 @@ public void shouldFindDefendantWithAddressUpdatedAndUpdatesAcknowledgedBefore() final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now(UTC).minusDays(2), now(UTC), null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); assertThat(defendantDetails.get(0), is(defendant)); @@ -121,7 +122,7 @@ public void shouldIgnoreDefendantWithAddressUpdateWhenAcknowledged() { createCaseDetail(personalDetails, "TVL", now(UTC), now(UTC).minusDays(2), null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -132,7 +133,7 @@ public void shouldFindDefendantWithNameUpdatedAndUpdatesNotAcknowledgedYet() { final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null, null, now(UTC)); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); assertThat(defendantDetails.get(0), is(defendant)); @@ -144,7 +145,7 @@ public void shouldFindDefendantWithNameUpdatedAndUpdatesAcknowledgedBefore() { final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now(UTC).minusDays(2), null, now(UTC)); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); assertThat(defendantDetails.get(0), is(defendant)); @@ -156,7 +157,7 @@ public void shouldIgnoreDefendantWithNameUpdateWhenAcknowledged() { createCaseDetail(personalDetails, "TVL", now(UTC), null, now(UTC).minusDays(2)); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -165,7 +166,7 @@ public void shouldIgnoreDefendantWithNameUpdateWhenAcknowledged() { public void shouldIgnoreDefendantWithNoDetailChanges() { createCaseDetail(new PersonalDetails(), "TVL", null, null, null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -174,7 +175,7 @@ public void shouldIgnoreDefendantWithNoDetailChanges() { public void shouldIgnoreDefendantForOtherAuthorityGroup() { createCaseDetail(null, "TVL", null, null, null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TFL", now().minusDays(10), now()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TFL", now().minusDays(10), now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -239,7 +240,8 @@ private UpdatedDefendantDetails createCaseDetail( defendant.getCaseDetail().getUrn(), defendant.getCaseDetail().getId(), defendant.getRegion(), - null); + null, + "TVL"); } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java index ea51b4ed28..493a3efab3 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java @@ -11,6 +11,7 @@ import java.time.ZonedDateTime; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.UUID; @@ -83,7 +84,7 @@ private void setupAndSaveDatesToAvoidData(DatesToAvoidTestData testData) { @Test public void shouldFindCasesPendingDatesToAvoidForTfl() { // WHEN - List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL"); + List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL", Collections.emptyList()); // THEN assertThat(results, hasSize(3)); @@ -92,10 +93,25 @@ public void shouldFindCasesPendingDatesToAvoidForTfl() { assertThat(results.get(2).getCaseId(), equalTo(testData.get(0).getCaseId())); } + @Test + public void shouldFindCasesPendingDatesToAvoidForTflAndTvl() { + // WHEN + List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL", Arrays.asList("TVL", "XYZ")); + + // THEN + assertThat(results, hasSize(6)); + assertThat(results.get(0).getCaseId(), equalTo(testData.get(11).getCaseId())); + assertThat(results.get(1).getCaseId(), equalTo(testData.get(10).getCaseId())); + assertThat(results.get(2).getCaseId(), equalTo(testData.get(4).getCaseId())); + assertThat(results.get(3).getCaseId(), equalTo(testData.get(5).getCaseId())); + assertThat(results.get(4).getCaseId(), equalTo(testData.get(0).getCaseId())); + assertThat(results.get(5).getCaseId(), equalTo(testData.get(6).getCaseId())); + } + @Test public void shouldFindCasesPendingDatesToAvoidForTvl() { // WHEN - List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TVL"); + List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TVL", Collections.emptyList()); // THEN assertThat(results, hasSize(3)); @@ -106,12 +122,12 @@ public void shouldFindCasesPendingDatesToAvoidForTvl() { @Test public void shouldRemovePendingDatesToAvoid() { - List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL"); + List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL", Collections.emptyList()); assertThat(results, hasSize(3)); pendingDatesToAvoidRepository.removeByCaseId(testData.get(0).getCaseId()); - results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL"); + results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL", Collections.emptyList()); assertThat(results, hasSize(2)); assertThat(results.get(0).getCaseId(), equalTo(testData.get(4).getCaseId())); assertThat(results.get(1).getCaseId(), equalTo(testData.get(5).getCaseId()));